* corrected CATEGORIES (from 'x11 kde' to 'comms kde')

* updated for ELF
* correct patches so that we have only one patch per file
* give configure a hint so that it may find pilot-link libs

4 files changed, 55 insertions, 68 deletions

diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile
index ac50a3a67366..b12bd17ab40a 100644
--- a/palm/kpilot/Makefile
+++ b/palm/kpilot/Makefile
@@ -3,17 +3,15 @@
 # Date created:        09 April 1998
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.15 1998/10/02 18:21:28 brian Exp $
+# $Id: Makefile,v 1.16 1998/10/11 23:34:36 jseger Exp $
 #
 
 DISTNAME=	kpilot-3.0.2
-CATEGORIES=	x11 kde
+CATEGORIES=	comms kde
 MASTER_SITES=	http://www.slac.com/pilone/kpilot_home/download/
 
 MAINTAINER=	dima@freebsd.org
 
-BROKEN_ELF=	library names
-
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.1:${PORTSDIR}/x11/kdelibs \
@@ -25,13 +23,15 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 
 USE_QT=		yes
 KDEDIR?=	$(PREFIX)
+PILOTDIR?=	$(LOCALBASE)/pilot
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--with-extra-includes=$(PREFIX)/include/giflib"
 USE_GMAKE=	yes
 
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555" \
-		KDEDIR="${KDEDIR}"
+		KDEDIR="${KDEDIR}" \
+		LDFLAGS="-L${PILOTDIR}/lib"
 
 MAKE_ENV=	KDEDIR="${KDEDIR}"
 
diff --git a/palm/kpilot/files/patch-aa b/palm/kpilot/files/patch-aa
index 5b5ceecf6ace..ba5caf43b0f8 100644
--- a/palm/kpilot/files/patch-aa
+++ b/palm/kpilot/files/patch-aa
@@ -1,41 +1,39 @@
-*** configure~	Sun Oct 26 01:04:56 1997
---- configure	Sat Nov  1 23:03:17 1997
-***************
-*** 913,917 ****
-  
-  
-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-  
-  
---- 913,917 ----
-  
-  
-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
-  
-  
-***************
-*** 2039,2043 ****
-  do
-    for ac_extension in a so sl; do
-!     if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-        ac_x_libraries=$ac_dir
-        break 2
---- 2039,2043 ----
-  do
-    for ac_extension in a so sl; do
-!     if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension*; then
-        ac_x_libraries=$ac_dir
-        break 2
-***************
-*** 2214,2218 ****
-  for i in $qt_libdirs;
-  do
-!   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.33 libqt.so.1 libqt.a libqt.sl;
-    do
-      if test -r "$i/$j"; then
+--- configure.orig	Tue Nov  3 18:45:40 1998
++++ configure	Tue Nov  3 18:45:45 1998
+@@ -729,7 +729,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=kpilot
+@@ -1994,7 +1994,7 @@
+     ; \
+ do
+   for ac_extension in a so sl; do
+-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
++    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension*; then
+       ac_x_libraries=$ac_dir
+       break 2
+     fi
+@@ -2413,7 +2413,7 @@
+ qt_libdir=NO
+ for i in $qt_libdirs;
+ do
+-  for j in libqt.so libqt.so.1.30 libqt.so.1.31 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
+       qt_libdir=$i
+@@ -2602,7 +2602,8 @@
+   ;;
+   *)
+   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
++  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"
diff --git a/palm/kpilot/files/patch-ac b/palm/kpilot/files/patch-ac
new file mode 100644
index 000000000000..1e94f0edf953
--- /dev/null
+++ b/palm/kpilot/files/patch-ac
@@ -0,0 +1,11 @@
+--- kpilot/libpilot/Makefile.orig	Tue Nov  3 18:48:04 1998
++++ kpilot/libpilot/Makefile	Tue Nov  3 18:48:16 1998
+@@ -43,7 +43,7 @@
+ 
+ all: libpisock.la
+ install: libpisock.la
+-	cp _libs/* $(KDEDIR)/lib
++	cp .libs/* $(KDEDIR)/lib
+ 
+ libpisock.a: $(OBJS)
+ 	$(RM) libpisock.a
diff --git a/palm/kpilot/files/patch-ae b/palm/kpilot/files/patch-ae
deleted file mode 100644
index 260b57b59228..000000000000
--- a/palm/kpilot/files/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-*** 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"