Conversion to a single libtool environment.

Approved by:	portmgr (kris)

21 files changed, 68 insertions, 73 deletions

diff --git a/net-mgmt/arts++/Makefile b/net-mgmt/arts++/Makefile
index e20b649cc70f..f4ef3d69de86 100644
--- a/net-mgmt/arts++/Makefile
+++ b/net-mgmt/arts++/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	arts++
 PORTVERSION=	1.1.a11
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.caida.org/pub/arts++/
@@ -20,7 +20,6 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
 USE_GCC=	2.95
 
 MANL=		artsportagg.l artsports.l artsprotos.l artsnets.l artsdump.l \
diff --git a/net-mgmt/arts++/pkg-plist b/net-mgmt/arts++/pkg-plist
index 3dcf9adb72de..a46e51300b9e 100644
--- a/net-mgmt/arts++/pkg-plist
+++ b/net-mgmt/arts++/pkg-plist
@@ -91,5 +91,6 @@ include/Ipv4PrefixPatricia.hh
 include/artslocal.h
 include/caida_t.h
 lib/libArts.a
+lib/libArts.la
 lib/libArts.so
 lib/libArts.so.0
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index 04620a17c076..ba00289034cc 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cflowd
 PORTVERSION=	2.1.b1
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.caida.org/pub/cflowd/
@@ -23,7 +23,6 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:13
 USE_GCC=	2.95
 
 CONFIGURE_ARGS=	--enable-shared --with-artspp=${LOCALBASE}
diff --git a/net-mgmt/cflowd/pkg-plist b/net-mgmt/cflowd/pkg-plist
index 75efc75a4ef7..4cbd606e6b8c 100644
--- a/net-mgmt/cflowd/pkg-plist
+++ b/net-mgmt/cflowd/pkg-plist
@@ -75,9 +75,11 @@ include/cflowd/snmp++/userdefined.h
 include/cflowd/snmp++/usertimeout.h
 include/cflowd/snmp++/vb.h
 lib/cflowd/libCfd.a
+lib/cflowd/libCfd.la
 lib/cflowd/libCfd.so
 lib/cflowd/libCfd.so.0
 lib/cflowd/libsnmp++.a
+lib/cflowd/libsnmp++.la
 lib/cflowd/libsnmp++.so
 lib/cflowd/libsnmp++.so.0
 sbin/cfdcollect
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 8ab7a617992d..4759799fd76b 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A graphical network traffic visualization tool for gnome
 USE_GETTEXT=	yes
 USE_GNOME=	libglade2 libgnomeui
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 96194a6525d6..3a44bc7b8f9e 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=		ettercap
 PORTVERSION=		0.7.3
 DISTVERSIONPREFIX=	NG-
-PORTREVISION=		2
+PORTREVISION=		3
 PORTEPOCH=		1
 CATEGORIES=		net-mgmt security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -27,8 +27,8 @@ OPTIONS=	GTK	"Build with GTK2+ GUI"	on \
 		PCRE	"Build with PCRE regexps in filters"	on
 
 WANT_GNOME=	yes
+USE_AUTOTOOLS=	libltdl:15
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_REINPLACE=	yes
 
 MAN5=		etter.conf.5
diff --git a/net-mgmt/ettercap/pkg-plist b/net-mgmt/ettercap/pkg-plist
index 9261c29720f7..c15d3577f402 100644
--- a/net-mgmt/ettercap/pkg-plist
+++ b/net-mgmt/ettercap/pkg-plist
@@ -4,33 +4,61 @@ bin/etterlog
 @unexec if cmp -s %D/etc/etter.conf.sample %D/etc/etter.conf; then rm -f %D/etc/etter.conf; else echo "If permanently deleting this package, %D/etc/etter.conf must be removed manually."; fi
 etc/etter.conf.sample
 @exec [ -f %B/etter.conf ] || cp %B/%f %B/etter.conf
+%%PLUGINS%%lib/ettercap/ec_arp_cop.la
 %%PLUGINS%%lib/ettercap/ec_arp_cop.so
+%%PLUGINS%%lib/ettercap/ec_autoadd.la
 %%PLUGINS%%lib/ettercap/ec_autoadd.so
+%%PLUGINS%%lib/ettercap/ec_chk_poison.la
 %%PLUGINS%%lib/ettercap/ec_chk_poison.so
+%%PLUGINS%%lib/ettercap/ec_dns_spoof.la
 %%PLUGINS%%lib/ettercap/ec_dns_spoof.so
