Index: kworldwatch/Makefile diff -u kworldwatch/Makefile:1.1.1.1 kworldwatch/Makefile:1.1.3.1 --- kworldwatch/Makefile:1.1.1.1 Sun Sep 26 00:37:08 1999 +++ kworldwatch/Makefile Sun Sep 26 05:00:54 1999 @@ -21,5 +21,16 @@ USE_QT= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= "--sharedir=share/kde" +CONFIGURE_ENV= QTDIR="${QTDIR}" \ + QTINC="${QTDIR}/include/X11/qt" \ + MOC="${QTDIR}/bin/moc" \ + CPPFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" + +.if defined(PREFIX) +QTDIR?= ${PREFIX} +.else +QTDIR?= ${X11BASE} +.endif .include Index: kworldwatch/patches/patch-aa diff -u /dev/null kworldwatch/patches/patch-aa:1.1.3.1 --- /dev/null Sun Sep 26 05:06:31 1999 +++ kworldwatch/patches/patch-aa Sun Sep 26 05:00:55 1999 @@ -0,0 +1,69 @@ +--- configure.orig Sun Sep 26 04:16:24 1999 ++++ configure Sun Sep 26 04:17:22 1999 +@@ -70,6 +70,7 @@ + oldincludedir='/usr/include' + infodir='${prefix}/info' + mandir='${prefix}/man' ++sharedir=share + + # Initialize some other variables. + subdirs= +@@ -400,6 +401,9 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + ++ --sharedir=*) ++ sharedir="$ac_optarg" ;; ++ + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + +@@ -2533,27 +2537,27 @@ + + + +-kde_htmldir="\$(prefix)/share/doc/HTML" ++kde_htmldir="\$(prefix)/${sharedir}/doc/HTML" + +-kde_appsdir="\$(prefix)/share/applnk" ++kde_appsdir="\$(prefix)/${sharedir}/applnk" + +-kde_icondir="\$(prefix)/share/icons" ++kde_icondir="\$(prefix)/${sharedir}/icons" + +-kde_minidir="\$(prefix)/share/icons/mini" ++kde_minidir="\$(prefix)/${sharedir}/icons/mini" + +-kde_datadir="\$(prefix)/share/apps" ++kde_datadir="\$(prefix)/${sharedir}/apps" + +-kde_locale="\$(prefix)/share/locale" ++kde_locale="\$(prefix)/${sharedir}/locale" + + kde_cgidir="\$(exec_prefix)/cgi-bin" + +-kde_confdir="\$(prefix)/share/config" ++kde_confdir="\$(prefix)/${sharedir}/config" + +-kde_mimedir="\$(prefix)/share/mimelnk" ++kde_mimedir="\$(prefix)/${sharedir}/mimelnk" + +-kde_toolbardir="\$(prefix)/share/toolbar" ++kde_toolbardir="\$(prefix)/${sharedir}/toolbar" + +-kde_wallpaperdir="\$(prefix)/share/wallpapers" ++kde_wallpaperdir="\$(prefix)/${sharedir}/wallpapers" + + kde_kccmodules="\$(prefix)/lib/kcc/modules" + +--- configure.orig Mon May 11 04:13:36 1998 ++++ configure Sun Sep 26 04:13:16 1999 +@@ -3716,7 +3716,7 @@ + + echo $ac_n "checking for the third argument of getsockname""... $ac_c" 1>&6 + echo "configure:3719: checking for the third argument of getsockname" >&5 +-if eval "test \"`echo '$''{'ac_cv_ksize_t_int'+set}'`\" = set"; then ++if eval "test \"`echo '$ac_cv_ksize_t_int'+set`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <