From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 16 02:20:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5420D16A413 for ; Sun, 16 Apr 2006 02:20:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7655143D62 for ; Sun, 16 Apr 2006 02:20:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3G2KEd6000774 for ; Sun, 16 Apr 2006 02:20:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3G2KEX6000773; Sun, 16 Apr 2006 02:20:14 GMT (envelope-from gnats) Resent-Date: Sun, 16 Apr 2006 02:20:14 GMT Resent-Message-Id: <200604160220.k3G2KEX6000773@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rong-En Fan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D56F16A401; Sun, 16 Apr 2006 02:13:46 +0000 (UTC) (envelope-from rafan@woodstock.rafan.org) Received: from muse.csie.ntu.edu.tw (muse.csie.ntu.edu.tw [140.112.28.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id D324B43D45; Sun, 16 Apr 2006 02:13:45 +0000 (GMT) (envelope-from rafan@woodstock.rafan.org) Received: from woodstock.rafan.org (220-135-116-9.HINET-IP.hinet.net [220.135.116.9]) by muse.csie.ntu.edu.tw (Postfix) with ESMTP id 7C4585209E; Sun, 16 Apr 2006 10:13:43 +0800 (CST) Received: (from rafan@localhost) by woodstock.rafan.org (8.13.6/8.13.6/Submit) id k3G2DQUK040952; Sat, 15 Apr 2006 22:13:26 -0400 (EDT) (envelope-from rafan) Message-Id: <200604160213.k3G2DQUK040952@woodstock.rafan.org> Date: Sat, 15 Apr 2006 22:13:26 -0400 (EDT) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kuriyama@FreeBSD.org Subject: ports/95851: [PATCH] net-mgmt/net-snmp: use new order for USE_RC_SUBR X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Apr 2006 02:20:16 -0000 >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: