From da880765886f48c0ac8fd253e5601d04ea853215 Mon Sep 17 00:00:00 2001
From: ade <ade@FreeBSD.org>
Date: Thu, 23 Feb 2006 10:40:44 +0000
Subject: Conversion to a single libtool environment.

Approved by:	portmgr (kris)
---
 net-mgmt/net-snmp-devel/Makefile  | 6 +++---
 net-mgmt/net-snmp-devel/pkg-plist | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'net-mgmt/net-snmp-devel')

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index d5cab6c7080..3e3a709d786 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 03ad12a09fa..bb9716891e1 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
-- 
cgit