Use USE_LIBTOOL.

Submitted by:	Jeremy Lea <reg@freebsd.org>

5 files changed, 100 insertions, 19 deletions

diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile
index 0cdc2e1..752539c 100644
--- a/palm/kpilot/Makefile
+++ b/palm/kpilot/Makefile
@@ -13,25 +13,15 @@ MASTER_SITES=	http://www.slac.com/pilone/kpilot_home/download/
 MAINTAINER=	dima@freebsd.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.2:${PORTSDIR}/x11/kdelibs11 \
-		jscript.2:${PORTSDIR}/x11/kdelibs11 \
-		khtmlw.2:${PORTSDIR}/x11/kdelibs11 \
-		kfm.2:${PORTSDIR}/x11/kdelibs11 \
-		mediatool.2:${PORTSDIR}/x11/kdelibs11
+		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
 USE_QT=		yes
 KDEDIR?=	$(PREFIX)
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
-		INSTALL_SCRIPT="install -c -m 555" \
-		KDEDIR="${KDEDIR}"
+CONFIGURE_ENV=	KDEDIR="${KDEDIR}"
 
 MAKE_ENV=	KDEDIR="${KDEDIR}"
 
-pre-configure:
-		${CP} ${FILESDIR}/libtool.${PORTOBJFORMAT} ${WRKSRC}/kpilot/libpilot/libtool
-		${CP} ${FILESDIR}/ltmain.sh ${WRKSRC}/kpilot/libpilot/ltmain.sh
 
 .include <bsd.port.mk>
diff --git a/palm/kpilot/files/patch-aa b/palm/kpilot/files/patch-aa
index ba5caf4..7df1d59 100644
--- a/palm/kpilot/files/patch-aa
+++ b/palm/kpilot/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Tue Nov  3 18:45:40 1998
-+++ configure	Tue Nov  3 18:45:45 1998
+--- configure.orig	Sun Apr 26 20:31:19 1998
++++ configure	Thu Feb 10 23:00:42 2000
 @@ -729,7 +729,7 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -9,6 +9,17 @@
  
  
  PACKAGE=kpilot
+@@ -1447,8 +1447,8 @@
+ 
+ 
+ 
+-enable_static=no
+-enable_shared=no
++#enable_static=no
++#enable_shared=no
+ 
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
 @@ -1994,7 +1994,7 @@
      ; \
  do
@@ -37,3 +48,41 @@
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_MOC="$ac_dir/$ac_word"
+@@ -4046,12 +4047,17 @@
+ trap 'rm -fr `echo "Makefile \
+ 	kpilot/Makefile \
+ 	kpilot/doc/Makefile \
++	kpilot/doc/de/Makefile \
++	kpilot/doc/en/Makefile \
++	kpilot/libpilot/Makefile \
+ 	conduits/Makefile \
+ 	conduits/vcalconduit/Makefile \
++	conduits/vcalconduit/versit/Makefile \
+ 	conduits/popmail/Makefile \
++	po/Makefile \
+ 	po/en/Makefile \
+ 	po/de/Makefile \
+-	Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++	config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+ 
+@@ -4202,12 +4208,17 @@
+ CONFIG_FILES=\${CONFIG_FILES-"Makefile \
+ 	kpilot/Makefile \
+ 	kpilot/doc/Makefile \
++	kpilot/doc/de/Makefile \
++	kpilot/doc/en/Makefile \
++	kpilot/libpilot/Makefile \
+ 	conduits/Makefile \
+ 	conduits/vcalconduit/Makefile \
++	conduits/vcalconduit/versit/Makefile \
+ 	conduits/popmail/Makefile \
++	po/Makefile \
+ 	po/en/Makefile \
+ 	po/de/Makefile \
+-	Makefile"}
++	"}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/palm/kpilot/files/patch-ac b/palm/kpilot/files/patch-ac
index 1e94f0e..a6a8c68 100644
--- a/palm/kpilot/files/patch-ac
+++ b/palm/kpilot/files/patch-ac
@@ -1,11 +1,29 @@
---- kpilot/libpilot/Makefile.orig	Tue Nov  3 18:48:04 1998
-+++ kpilot/libpilot/Makefile	Tue Nov  3 18:48:16 1998
+--- kpilot/libpilot/Makefile.in.orig	Mon Apr 20 21:47:57 1998
++++ kpilot/libpilot/Makefile.in	Thu Feb 10 23:13:07 2000
+@@ -19,7 +19,7 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+-top_builddir = ..
++top_builddir = ../..
+ 
+ CC = @CC@
+ CFLAGS = -Iinclude @CFLAGS@
+@@ -31,7 +31,7 @@
+ ARFLAGS = @ARFLAGS@
+ RANLIB = @RANLIB@
+ RM = rm -f
+-LIBTOOL = ./libtool
++LIBTOOL = @LIBTOOL@
+ 
+ .SUFFIXES: .c .lo .o
+ 
 @@ -43,7 +43,7 @@
  
  all: libpisock.la
  install: libpisock.la
 -	cp _libs/* $(KDEDIR)/lib
-+	cp .libs/* $(KDEDIR)/lib
++	$(LIBTOOL)  --mode=install @INSTALL@ libpisock.la $(DESTDIR)$(libdir)/libpisock.la
  
  libpisock.a: $(OBJS)
  	$(RM) libpisock.a
diff --git a/palm/kpilot/files/patch-af b/palm/kpilot/files/patch-af
new file mode 100644
index 0000000..8046cf9
--- /dev/null
+++ b/palm/kpilot/files/patch-af
@@ -0,0 +1,9 @@
+--- kpilot/pilotListener.cc.orig	Thu Feb 10 22:24:08 2000
++++ kpilot/pilotListener.cc	Thu Feb 10 22:24:33 2000
+@@ -1,5 +1,6 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <string.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
diff --git a/palm/kpilot/pkg-plist b/palm/kpilot/pkg-plist
index 19a7fd4..9e47404 100644
--- a/palm/kpilot/pkg-plist
+++ b/palm/kpilot/pkg-plist
@@ -1,14 +1,29 @@
 bin/kpilot
 bin/kpilotDaemon
 bin/pilotListener
-lib/libpisock.so.2.0
+lib/libpisock.a
+lib/libpisock.so
+lib/libpisock.so.2
 share/applnk/Utilities/KPilotDaemon.kdelnk
 share/applnk/Utilities/kpilot.kdelnk
+share/apps/kpilot/conduits/popmail_conduit
+share/apps/kpilot/conduits/vcalconduit
 share/doc/HTML/de/kpilot/index.html
 share/doc/HTML/de/kpilot/using-kpilot.html
 share/doc/HTML/en/kpilot/index.html
 share/doc/HTML/en/kpilot/using-kpilot.html
+share/icons/kpilhck.xpm
+share/icons/kpillib.xpm
 share/icons/kpilot.xpm
+share/icons/kpilpdb.xpm
+share/icons/kpilprc.xpm
 share/icons/mini/kpilot.xpm
+share/mimelnk/palmpilot/application.kdelnk
+share/mimelnk/palmpilot/data.kdelnk
+share/mimelnk/palmpilot/hack.kdelnk
+share/mimelnk/palmpilot/library.kdelnk
+@dirrm share/mimelnk/palmpilot
 @dirrm share/doc/HTML/en/kpilot
 @dirrm share/doc/HTML/de/kpilot
+@dirrm share/apps/kpilot/conduits
+@dirrm share/apps/kpilot