20 files changed, 57 insertions, 40 deletions

diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index 0740cc687f68..c4f23f511ccd 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -33,7 +33,7 @@ USE_GETOPT_LONG=	yes
 USE_LIBLTDL=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-smtp --enable-jasper-filter
diff --git a/net/ayttm/pkg-plist b/net/ayttm/pkg-plist
index b8565309a5f3..3335060c874b 100644
--- a/net/ayttm/pkg-plist
+++ b/net/ayttm/pkg-plist
@@ -1,45 +1,25 @@
 bin/ayttm
 bin/ayttm_streamer_wrapper.sh
 etc/ayttmrc
-lib/ayttm/aim-toc.la
 lib/ayttm/aim-toc.so
-lib/ayttm/autotrans.la
 lib/ayttm/autotrans.so
-lib/ayttm/aycryption.la
 lib/ayttm/aycryption.so
-lib/ayttm/icq-toc.la
 lib/ayttm/icq-toc.so
-lib/ayttm/img2jpc.la
 lib/ayttm/img2jpc.so
-lib/ayttm/import_everybuddy.la
 lib/ayttm/import_everybuddy.so
-lib/ayttm/import_gaim.la
 lib/ayttm/import_gaim.so
-lib/ayttm/import_gnomeicu.la
 lib/ayttm/import_gnomeicu.so
-lib/ayttm/importicq.la
 lib/ayttm/importicq.so
-lib/ayttm/importlicq.la
 lib/ayttm/importlicq.so
-lib/ayttm/irc.la
 lib/ayttm/irc.so
-lib/ayttm/jabber.la
 lib/ayttm/jabber.so
-lib/ayttm/middle.la
 lib/ayttm/middle.so
-lib/ayttm/msn2.la
 lib/ayttm/msn2.so
-lib/ayttm/notes.la
 lib/ayttm/notes.so
-lib/ayttm/rainbow.la
 lib/ayttm/rainbow.so
-lib/ayttm/smiley-themer.la
 lib/ayttm/smiley-themer.so
-lib/ayttm/smtp.la
 lib/ayttm/smtp.so
-lib/ayttm/video_capture.la
 lib/ayttm/video_capture.so
-lib/ayttm/yahoo2.la
 lib/ayttm/yahoo2.so
 %%DATADIR%%/smileys/Console Smileys/aysmile.rc
 %%DATADIR%%/smileys/Console Smileys/blank.xpm
diff --git a/net/cdonkey/Makefile b/net/cdonkey/Makefile
index 28bbf180a74c..d806d330287f 100644
--- a/net/cdonkey/Makefile
+++ b/net/cdonkey/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	bin/cDonkey
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/cDonkey-${PORTVERSION}
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index 17f35b734e45..a8be9b74b797 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	tf:${PORTSDIR}/net/tinyfugue
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS+=	--enable-compile-warnings=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -31,6 +32,10 @@ MODIFY=		Makefile.in data/Makefile.in
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 pre-patch:
 .for i in ${MODIFY}
 	@${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 361665c41090..f0a744a6fba7 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A simple network library built upon Glib
 
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack glib12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 MAN1=	gnet-config.1
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 49101c838bd4..6987034ead33 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net/ickle/Makefile b/net/ickle/Makefile
index 9fceddda87a3..0c8bf9253b08 100644
--- a/net/ickle/Makefile
+++ b/net/ickle/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile
index 2b77effbf240..86a4c5e9dc9a 100644
--- a/net/icqlib/Makefile
+++ b/net/icqlib/Makefile
@@ -16,7 +16,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by kicq (not libicq)
 
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/icqlib0/Makefile b/net/icqlib0/Makefile
index 0b5ea80b7fce..5494cc277025 100644
--- a/net/icqlib0/Makefile
+++ b/net/icqlib0/Makefile
@@ -16,11 +16,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Old branch 0.x.x of library required by kicq (used by icqmail)
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 
 LATEST_LINK=	icqlib0
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/icqlib/icq.h ${PREFIX}/include/icq0.h
 
diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile
index e651ee5afd4d..dc23fadbf3f5 100644
--- a/net/libfreenet/Makefile
+++ b/net/libfreenet/Makefile
@@ -18,11 +18,13 @@ COMMENT=	Freenet library written in C
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/libfreenet
 INSTALLS_SHLIB=	yes
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 3bca75346245..c089a700b808 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -16,7 +16,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/libicq2000/Makefile b/net/libicq2000/Makefile
index 2720961dafe3..fd8dad7fa2ba 100644
--- a/net/libicq2000/Makefile
+++ b/net/libicq2000/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An opensource C++ library to support icq2000/2001 protocol
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--disable-static
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net/libicq2000/pkg-plist b/net/libicq2000/pkg-plist
index fe33bf5d601e..d3192506735f 100644
--- a/net/libicq2000/pkg-plist
+++ b/net/libicq2000/pkg-plist
@@ -39,6 +39,7 @@ include/libicq2000/time_extra.h
 include/libicq2000/userinfoconstants.h
 include/libicq2000/userinfohelpers.h
 include/libicq2000/version.h
+lib/libicq2000.a
 lib/libicq2000.so
 lib/libicq2000.so.5
 share/aclocal/libicq2000.m4
diff --git a/net/libosip/Makefile b/net/libosip/Makefile
index 4355001d8f65..97402a95fe1b 100644
--- a/net/libosip/Makefile
+++ b/net/libosip/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A low layer of SIP implementation
 
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+USE_LIBTOOL_VER=15
+#LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 INSTALLS_SHLIB=	yes
 
 MAN1=	osip.1
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index 5a8f0c482dc8..2544f3cd513d 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -20,7 +20,7 @@ COMMENT=	A C++-Library for PVM
 BUILD_DEPENDS=	${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-pvm-incs=${LOCALBASE}/include \
 		--with-pvm-libs=${LOCALBASE}/lib
 INSTALLS_SHLIB=	yes
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 5fb0ba0b10ca..d0fa4da5391b 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -31,7 +31,7 @@ COMMENT=	A free SMB and CIFS client and server for UNIX
 CONFLICTS=	ja-samba-2.* samba-3.* sharity-light-1.*
 USE_SUBMAKE=	YES
 USE_GMAKE=	YES
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 USE_AUTOCONF_VER=	213
 
 # directories
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index cbf71296e66b..2e3636b138a0 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -25,11 +25,11 @@ GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
 
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 
 MAN1=	serveez.1 serveez-config.1
 INFO=	serveez serveez-api
@@ -37,4 +37,8 @@ INFO=	serveez serveez-api
 CPPFLAGS=	`${GUILE_CONFIG} compile`
 LDFLAGS=	`${GUILE_CONFIG} link`
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-release||g' \
+		${WRKSRC}/src/libserveez/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index c654b86ff452..7f2b3d06b49d 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	5250 Telnet protocol and Terminal
 
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-os-dir=no
 INSTALLS_SHLIB=	yes
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index ab13daa88d13..432215d2f1d5 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -20,11 +20,16 @@ LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 
 MAN1=	meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \
 	query-meerkat.1 xml-rpc-api2txt.1
 MAN7=	xmlrpc-c.7
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index ab13daa88d13..432215d2f1d5 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -20,11 +20,16 @@ LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 
 MAN1=	meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \
 	query-meerkat.1 xml-rpc-api2txt.1
 MAN7=	xmlrpc-c.7
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>