Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Apr 2006 22:13:26 -0400 (EDT)
From:      Rong-En Fan <rafan@infor.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        kuriyama@FreeBSD.org
Subject:   ports/95851: [PATCH] net-mgmt/net-snmp: use new order for USE_RC_SUBR
Message-ID:  <200604160213.k3G2DQUK040952@woodstock.rafan.org>
Resent-Message-ID: <200604160220.k3G2KEX6000773@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95851
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/net-snmp: use new order for USE_RC_SUBR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 16 02:20:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Rong-En Fan
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
NTU CSIE
>Environment:
System: FreeBSD woodstock.rafan.org 7.0-CURRENT FreeBSD 7.0-CURRENT #21: Tue Apr 11 22:22:56 EDT 2006
>Description:
- USE_RC_SUBR= filename instead of "yes", this simplies Makefile
  (bump PORTREVISION)
- remove USE_REINPLACE

Please rename files/*.sh.sample to files/*.sh.in

Added file(s):
- files/snmpd.sh.in
- files/snmptrapd.sh.in

Removed file(s):
- files/snmpd.sh.sample
- files/snmptrapd.sh.sample

Port maintainer (kuriyama@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- net-snmp-5.2.2_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/net-snmp/Makefile /home/rafan/tmp/ports/net-snmp/Makefile
--- /usr/ports/net-mgmt/net-snmp/Makefile	Wed Mar  1 18:35:22 2006
+++ /home/rafan/tmp/ports/net-snmp/Makefile	Sat Apr 15 21:25:35 2006
@@ -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 @@
 .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 @@
 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 @@
 		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 @@
 	@${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 @@
 		${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|'
@@ -243,16 +234,11 @@
 	${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 -ruN --exclude=CVS /usr/ports/net-mgmt/net-snmp/pkg-plist /home/rafan/tmp/ports/net-snmp/pkg-plist
--- /usr/ports/net-mgmt/net-snmp/pkg-plist	Wed Mar  1 18:35:22 2006
+++ /home/rafan/tmp/ports/net-snmp/pkg-plist	Fri Apr 14 21:25:17 2006
@@ -26,8 +26,6 @@
 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
--- net-snmp-5.2.2_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604160213.k3G2DQUK040952>