+%%PLUGINS%%lib/ettercap/ec_dos_attack.la
 %%PLUGINS%%lib/ettercap/ec_dos_attack.so
+%%PLUGINS%%lib/ettercap/ec_dummy.la
 %%PLUGINS%%lib/ettercap/ec_dummy.so
+%%PLUGINS%%lib/ettercap/ec_find_conn.la
 %%PLUGINS%%lib/ettercap/ec_find_conn.so
+%%PLUGINS%%lib/ettercap/ec_find_ettercap.la
 %%PLUGINS%%lib/ettercap/ec_find_ettercap.so
+%%PLUGINS%%lib/ettercap/ec_find_ip.la
 %%PLUGINS%%lib/ettercap/ec_find_ip.so
+%%PLUGINS%%lib/ettercap/ec_finger.la
 %%PLUGINS%%lib/ettercap/ec_finger.so
+%%PLUGINS%%lib/ettercap/ec_finger_submit.la
 %%PLUGINS%%lib/ettercap/ec_finger_submit.so
+%%PLUGINS%%lib/ettercap/ec_gre_relay.la
 %%PLUGINS%%lib/ettercap/ec_gre_relay.so
+%%PLUGINS%%lib/ettercap/ec_gw_discover.la
 %%PLUGINS%%lib/ettercap/ec_gw_discover.so
+%%PLUGINS%%lib/ettercap/ec_isolate.la
 %%PLUGINS%%lib/ettercap/ec_isolate.so
+%%PLUGINS%%lib/ettercap/ec_link_type.la
 %%PLUGINS%%lib/ettercap/ec_link_type.so
+%%PLUGINS%%lib/ettercap/ec_pptp_chapms1.la
 %%PLUGINS%%lib/ettercap/ec_pptp_chapms1.so
+%%PLUGINS%%lib/ettercap/ec_pptp_clear.la
 %%PLUGINS%%lib/ettercap/ec_pptp_clear.so
+%%PLUGINS%%lib/ettercap/ec_pptp_pap.la
 %%PLUGINS%%lib/ettercap/ec_pptp_pap.so
+%%PLUGINS%%lib/ettercap/ec_pptp_reneg.la
 %%PLUGINS%%lib/ettercap/ec_pptp_reneg.so
+%%PLUGINS%%lib/ettercap/ec_rand_flood.la
 %%PLUGINS%%lib/ettercap/ec_rand_flood.so
+%%PLUGINS%%lib/ettercap/ec_remote_browser.la
 %%PLUGINS%%lib/ettercap/ec_remote_browser.so
+%%PLUGINS%%lib/ettercap/ec_reply_arp.la
 %%PLUGINS%%lib/ettercap/ec_reply_arp.so
+%%PLUGINS%%lib/ettercap/ec_repoison_arp.la
 %%PLUGINS%%lib/ettercap/ec_repoison_arp.so
+%%PLUGINS%%lib/ettercap/ec_scan_poisoner.la
 %%PLUGINS%%lib/ettercap/ec_scan_poisoner.so
+%%PLUGINS%%lib/ettercap/ec_search_promisc.la
 %%PLUGINS%%lib/ettercap/ec_search_promisc.so
+%%PLUGINS%%lib/ettercap/ec_smb_clear.la
 %%PLUGINS%%lib/ettercap/ec_smb_clear.so
+%%PLUGINS%%lib/ettercap/ec_smb_down.la
 %%PLUGINS%%lib/ettercap/ec_smb_down.so
+%%PLUGINS%%lib/ettercap/ec_stp_mangler.la
 %%PLUGINS%%lib/ettercap/ec_stp_mangler.so
 %%PLUGINS%%@dirrm lib/ettercap
 %%DATADIR%%/etter.dns
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 15d133106e5c..d84dc0fa8cc1 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -13,10 +13,9 @@ MASTER_SITES=	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Convert, change and calculate with IPv6 addresses
 
-GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/ipv6calc/ipv6calc ${PREFIX}/bin
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index b7aaa80329de..288117b1ec39 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE} --without-html \
 			--without-shelltests
 
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
 OPTIONS=	LDAP "Enable OpenLDAP support" off
 
 MAN1=		nefu.1
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index d5cab6c70808..3e3a709d7866 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.2.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -30,7 +31,6 @@ USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_RC_SUBR=	yes
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	#empty
 .if !defined(WITHOUT_PERL)
 USE_PERL5=	yes
 .endif
