Index: kdetelnet/Makefile diff -u kdetelnet/Makefile:1.1.1.1 kdetelnet/Makefile:1.1.3.1 --- kdetelnet/Makefile:1.1.1.1 Sun Sep 26 00:37:05 1999 +++ kdetelnet/Makefile Sun Sep 26 04:58:42 1999 @@ -22,9 +22,20 @@ kdeui.2:${PORTSDIR}/x11/kdelibs11 HAS_CONFIGURE= yes -CONFIGURE_ARGS= "--prefix=$(PREFIX)" +CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ + "--with-qt-includes=${QTDIR}/include/X11/qt" \ + "--with-qt-libraries=${QTDIR}/lib" \ + "--sharedir=share/kde" CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ - INSTALL_SCRIPT="install -c -m 555" + INSTALL_SCRIPT="install -c -m 555" \ + MOC="${QTDIR}/bin/moc" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" + +.if defined(PREFIX) +QTDIR?= ${PREFIX} +.else +QTDIR?= ${X11BASE} +.endif post-install: .if !defined(NOPORTDOCS) Index: kdetelnet/patches/patch-ab diff -u kdetelnet/patches/patch-ab:1.1.1.1 kdetelnet/patches/patch-ab:1.1.3.1 --- kdetelnet/patches/patch-ab:1.1.1.1 Sun Sep 26 00:37:05 1999 +++ kdetelnet/patches/patch-ab Sun Sep 26 04:58:43 1999 @@ -1,11 +1,58 @@ ---- configure.orig Fri Apr 2 17:32:48 1999 -+++ configure Fri Apr 2 17:32:50 1999 -@@ -2379,7 +2379,7 @@ - fi - done - IFS="$ac_save_ifs" -- test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc" -+ test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/X11R6/bin/moc" - ;; - esac - fi +--- configure.orig Sun Sep 26 01:48:32 1999 ++++ configure Sun Sep 26 01:50:57 1999 +@@ -62,6 +62,7 @@ + oldincludedir='/usr/include' + infodir='${prefix}/info' + mandir='${prefix}/man' ++sharedir=share + + # Initialize some other variables. + subdirs= +@@ -392,6 +393,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; } + ;; + +@@ -2499,27 +2503,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="\$(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/wallpaper" ++kde_wallpaperdir="\$(prefix)/${sharedir}/wallpaper" + + + Index: kdetelnet/pkg/PLIST diff -u kdetelnet/pkg/PLIST:1.1.1.1 kdetelnet/pkg/PLIST:1.1.3.1 --- kdetelnet/pkg/PLIST:1.1.1.1 Sun Sep 26 00:37:06 1999 +++ kdetelnet/pkg/PLIST Sun Sep 26 04:58:43 1999 @@ -1,31 +1,31 @@ bin/kdetelnet -share/doc/HTML/en/ktelnet/index.html -share/doc/HTML/de/ktelnet/index.html -share/config/ktelnetrc -share/apps/ktelnet/toolbar/dec.xpm -share/apps/ktelnet/toolbar/next_ws.xpm -share/apps/ktelnet/toolbar/panelize.xpm -share/apps/ktelnet/toolbar/session1.xpm -share/apps/ktelnet/toolbar/sgi.xpm -share/apps/ktelnet/toolbar/smalldown.xpm -share/apps/ktelnet/toolbar/smallup.xpm -share/apps/ktelnet/toolbar/sun.xpm -share/apps/ktelnet/pics/ktelnet.xpm -share/apps/ktelnet/pics/ktname.xpm -share/apps/ktelnet/pics/kdelogo.gif -share/locale/de/LC_MESSAGES/ktelnet.mo -share/locale/fr/LC_MESSAGES/ktelnet.mo -share/locale/es/LC_MESSAGES/ktelnet.mo -share/locale/it/LC_MESSAGES/ktelnet.mo -share/locale/pt/LC_MESSAGES/ktelnet.mo -share/locale/no/LC_MESSAGES/ktelnet.mo -share/locale/hr/LC_MESSAGES/ktelnet.mo -share/locale/sk/LC_MESSAGES/ktelnet.mo -share/icons/mini/ktelnet.xpm -share/icons/ktelnet.xpm -share/applnk/Internet/ktelnet.kdelnk -@dirrm share/apps/ktelnet/pics -@dirrm share/apps/ktelnet/toolbar -@dirrm share/apps/ktelnet -@dirrm share/doc/HTML/de/ktelnet -@dirrm share/doc/HTML/en/ktelnet +share/kde/doc/HTML/en/ktelnet/index.html +share/kde/doc/HTML/de/ktelnet/index.html +share/kde/config/ktelnetrc +share/kde/apps/ktelnet/toolbar/dec.xpm +share/kde/apps/ktelnet/toolbar/next_ws.xpm +share/kde/apps/ktelnet/toolbar/panelize.xpm +share/kde/apps/ktelnet/toolbar/session1.xpm +share/kde/apps/ktelnet/toolbar/sgi.xpm +share/kde/apps/ktelnet/toolbar/smalldown.xpm +share/kde/apps/ktelnet/toolbar/smallup.xpm +share/kde/apps/ktelnet/toolbar/sun.xpm +share/kde/apps/ktelnet/pics/ktelnet.xpm +share/kde/apps/ktelnet/pics/ktname.xpm +share/kde/apps/ktelnet/pics/kdelogo.gif +share/kde/locale/de/LC_MESSAGES/ktelnet.mo +share/kde/locale/fr/LC_MESSAGES/ktelnet.mo +share/kde/locale/es/LC_MESSAGES/ktelnet.mo +share/kde/locale/it/LC_MESSAGES/ktelnet.mo +share/kde/locale/pt/LC_MESSAGES/ktelnet.mo +share/kde/locale/no/LC_MESSAGES/ktelnet.mo +share/kde/locale/hr/LC_MESSAGES/ktelnet.mo +share/kde/locale/sk/LC_MESSAGES/ktelnet.mo +share/kde/icons/mini/ktelnet.xpm +share/kde/icons/ktelnet.xpm +share/kde/applnk/Internet/ktelnet.kdelnk +@dirrm share/kde/apps/ktelnet/pics +@dirrm share/kde/apps/ktelnet/toolbar +@dirrm share/kde/apps/ktelnet +@dirrm share/kde/doc/HTML/de/ktelnet +@dirrm share/kde/doc/HTML/en/ktelnet