Treat shlib number and libtool as our way.

Approved by:	maintainer

12 files changed, 80 insertions, 28 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 0d4d0507c864..c64556f88633 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -19,6 +19,7 @@ MAINTAINER=	billf@FreeBSD.org
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld
 .if defined(BATCH)
@@ -43,7 +44,7 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \
 		snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \
 		snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \
-		snmp_timeout.3
+		snmp_timeout.3 snmp_trap_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
 MAN8=		snmptrapd.8
@@ -70,12 +71,6 @@ post-install:
 	@( cd ${PREFIX}/sbin && strip ${SBIN} )
 	@( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * )
 	@( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * )
-	@${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so )
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/EXAMPLE.conf  ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
diff --git a/net-mgmt/net-snmp-devel/files/patch-Makefile.top b/net-mgmt/net-snmp-devel/files/patch-Makefile.top
new file mode 100644
index 000000000000..2ecdb3d91c59
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-Makefile.top
@@ -0,0 +1,11 @@
+--- Makefile.top.orig	Mon Nov 20 05:58:05 2000
++++ Makefile.top	Thu Feb  8 01:21:42 2001
+@@ -51,7 +51,7 @@
+ # Misc Compiling Stuff
+ 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) -release 0.$(VERSION) -o
++LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o
+ LIB_EXTENSION   = la
+ LIB_VERSION     =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index d026a072ade1..013bd98a5326 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -1,8 +1,11 @@
 bin/encode_keychange
+bin/mib2c
 bin/snmpbulkget
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpconf
 bin/snmpdelta
+bin/snmpdf
 bin/snmpget
 bin/snmpgetnext
 bin/snmpinform
@@ -14,6 +17,7 @@ bin/snmptest
 bin/snmptranslate
 bin/snmptrap
 bin/snmpusm
+bin/snmpvacm
 bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh
@@ -57,10 +61,13 @@ include/ucd-snmp/util_funcs.h
 include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
 @dirrm include/ucd-snmp
+lib/libsnmp.a
 lib/libsnmp.so
 lib/libsnmp.so.%%shlib%%
+lib/libucdagent.a
 lib/libucdagent.so
 lib/libucdagent.so.%%shlib%%
+lib/libucdmibs.a
 lib/libucdmibs.so
 lib/libucdmibs.so.%%shlib%%
 sbin/snmpd
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 0d4d0507c864..c64556f88633 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -19,6 +19,7 @@ MAINTAINER=	billf@FreeBSD.org
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld
 .if defined(BATCH)
@@ -43,7 +44,7 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \
 		snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \
 		snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \
-		snmp_timeout.3
+		snmp_timeout.3 snmp_trap_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
 MAN8=		snmptrapd.8
@@ -70,12 +71,6 @@ post-install:
 	@( cd ${PREFIX}/sbin && strip ${SBIN} )
 	@( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * )
 	@( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * )
-	@${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so )
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/EXAMPLE.conf  ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
diff --git a/net-mgmt/net-snmp/files/patch-Makefile.top b/net-mgmt/net-snmp/files/patch-Makefile.top
new file mode 100644
index 000000000000..2ecdb3d91c59
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-Makefile.top
@@ -0,0 +1,11 @@
+--- Makefile.top.orig	Mon Nov 20 05:58:05 2000
++++ Makefile.top	Thu Feb  8 01:21:42 2001
+@@ -51,7 +51,7 @@
+ # Misc Compiling Stuff
+ 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) -release 0.$(VERSION) -o
++LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o
+ LIB_EXTENSION   = la
+ LIB_VERSION     =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index d026a072ade1..013bd98a5326 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -1,8 +1,11 @@
 bin/encode_keychange
+bin/mib2c
 bin/snmpbulkget
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpconf
 bin/snmpdelta
+bin/snmpdf
 bin/snmpget
 bin/snmpgetnext
 bin/snmpinform
@@ -14,6 +17,7 @@ bin/snmptest
 bin/snmptranslate
 bin/snmptrap
 bin/snmpusm
+bin/snmpvacm
 bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh
@@ -57,10 +61,13 @@ include/ucd-snmp/util_funcs.h
 include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
 @dirrm include/ucd-snmp
+lib/libsnmp.a
 lib/libsnmp.so
 lib/libsnmp.so.%%shlib%%
+lib/libucdagent.a
 lib/libucdagent.so
 lib/libucdagent.so.%%shlib%%
+lib/libucdmibs.a
 lib/libucdmibs.so
 lib/libucdmibs.so.%%shlib%%
 sbin/snmpd
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 0d4d0507c864..c64556f88633 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -19,6 +19,7 @@ MAINTAINER=	billf@FreeBSD.org
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld
 .if defined(BATCH)
@@ -43,7 +44,7 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \
 		snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \
 		snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \
-		snmp_timeout.3
+		snmp_timeout.3 snmp_trap_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
 MAN8=		snmptrapd.8
@@ -70,12 +71,6 @@ post-install:
 	@( cd ${PREFIX}/sbin && strip ${SBIN} )
 	@( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * )
 	@( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * )
-	@${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so )
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/EXAMPLE.conf  ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
diff --git a/net-mgmt/net-snmp4/files/patch-Makefile.top b/net-mgmt/net-snmp4/files/patch-Makefile.top
new file mode 100644
index 000000000000..2ecdb3d91c59
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-Makefile.top
@@ -0,0 +1,11 @@
+--- Makefile.top.orig	Mon Nov 20 05:58:05 2000
++++ Makefile.top	Thu Feb  8 01:21:42 2001
+@@ -51,7 +51,7 @@
+ # Misc Compiling Stuff
+ 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) -release 0.$(VERSION) -o
++LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o
+ LIB_EXTENSION   = la
+ LIB_VERSION     =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist
index d026a072ade1..013bd98a5326 100644
--- a/net-mgmt/net-snmp4/pkg-plist
+++ b/net-mgmt/net-snmp4/pkg-plist
@@ -1,8 +1,11 @@
 bin/encode_keychange
+bin/mib2c
 bin/snmpbulkget
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpconf
 bin/snmpdelta
+bin/snmpdf
 bin/snmpget
 bin/snmpgetnext
 bin/snmpinform
@@ -14,6 +17,7 @@ bin/snmptest
 bin/snmptranslate
 bin/snmptrap
 bin/snmpusm
+bin/snmpvacm
 bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh
@@ -57,10 +61,13 @@ include/ucd-snmp/util_funcs.h
 include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
 @dirrm include/ucd-snmp
+lib/libsnmp.a
 lib/libsnmp.so
 lib/libsnmp.so.%%shlib%%
+lib/libucdagent.a
 lib/libucdagent.so
 lib/libucdagent.so.%%shlib%%
+lib/libucdmibs.a
 lib/libucdmibs.so
 lib/libucdmibs.so.%%shlib%%
 sbin/snmpd
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 0d4d0507c864..c64556f88633 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -19,6 +19,7 @@ MAINTAINER=	billf@FreeBSD.org
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 CONFIGURE_ARGS+= --enable-shared --with-mib-modules="host" --with-gnu-ld
 .if defined(BATCH)
@@ -43,7 +44,7 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \
 		snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \
 		snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \
-		snmp_timeout.3
+		snmp_timeout.3 snmp_trap_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
 MAN8=		snmptrapd.8
@@ -70,12 +71,6 @@ post-install:
 	@( cd ${PREFIX}/sbin && strip ${SBIN} )
 	@( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * )
 	@( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * )
-	@${INSTALL_SCRIPT} ${WRKSRC}/libsnmp.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdmibs.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@${INSTALL_SCRIPT} ${WRKSRC}/libucdagent.so.${SHLIB_VERSION} ${PREFIX}/lib
-	@( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so )
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/EXAMPLE.conf  ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
diff --git a/net-mgmt/net-snmp53/files/patch-Makefile.top b/net-mgmt/net-snmp53/files/patch-Makefile.top
new file mode 100644
index 000000000000..2ecdb3d91c59
--- /dev/null
+++ b/net-mgmt/net-snmp53/files/patch-Makefile.top
@@ -0,0 +1,11 @@
+--- Makefile.top.orig	Mon Nov 20 05:58:05 2000
++++ Makefile.top	Thu Feb  8 01:21:42 2001
+@@ -51,7 +51,7 @@
+ # Misc Compiling Stuff
+ 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) -release 0.$(VERSION) -o
++LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -release $(VERSION).0 -version-info 4 -o
+ LIB_EXTENSION   = la
+ LIB_VERSION     =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index d026a072ade1..013bd98a5326 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -1,8 +1,11 @@
 bin/encode_keychange
+bin/mib2c
 bin/snmpbulkget
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpconf
 bin/snmpdelta
+bin/snmpdf
 bin/snmpget
 bin/snmpgetnext
 bin/snmpinform
@@ -14,6 +17,7 @@ bin/snmptest
 bin/snmptranslate
 bin/snmptrap
 bin/snmpusm
+bin/snmpvacm
 bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh
@@ -57,10 +61,13 @@ include/ucd-snmp/util_funcs.h
 include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
 @dirrm include/ucd-snmp
+lib/libsnmp.a
 lib/libsnmp.so
 lib/libsnmp.so.%%shlib%%
+lib/libucdagent.a
 lib/libucdagent.so
 lib/libucdagent.so.%%shlib%%
+lib/libucdmibs.a
 lib/libucdmibs.so
 lib/libucdmibs.so.%%shlib%%
 sbin/snmpd