@@ -211,8 +211,8 @@ post-patch: patch-autoconf patch-script-files patch-startup-files
 
 patch-autoconf:
 	@${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp
-	@${CAT} ${LOCALBASE}/share/aclocal/libtool15.m4 >> ${WRKSRC}/aclocal.m4.tmp
-	@${CP} ${LOCALBASE}/share/libtool15/ltmain.sh ${WRKSRC}
+	@${CAT} ${LIBTOOL_M4} >> ${WRKSRC}/aclocal.m4.tmp
+	@${CP} ${LTMAIN} ${WRKSRC}
 	@${MV} ${WRKSRC}/aclocal.m4.tmp ${WRKSRC}/aclocal.m4
 
 patch-script-files:
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index 03ad12a09fa5..bb9716891e18 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -174,22 +174,27 @@ include/net-snmp/utilities.h
 include/net-snmp/varbind_api.h
 include/net-snmp/version.h
 lib/libnetsnmp.a
+lib/libnetsnmp.la
 lib/libnetsnmp.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so
 @unexec rm -f %B/libnetsnmp.so 2> /dev/null || true
 lib/libnetsnmpagent.a
+lib/libnetsnmpagent.la
 lib/libnetsnmpagent.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so
 @unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true
 lib/libnetsnmphelpers.a
+lib/libnetsnmphelpers.la
 lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so
 @unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true
 lib/libnetsnmpmibs.a
+lib/libnetsnmpmibs.la
 lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so
 @unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true
 lib/libnetsnmptrapd.a
+lib/libnetsnmptrapd.la
 lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so
 @unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index d5cab6c70808..3e3a709d7866 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.2.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -30,7 +31,6 @@ USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_RC_SUBR=	yes
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	#empty
 .if !defined(WITHOUT_PERL)
 USE_PERL5=	yes
 .endif
@@ -211,8 +211,8 @@ post-patch: patch-autoconf patch-script-files patch-startup-files
 
 patch-autoconf:
 	@${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp
-	@${CAT} ${LOCALBASE}/share/aclocal/libtool15.m4 >> ${WRKSRC}/aclocal.m4.tmp
-	@${CP} ${LOCALBASE}/share/libtool15/ltmain.sh ${WRKSRC}
+	@${CAT} ${LIBTOOL_M4} >> ${WRKSRC}/aclocal.m4.tmp
+	@${CP} ${LTMAIN} ${WRKSRC}
 	@${MV} ${WRKSRC}/aclocal.m4.tmp ${WRKSRC}/aclocal.m4
 
 patch-script-files:
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 03ad12a09fa5..bb9716891e18 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -174,22 +174,27 @@ include/net-snmp/utilities.h
 include/net-snmp/varbind_api.h
 include/net-snmp/version.h
 lib/libnetsnmp.a
+lib/libnetsnmp.la
 lib/libnetsnmp.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so
 @unexec rm -f %B/libnetsnmp.so 2> /dev/null || true
 lib/libnetsnmpagent.a
+lib/libnetsnmpagent.la
 lib/libnetsnmpagent.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so
 @unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true
 lib/libnetsnmphelpers.a
+lib/libnetsnmphelpers.la
 lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so
 @unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true
 lib/libnetsnmpmibs.a
+lib/libnetsnmpmibs.la
 lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so
 @unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true
 lib/libnetsnmptrapd.a
+lib/libnetsnmptrapd.la
 lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so
 @unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 355953a2b902..a6311d1f977b 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ucd-snmp
 PORTVERSION=	4.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -15,11 +15,10 @@ MASTER_SITE_SUBDIR=	net-snmp
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
-USE_AUTOTOOLS=	autoconf:213 libtool:13:inc
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CFLAGS+=	-fPIC
 
 CONFIGURE_ARGS+=	--enable-shared \
diff --git a/net-mgmt/net-snmp4/files/patch-Makefile.top b/net-mgmt/net-snmp4/files/patch-Makefile.top
index e6077bc203ef..7e417a1e2500 100644
--- a/net-mgmt/net-snmp4/files/patch-Makefile.top
+++ b/net-mgmt/net-snmp4/files/patch-Makefile.top
@@ -5,7 +5,7 @@
  CC	        = @CC@
  # version number is prefixed by a 0 for a better shared library version number
 -LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o
-+LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o
++LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info 4 -o
  LIB_EXTENSION   = la
  LIB_VERSION     =
  LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/net-mgmt/net-snmp4/files/patch-aclocal.m4 b/net-mgmt/net-snmp4/files/patch-aclocal.m4
deleted file mode 100644
index eb2e519aa7f0..000000000000
--- a/net-mgmt/net-snmp4/files/patch-aclocal.m4
+++ /dev/null
@@ -1,48 +0,0 @@
---- aclocal.m4.orig	Tue Sep 18 17:08:01 2001
-+++ aclocal.m4	Mon Jan 21 10:38:40 2002
-@@ -196,8 +196,23 @@
- AC_DEFUN([AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
- 
-+# Save cache, so that ltconfig can load it
-+AC_CACHE_SAVE
-+
-+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
-+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
-+|| AC_MSG_ERROR([libtool configure failed])
-+
-+# Reload cache, that may have been modified by ltconfig
-+AC_CACHE_LOAD
-+
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -224,6 +239,11 @@
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
- 
-+case "$target" in
-+NONE) lt_target="$host" ;;
-+*) lt_target="$target" ;;
-+esac
-+
- _LT_AC_PROG_ECHO_BACKSLASH
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
-@@ -875,7 +895,7 @@
- # All known linkers require a `.a' archive for static linking (except M$VC,
- # which needs '.lib').
- libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
- ofile="$default_ofile"
- with_gnu_ld="$lt_cv_prog_gnu_ld"
- need_locks="$enable_libtool_lock"
diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist
index 75c49651f610..439aeabe77b3 100644
--- a/net-mgmt/net-snmp4/pkg-plist
+++ b/net-mgmt/net-snmp4/pkg-plist
@@ -63,12 +63,15 @@ include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
 @dirrm include/ucd-snmp
 lib/libsnmp.a
+lib/libsnmp.la
 lib/libsnmp.so
 lib/libsnmp.so.%%shlib%%
 lib/libucdagent.a
+lib/libucdagent.la
 lib/libucdagent.so
 lib/libucdagent.so.%%shlib%%
 lib/libucdmibs.a
+lib/libucdmibs.la
 lib/libucdmibs.so
 lib/libucdmibs.so.%%shlib%%
 sbin/snmpd
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index d5cab6c70808..3e3a709d7866 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.2.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -30,7 +31,6 @@ USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_RC_SUBR=	yes
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	#empty
 .if !defined(WITHOUT_PERL)
 USE_PERL5=	yes
 .endif
@@ -211,8 +211,8 @@ post-patch: patch-autoconf patch-script-files patch-startup-files
 
 patch-autoconf:
 	@${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp
-	@${CAT} ${LOCALBASE}/share/aclocal/libtool15.m4 >> ${WRKSRC}/aclocal.m4.tmp
-	@${CP} ${LOCALBASE}/share/libtool15/ltmain.sh ${WRKSRC}
+	@${CAT} ${LIBTOOL_M4} >> ${WRKSRC}/aclocal.m4.tmp
+	@${CP} ${LTMAIN} ${WRKSRC}
 	@${MV} ${WRKSRC}/aclocal.m4.tmp ${WRKSRC}/aclocal.m4
 
 patch-script-files:
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index 03ad12a09fa5..bb9716891e18 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -174,22 +174,27 @@ include/net-snmp/utilities.h
 include/net-snmp/varbind_api.h
 include/net-snmp/version.h
 lib/libnetsnmp.a
+lib/libnetsnmp.la
 lib/libnetsnmp.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so
 @unexec rm -f %B/libnetsnmp.so 2> /dev/null || true
 lib/libnetsnmpagent.a
+lib/libnetsnmpagent.la
 lib/libnetsnmpagent.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so
 @unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true
 lib/libnetsnmphelpers.a
+lib/libnetsnmphelpers.la
 lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so
 @unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true
 lib/libnetsnmpmibs.a
+lib/libnetsnmpmibs.la
 lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so
 @unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true
 lib/libnetsnmptrapd.a
+lib/libnetsnmptrapd.la
 lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so
 @unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 3b512d9cc431..2c1d765c97ad 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	yapsnmp
 PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	yapsnmp
@@ -20,7 +20,6 @@ LIB_DEPENDS=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/net-mgmt/py-yapsnmp/pkg-plist b/net-mgmt/py-yapsnmp/pkg-plist
index de17dabd0362..144f57dbf831 100644
--- a/net-mgmt/py-yapsnmp/pkg-plist
+++ b/net-mgmt/py-yapsnmp/pkg-plist
@@ -1,3 +1,4 @@
+%%PYTHON_SITELIBDIR%%/netsnmpc.la
 %%PYTHON_SITELIBDIR%%/netsnmpc.so
 %%PYTHON_SITELIBDIR%%/netsnmp.py
 %%PYTHON_SITELIBDIR%%/yapsnmp.py