- USE_RC_SUBR= filename instead of "yes", this simplies Makefile

  (bump PORTREVISION)
- remove USE_REINPLACE
- rename files/*.sh.sample to files/*.sh.in

PR:		ports/95851
Submitted by:	Rong-En Fan

12 files changed, 22 insertions, 67 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 3e3a709d7866..6644bab4d297 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -26,9 +26,8 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
 .if !defined(WITHOUT_PERL)
@@ -85,7 +84,6 @@ PLIST_SUB+=	WITH_IPV6="@comment "
 SHLIB_VERSION=	9
 PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
 SCRIPTS_SUB=	PREFIX=${PREFIX} PERL=${PERL}
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 DEFAULT_SNMP_VERSION?=	3
 NET_SNMP_SYS_CONTACT?=	nobody@nowhere.invalid
@@ -169,7 +167,6 @@ BIN_FILES=	snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \
 		snmpstatus snmptest snmptranslate snmptrap snmpwalk
 SBIN_FILES=	snmpd snmptrapd
 STARTUP_DIR=	${PREFIX}/etc/rc.d
-STARTUP_FILES=	snmpd.sh snmptrapd.sh
 SCRIPT_FILES=	snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \
 		traptoemail
 .if defined(WITH_TKMIB)
@@ -207,7 +204,7 @@ pre-everything::
 	@${ECHO_MSG} "				agent"
 	@${ECHO_MSG}
 
-post-patch: patch-autoconf patch-script-files patch-startup-files
+post-patch: patch-autoconf patch-script-files
 
 patch-autoconf:
 	@${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp
@@ -221,12 +218,6 @@ patch-script-files:
 		${WRKSRC}/local/${filename}
 .endfor
 
-patch-startup-files:
-.for filename in ${STARTUP_FILES}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${filename}.sample > ${WRKDIR}/${filename}
-.endfor
-
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile | \
 	 ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ 	]+=/s|$$| -m 755|'
@@ -236,24 +227,20 @@ post-build:
 	${FIND} ${WRKSRC}/perl -name Makefile | \
 	${XARGS} ${REINPLACE_CMD} -E -e '\
 		s!^(PREFIX) = .*!\1 = ${PREFIX}!; \
-		s!^(INSTALLMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \
+		s!^(INSTALLMAN3DIR|INSTALLSITEMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \
+		s!^(INSTALLSITELIB|INSTALLSITEARCH) = /usr/local/(.*)!\1 = ${PREFIX}/\2!; \
 		s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \
 		'
 .else
 	${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile
 .endif
 
-post-install: strip-files install-startup-files install-config-files install-doc-files display-message
+post-install: strip-files install-config-files install-doc-files display-message
 
 strip-files:
 	@cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}
 	@cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES}
 
-install-startup-files:
-.for filename in ${STARTUP_FILES}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${filename} ${STARTUP_DIR}
-.endfor
-
 install-config-files:
 	@${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${DATADIR}/snmpd.conf.example
 
diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.sample b/net-mgmt/net-snmp-devel/files/snmpd.sh.in
index 062017469936..5efca0af2373 100644
--- a/net-mgmt/net-snmp53/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp-devel/files/snmpd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.1 2006-05-08 05:00:27 clsung Exp $
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
diff --git a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample b/net-mgmt/net-snmp-devel/files/snmptrapd.sh.in
index 35821ee9e973..33c3b2a44551 100644
--- a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample
+++ b/net-mgmt/net-snmp-devel/files/snmptrapd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmptrapd.sh.in,v 1.1 2006-05-08 05:00:27 clsung Exp $
 #
 # PROVIDE: snmptrapd
 # REQUIRE: DAEMON
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index bb9716891e18..e772a8498148 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -26,8 +26,6 @@ bin/snmpvacm
 bin/snmpwalk
 %%WITH_TKMIB%%bin/tkmib
 bin/traptoemail
-etc/rc.d/snmpd.sh
-etc/rc.d/snmptrapd.sh
 @exec mkdir %D/etc/snmp 2>/dev/null || true
 include/net-snmp/agent/agent_callbacks.h
 include/net-snmp/agent/agent_handler.h
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 3e3a709d7866..6644bab4d297 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -26,9 +26,8 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
 .if !defined(WITHOUT_PERL)
@@ -85,7 +84,6 @@ PLIST_SUB+=	WITH_IPV6="@comment "
 SHLIB_VERSION=	9
 PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
 SCRIPTS_SUB=	PREFIX=${PREFIX} PERL=${PERL}
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 DEFAULT_SNMP_VERSION?=	3
 NET_SNMP_SYS_CONTACT?=	nobody@nowhere.invalid
@@ -169,7 +167,6 @@ BIN_FILES=	snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \
 		snmpstatus snmptest snmptranslate snmptrap snmpwalk
 SBIN_FILES=	snmpd snmptrapd
 STARTUP_DIR=	${PREFIX}/etc/rc.d
-STARTUP_FILES=	snmpd.sh snmptrapd.sh
 SCRIPT_FILES=	snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \
 		traptoemail
 .if defined(WITH_TKMIB)
@@ -207,7 +204,7 @@ pre-everything::
 	@${ECHO_MSG} "				agent"
 	@${ECHO_MSG}
 
-post-patch: patch-autoconf patch-script-files patch-startup-files
+post-patch: patch-autoconf patch-script-files
 
 patch-autoconf:
 	@${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp
@@ -221,12 +218,6 @@ patch-script-files:
 		${WRKSRC}/local/${filename}
 .endfor
 
-patch-startup-files:
-.for filename in ${STARTUP_FILES}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${filename}.sample > ${WRKDIR}/${filename}
-.endfor
-
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile | \
 	 ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ 	]+=/s|$$| -m 755|'
@@ -236,24 +227,20 @@ post-build:
 	${FIND} ${WRKSRC}/perl -name Makefile | \
 	${XARGS} ${REINPLACE_CMD} -E -e '\
 		s!^(PREFIX) = .*!\1 = ${PREFIX}!; \
-		s!^(INSTALLMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \
+		s!^(INSTALLMAN3DIR|INSTALLSITEMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \
+		s!^(INSTALLSITELIB|INSTALLSITEARCH) = /usr/local/(.*)!\1 = ${PREFIX}/\2!; \
 		s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \
 		'
 .else
 	${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile
 .endif
 
-post-install: strip-files install-startup-files install-config-files install-doc-files display-message
+post-install: strip-files install-config-files install-doc-files display-message
 
 strip-files:
 	@cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}
 	@cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES}
 
-install-startup-files:
-.for filename in ${STARTUP_FILES}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${filename} ${STARTUP_DIR}
-.endfor
-
 install-config-files:
 	@${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${DATADIR}/snmpd.conf.example
 
diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample b/net-mgmt/net-snmp/files/snmpd.sh.in
index 062017469936..062017469936 100644
--- a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp/files/snmpd.sh.in
diff --git a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample b/net-mgmt/net-snmp/files/snmptrapd.sh.in
index 35821ee9e973..35821ee9e973 100644
--- a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample
+++ b/net-mgmt/net-snmp/files/snmptrapd.sh.in
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index bb9716891e18..e772a8498148 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -26,8 +26,6 @@ bin/snmpvacm
 bin/snmpwalk
 %%WITH_TKMIB%%bin/tkmib
 bin/traptoemail
-etc/rc.d/snmpd.sh
-etc/rc.d/snmptrapd.sh
 @exec mkdir %D/etc/snmp 2>/dev/null || true
 include/net-snmp/agent/agent_callbacks.h
 include/net-snmp/agent/agent_handler.h
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 3e3a709d7866..6644bab4d297 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -26,9 +26,8 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
 .if !defined(WITHOUT_PERL)
@@ -85,7 +84,6 @@ PLIST_SUB+=	WITH_IPV6="@comment "
 SHLIB_VERSION=	9
 PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
 SCRIPTS_SUB=	PREFIX=${PREFIX} PERL=${PERL}
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 DEFAULT_SNMP_VERSION?=	3
 NET_SNMP_SYS_CONTACT?=	nobody@nowhere.invalid
@@ -169,7 +167,6 @@ BIN_FILES=	snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \
 		snmpstatus snmptest snmptranslate snmptrap snmpwalk
 SBIN_FILES=	snmpd snmptrapd
 STARTUP_DIR=	${PREFIX}/etc/rc.d
-STARTUP_FILES=	snmpd.sh snmptrapd.sh
 SCRIPT_FILES=	snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \
 		traptoemail
 .if defined(WITH_TKMIB)
@@ -207,7 +204,7 @@ pre-everything::
 	@${ECHO_MSG} "				agent"
 	@${ECHO_MSG}
 
-post-patch: patch-autoconf patch-script-files patch-startup-files
+post-patch: patch-autoconf patch-script-files
 
 patch-autoconf:
 	@${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp
@@ -221,12 +218,6 @@ patch-script-files:
 		${WRKSRC}/local/${filename}
 .endfor
 
-patch-startup-files:
-.for filename in ${STARTUP_FILES}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${filename}.sample > ${WRKDIR}/${filename}
-.endfor
-
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile | \
 	 ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ 	]+=/s|$$| -m 755|'
@@ -236,24 +227,20 @@ post-build:
 	${FIND} ${WRKSRC}/perl -name Makefile | \
 	${XARGS} ${REINPLACE_CMD} -E -e '\
 		s!^(PREFIX) = .*!\1 = ${PREFIX}!; \
-		s!^(INSTALLMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \
+		s!^(INSTALLMAN3DIR|INSTALLSITEMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \
+		s!^(INSTALLSITELIB|INSTALLSITEARCH) = /usr/local/(.*)!\1 = ${PREFIX}/\2!; \
 		s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \
 		'
 .else
 	${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile
 .endif
 
-post-install: strip-files install-startup-files install-config-files install-doc-files display-message
+post-install: strip-files install-config-files install-doc-files display-message
 
 strip-files:
 	@cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}
 	@cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES}
 
-install-startup-files:
-.for filename in ${STARTUP_FILES}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${filename} ${STARTUP_DIR}
-.endfor
-
 install-config-files:
 	@${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${DATADIR}/snmpd.conf.example
 
diff --git a/net-mgmt/net-snmp/files/snmpd.sh.sample b/net-mgmt/net-snmp53/files/snmpd.sh.in
index 062017469936..c131968c2117 100644
--- a/net-mgmt/net-snmp/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp53/files/snmpd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.1 2006-05-08 05:00:27 clsung Exp $
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
diff --git a/net-mgmt/net-snmp/files/snmptrapd.sh.sample b/net-mgmt/net-snmp53/files/snmptrapd.sh.in
index 35821ee9e973..f44dc520213f 100644
--- a/net-mgmt/net-snmp/files/snmptrapd.sh.sample
+++ b/net-mgmt/net-snmp53/files/snmptrapd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmptrapd.sh.in,v 1.1 2006-05-08 05:00:27 clsung Exp $
 #
 # PROVIDE: snmptrapd
 # REQUIRE: DAEMON
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index bb9716891e18..e772a8498148 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -26,8 +26,6 @@ bin/snmpvacm
 bin/snmpwalk
 %%WITH_TKMIB%%bin/tkmib
 bin/traptoemail
-etc/rc.d/snmpd.sh
-etc/rc.d/snmptrapd.sh
 @exec mkdir %D/etc/snmp 2>/dev/null || true
 include/net-snmp/agent/agent_callbacks.h
 include/net-snmp/agent/agent_handler.h