2.0 -> 3.0

Also make myself as a maintainer (Okayed with se@freebsd.org)

5 files changed, 42 insertions, 23 deletions

diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile
index 32ccd8bd9465..8944edc90649 100644
--- a/palm/kpilot/Makefile
+++ b/palm/kpilot/Makefile
@@ -3,14 +3,14 @@
 # Date created:        09 April 1998
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1998/04/15 22:18:12 jseger Exp $
+# $Id: Makefile,v 1.4 1998/05/04 20:23:08 jseger Exp $
 #
 
-DISTNAME=	kpilot-2.0
+DISTNAME=	kpilot-3.0
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://www.slac.com/pilone/kpilot_home/download/
 
-MAINTAINER=	se@freebsd.org
+MAINTAINER=	dima@freebsd.org
 
 BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
@@ -23,14 +23,16 @@ LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
 		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
-BROKEN=		install
-
+KDEDIR?=	$(PREFIX)
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--with-extra-includes=$(PREFIX)/include/giflib"
 USE_GMAKE=	yes
 
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		KDEDIR="${KDEDIR}"
+
+MAKE_ENV=	KDEDIR="${KDEDIR}"
 
 pre-configure:
 		${CP} ${FILESDIR}/libtool ${FILESDIR}/ltmain.sh $(WRKSRC)/kpilot/libpilot
diff --git a/palm/kpilot/distinfo b/palm/kpilot/distinfo
index e1186658f7db..181887c33db3 100644
--- a/palm/kpilot/distinfo
+++ b/palm/kpilot/distinfo
@@ -1 +1 @@
-MD5 (kpilot-2.0.tar.gz) = 932028c492705599a26a36b003ff3662
+MD5 (kpilot-3.0.tar.gz) = 0799658454cb0960dfd47474ec69a609
diff --git a/palm/kpilot/files/patch-aa b/palm/kpilot/files/patch-aa
index 741a3985f166..5b5ceecf6ace 100644
--- a/palm/kpilot/files/patch-aa
+++ b/palm/kpilot/files/patch-aa
@@ -30,12 +30,12 @@
 *** 2214,2218 ****
   for i in $qt_libdirs;
   do
-!   for j in libqt.so libqt.so.1.30 libqt.so.1 libqt.a libqt.sl;
+!   for j in libqt.so libqt.so.1.30 libqt.so.1.31 libqt.so.1 libqt.a libqt.sl;
     do
       if test -r "$i/$j"; then
 --- 2214,2218 ----
   for i in $qt_libdirs;
   do
-!   for j in libqt.so libqt.so.1.30 libqt.so.1.31 libqt.so.1.32 libqt.so.1 libqt.a libqt.sl;
+!   for j in libqt.so libqt.so.1.30 libqt.so.1.31 libqt.so.1.32 libqt.so.1.33 libqt.so.1 libqt.a libqt.sl;
     do
       if test -r "$i/$j"; then
diff --git a/palm/kpilot/files/patch-ab b/palm/kpilot/files/patch-ab
index ed0ecf6b3b34..b5ad96c1e907 100644
--- a/palm/kpilot/files/patch-ab
+++ b/palm/kpilot/files/patch-ab
@@ -1,17 +1,12 @@
 *** kpilot/Makefile.in~	Sat Mar  7 14:21:14 1998
 --- kpilot/Makefile.in	Sat Mar  7 14:21:25 1998
 ***************
-*** 144,149 ****
-  
-  # the library search path
-! kpilot_LDFLAGS = @all_libraries@ -Llibpilot/_libs
-! kpilotDaemon_LDFLAGS = @all_libraries@ -Llibpilot/_libs
-  
-  # the libraries to link against. Be aware of the order. First the libraries,
---- 144,149 ----
-  
-  # the library search path
-! kpilot_LDFLAGS = @all_libraries@ -Llibpilot/.libs
-! kpilotDaemon_LDFLAGS = @all_libraries@ -Llibpilot/.libs
-  
-  # the libraries to link against. Be aware of the order. First the libraries,
+*** 582,587 ****
+--- 582,588 ----
+  	$(INSTALL_DATA) kpilprc.xpm $(kde_icondir)
+  	$(mkinstalldirs) $(kde_minidir)
+  	$(INSTALL_DATA) mini-kpilot.xpm $(kde_minidir)/kpilot.xpm
++ 	$(mkinstalldirs) $(kde_mimedir)
+  	grep kpilot $(MAGIC) 2>&1 >/dev/null || { cat kpilot.magic >> $(MAGIC); }
+  	$(mkinstalldirs) $(kde_mimedir)/palmpilot
+  	$(INSTALL_DATA) application.kdelnk $(kde_mimedir)/palmpilot
diff --git a/palm/kpilot/files/patch-ae b/palm/kpilot/files/patch-ae
new file mode 100644
index 000000000000..260b57b59228
--- /dev/null
+++ b/palm/kpilot/files/patch-ae
@@ -0,0 +1,22 @@
+*** configure.orig	Sun Apr 26 20:31:19 1998
+--- configure	Fri May  8 15:34:13 1998
+***************
+*** 2601,2608 ****
+    ac_cv_path_MOC="$MOC" # Let the user override the test with a path.
+    ;;
+    *)
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+!   for ac_dir in $QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin$ac_dummy; do
+      test -z "$ac_dir" && ac_dir=.
+      if test -f $ac_dir/$ac_word; then
+        ac_cv_path_MOC="$ac_dir/$ac_word"
+--- 2601,2609 ----
+    ac_cv_path_MOC="$MOC" # Let the user override the test with a path.
+    ;;
+    *)
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++   FOO="$QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin$ac_dummy"
+!   for ac_dir in $FOO; do
+      test -z "$ac_dir" && ac_dir=.
+      if test -f $ac_dir/$ac_word; then
+        ac_cv_path_MOC="$ac_dir/$ac_word"