24 files changed, 67 insertions, 24 deletions

diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 943daf617ec7..cfa8d2af4c46 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot-conduits2
 PORTVERSION=	2.0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index 8ced959b54e7..0f1b6138ca52 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -1,7 +1,17 @@
+lib/gnome-pilot/conduits/libemail_conduit.a
+lib/gnome-pilot/conduits/libemail_conduit.la
 lib/gnome-pilot/conduits/libemail_conduit.so
+lib/gnome-pilot/conduits/libexpense_conduit.a
+lib/gnome-pilot/conduits/libexpense_conduit.la
 lib/gnome-pilot/conduits/libexpense_conduit.so
+lib/gnome-pilot/conduits/libmal_conduit.a
+lib/gnome-pilot/conduits/libmal_conduit.la
 lib/gnome-pilot/conduits/libmal_conduit.so
+lib/gnome-pilot/conduits/libmemo_file_conduit.a
+lib/gnome-pilot/conduits/libmemo_file_conduit.la
 lib/gnome-pilot/conduits/libmemo_file_conduit.so
+lib/gnome-pilot/conduits/libtime_conduit.a
+lib/gnome-pilot/conduits/libtime_conduit.la
 lib/gnome-pilot/conduits/libtime_conduit.so
 share/gnome/gnome-pilot/conduits/expense.conduit
 share/gnome/gnome-pilot/conduits/mal.conduit
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index feec2df36883..844bad45a1e2 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot2
 PORTVERSION=	2.0.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel intlhack
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index 3e65cd35ef30..c5badbcd3812 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -14,16 +14,25 @@ include/gpilotd/gnome-pilot-structures.h
 include/gpilotd/gnome-pilot.h
 include/libgpilotdCM/gnome-pilot-conduit-config.h
 include/libgpilotdCM/gnome-pilot-conduit-management.h
+lib/gnome-pilot/conduits/libbackup_conduit.a
+lib/gnome-pilot/conduits/libbackup_conduit.la
 lib/gnome-pilot/conduits/libbackup_conduit.so
+lib/gnome-pilot/conduits/libfile_conduit.a
+lib/gnome-pilot/conduits/libfile_conduit.la
 lib/gnome-pilot/conduits/libfile_conduit.so
+lib/gnome-pilot/conduits/libtest_conduit.a
+lib/gnome-pilot/conduits/libtest_conduit.la
 lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
+lib/libgpilotd.la
 lib/libgpilotd.so
 lib/libgpilotd.so.3
 lib/libgpilotdcm.a
+lib/libgpilotdcm.la
 lib/libgpilotdcm.so
 lib/libgpilotdcm.so.2
 lib/libgpilotdconduit.a
+lib/libgpilotdconduit.la
 lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.2
 libdata/bonobo/servers/GNOME_PilotApplet.server
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 943daf617ec7..cfa8d2af4c46 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot-conduits2
 PORTVERSION=	2.0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot-conduits2/pkg-plist b/palm/gnomepilot-conduits2/pkg-plist
index 8ced959b54e7..0f1b6138ca52 100644
--- a/palm/gnomepilot-conduits2/pkg-plist
+++ b/palm/gnomepilot-conduits2/pkg-plist
@@ -1,7 +1,17 @@
+lib/gnome-pilot/conduits/libemail_conduit.a
+lib/gnome-pilot/conduits/libemail_conduit.la
 lib/gnome-pilot/conduits/libemail_conduit.so
+lib/gnome-pilot/conduits/libexpense_conduit.a
+lib/gnome-pilot/conduits/libexpense_conduit.la
 lib/gnome-pilot/conduits/libexpense_conduit.so
+lib/gnome-pilot/conduits/libmal_conduit.a
+lib/gnome-pilot/conduits/libmal_conduit.la
 lib/gnome-pilot/conduits/libmal_conduit.so
+lib/gnome-pilot/conduits/libmemo_file_conduit.a
+lib/gnome-pilot/conduits/libmemo_file_conduit.la
 lib/gnome-pilot/conduits/libmemo_file_conduit.so
+lib/gnome-pilot/conduits/libtime_conduit.a
+lib/gnome-pilot/conduits/libtime_conduit.la
 lib/gnome-pilot/conduits/libtime_conduit.so
 share/gnome/gnome-pilot/conduits/expense.conduit
 share/gnome/gnome-pilot/conduits/mal.conduit
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index feec2df36883..844bad45a1e2 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot2
 PORTVERSION=	2.0.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel intlhack
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index 3e65cd35ef30..c5badbcd3812 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -14,16 +14,25 @@ include/gpilotd/gnome-pilot-structures.h
 include/gpilotd/gnome-pilot.h
 include/libgpilotdCM/gnome-pilot-conduit-config.h
 include/libgpilotdCM/gnome-pilot-conduit-management.h
+lib/gnome-pilot/conduits/libbackup_conduit.a
+lib/gnome-pilot/conduits/libbackup_conduit.la
 lib/gnome-pilot/conduits/libbackup_conduit.so
+lib/gnome-pilot/conduits/libfile_conduit.a
+lib/gnome-pilot/conduits/libfile_conduit.la
 lib/gnome-pilot/conduits/libfile_conduit.so
+lib/gnome-pilot/conduits/libtest_conduit.a
+lib/gnome-pilot/conduits/libtest_conduit.la
 lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
+lib/libgpilotd.la
 lib/libgpilotd.so
 lib/libgpilotd.so.3
 lib/libgpilotdcm.a
+lib/libgpilotdcm.la
 lib/libgpilotdcm.so
 lib/libgpilotdcm.so.2
 lib/libgpilotdconduit.a
+lib/libgpilotdconduit.la
 lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.2
 libdata/bonobo/servers/GNOME_PilotApplet.server
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 7308be24d915..82b7e35fec93 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/palm/libmal/Makefile b/palm/libmal/Makefile
index 822d5ac88c2f..65279bdfd680 100644
--- a/palm/libmal/Makefile
+++ b/palm/libmal/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library encapsulating malsync
 LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 USE_GMAKE=	YES
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-pilot-prefix=${LOCALBASE}
 INSTALLS_SHLIB=	YES
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 7ff87df30306..9c632585d7d6 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pilot-link
 PORTVERSION=	0.11.8
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	palm comms
 MASTER_SITES=	${MASTER_SITE_GENTOO}
@@ -19,7 +19,7 @@ COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 TCL_VER?=	8.4
diff --git a/palm/pilot-link-devel/pkg-plist b/palm/pilot-link-devel/pkg-plist
index 79a025105d79..09d28f9a6a91 100644
--- a/palm/pilot-link-devel/pkg-plist
+++ b/palm/pilot-link-devel/pkg-plist
@@ -75,12 +75,15 @@ include/pi-usb.h
 include/pi-util.h
 include/pi-version.h
 lib/libpisock++.a
+lib/libpisock++.la
 lib/libpisock++.so
 lib/libpisock++.so.0
 lib/libpisock.a
+lib/libpisock.la
 lib/libpisock.so
 lib/libpisock.so.8
 lib/libpisync.a
+lib/libpisync.la
 lib/libpisync.so
 lib/libpisync.so.0
 %%WITH_TCL%%lib/libpitcl.a
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 7ff87df30306..9c632585d7d6 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pilot-link
 PORTVERSION=	0.11.8
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	palm comms
 MASTER_SITES=	${MASTER_SITE_GENTOO}
@@ -19,7 +19,7 @@ COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 TCL_VER?=	8.4
diff --git a/palm/pilot-link/pkg-plist b/palm/pilot-link/pkg-plist
index 79a025105d79..09d28f9a6a91 100644
--- a/palm/pilot-link/pkg-plist
+++ b/palm/pilot-link/pkg-plist
@@ -75,12 +75,15 @@ include/pi-usb.h
 include/pi-util.h
 include/pi-version.h
 lib/libpisock++.a
+lib/libpisock++.la
 lib/libpisock++.so
 lib/libpisock++.so.0
 lib/libpisock.a
+lib/libpisock.la
 lib/libpisock.so
 lib/libpisock.so.8
 lib/libpisync.a
+lib/libpisync.la
 lib/libpisync.so
 lib/libpisync.so.0
 %%WITH_TCL%%lib/libpitcl.a
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index 15cd56dc9528..00ca2a6237e8 100644
--- a/palm/synce-gnomevfs/Makefile
+++ b/palm/synce-gnomevfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE} \
 			--with-libsynce=${LOCALBASE}
 
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index 15cd56dc9528..00ca2a6237e8 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE} \
 			--with-libsynce=${LOCALBASE}
 
diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile
index 846d049e6e13..dafc15146bad 100644
--- a/palm/synce-kde/Makefile
+++ b/palm/synce-kde/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	synce-kde
 PORTVERSION=	0.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
@@ -28,7 +28,6 @@ USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool:15
-GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 PORTDOCS=	*
diff --git a/palm/synce-kde/pkg-plist b/palm/synce-kde/pkg-plist
index b3168017b95f..d75c9db44cd3 100644
--- a/palm/synce-kde/pkg-plist
+++ b/palm/synce-kde/pkg-plist
@@ -5,6 +5,7 @@ include/rakisyncfactory.h
 include/rakisyncplugin.h
 include/rapiwrapper.h
 include/rra.h
+lib/kde3/kio_rapip.a
 lib/kde3/kio_rapip.la
 lib/kde3/kio_rapip.so
 share/applnk/Utilities/raki.desktop
diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index 4e92f8bdc618..e48b2687d9df 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -21,7 +21,6 @@ MAN1=		pcp.1 pls.1 pmkdir.1 pmv.1 prm.1 prmdir.1 prun.1 pstatus.1 rapiconfig.1 s
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:13
 USE_ICONV=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile
index f2d8dc518d1b..a98a315cdd5f 100644
--- a/palm/synce-librra/Makefile
+++ b/palm/synce-librra/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
 MAN1=		synce-matchmaker.1
 
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index f9f28741d7bb..e3ba162951d7 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -17,7 +17,6 @@ MAN1=		synce.1
 
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
 
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index 4343bf445b56..9fa2983b50cd 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	synce-multisync_plugin
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
@@ -21,7 +21,7 @@ RUN_DEPENDS=	multisync:${PORTSDIR}/deskutils/multisync
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE} \
 			--with-libsynce=${LOCALBASE} \
 			--with-librra=${LOCALBASE} \
diff --git a/palm/synce-multisync/pkg-plist b/palm/synce-multisync/pkg-plist
index 443f5c7507ed..dcfd1c46ecb7 100644
--- a/palm/synce-multisync/pkg-plist
+++ b/palm/synce-multisync/pkg-plist
@@ -1,4 +1,5 @@
 lib/multisync/libsynce_plugin.a
+lib/multisync/libsynce_plugin.la
 lib/multisync/libsynce_plugin.so
 lib/multisync/libsynce_plugin.so.0
 share/gnome/synce/synce_multisync_plugin.glade
diff --git a/palm/synce-rra/Makefile b/palm/synce-rra/Makefile
index f2d8dc518d1b..a98a315cdd5f 100644
--- a/palm/synce-rra/Makefile
+++ b/palm/synce-rra/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
 MAN1=		synce-matchmaker.1
 
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}