From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 28 00:00:23 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C196F1065675 for ; Sun, 28 Mar 2010 00:00:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9CD958FC12 for ; Sun, 28 Mar 2010 00:00:23 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2S00NvJ049547 for ; Sun, 28 Mar 2010 00:00:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2S00Ntk049546; Sun, 28 Mar 2010 00:00:23 GMT (envelope-from gnats) Resent-Date: Sun, 28 Mar 2010 00:00:23 GMT Resent-Message-Id: <201003280000.o2S00Ntk049546@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, Doug Barton Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8276106564A for ; Sat, 27 Mar 2010 23:55:08 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 81E408FC17 for ; Sat, 27 Mar 2010 23:55:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2RNt8TA049369 for ; Sat, 27 Mar 2010 23:55:08 GMT (envelope-from dougb@freefall.freebsd.org) Received: (from dougb@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2RNt8w6049358; Sat, 27 Mar 2010 23:55:08 GMT (envelope-from dougb) Message-Id: <201003272355.o2RNt8w6049358@freefall.freebsd.org> Date: Sat, 27 Mar 2010 23:55:08 GMT From: Doug Barton To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/145092: Patch bsd.port.mk remove RC_SUBR and RC_SUBR_SUFFIX X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Doug Barton List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 00:00:23 -0000 >Number: 145092 >Category: ports >Synopsis: Patch bsd.port.mk remove RC_SUBR and RC_SUBR_SUFFIX >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 Mar 28 00:00:22 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Doug Barton >Release: FreeBSD 8.0-STABLE i386 >Organization: AAAG >Environment: DNA >Description: The RC_SUBR and RC_SUBR_SUFFIX macros are no longer necessary on any supported version of FreeBSD. >How-To-Repeat: DNA >Fix: Apply the following patch: Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.635 diff -u -r1.635 bsd.port.mk --- bsd.port.mk 5 Feb 2010 21:18:15 -0000 1.635 +++ bsd.port.mk 27 Mar 2010 23:47:12 -0000 @@ -519,8 +519,7 @@ # Implies inclusion of bsd.xorg.mk. ## # USE_RC_SUBR - If set, the ports startup/shutdown script uses the common -# routines found in etc/rc.subr and may need to -# depend on the sysutils/rc_subr port. +# routines found in /etc/rc.subr. # If this is set to a list of files, these files will be # automatically added to ${SUB_FILES}, some %%VAR%%'s will # automatically be expanded, they will be installed in @@ -528,10 +527,8 @@ # USE_RCORDER - List of rc.d startup scripts to be called early in the boot # process. This acts exactly like USE_RC_SUBR except that # scripts are installed in /etc/rc.d. -# RC_SUBR - Set to path of rc.subr. -# Default: ${LOCALBASE}/etc/rc.subr. -# RC_SUBR_SUFFIX -# - Contains the suffix of installed rc.subr scripts. +# Because local rc.d scripts are included in the base rcorder +# this option is not needed unless the port installs in the base. ## # USE_APACHE - If set, this port relies on an apache webserver. # @@ -1637,7 +1634,7 @@ PLIST_REINPLACE+= dirrmtry stopdaemon rmtry PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! PLIST_REINPLACE_RMTRY=s!^@rmtry \(.*\)!@unexec rm -f %D/\1 2>/dev/null || true! -PLIST_REINPLACE_STOPDAEMON=s!^@stopdaemon \(.*\)!@unexec %D/etc/rc.d/\1${RC_SUBR_SUFFIX} forcestop 2>/dev/null || true! +PLIST_REINPLACE_STOPDAEMON=s!^@stopdaemon \(.*\)!@unexec %D/etc/rc.d/\1 forcestop 2>/dev/null || true! # kludge to strip trailing whitespace from CFLAGS; # sub-configure will not # survive double space @@ -1867,21 +1864,13 @@ .endif .endif # USE_FAM -.if defined(USE_RC_SUBR) || defined(USE_RCORDER) -RC_SUBR= /etc/rc.subr -SUB_LIST+= RC_SUBR=${RC_SUBR} .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" SUB_FILES+= ${USE_RC_SUBR} .endif + .if defined(USE_RCORDER) SUB_FILES+= ${USE_RCORDER} .endif -.if (${OSVERSION} >= 700007 || ${OSVERSION} < 700000) -RC_SUBR_SUFFIX?= -.else -RC_SUBR_SUFFIX?= .sh -.endif -.endif .if defined(USE_LDCONFIG) && ${USE_LDCONFIG:L} == "yes" USE_LDCONFIG= ${PREFIX}/lib @@ -5944,8 +5933,8 @@ @${ECHO_MSG} "===> Installing rc.d startup script(s)" @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @for i in ${USE_RC_SUBR}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}; \ - ${ECHO_CMD} "etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}" >> ${TMPPLIST}; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \ + ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ done .endif .else >Release-Note: >Audit-Trail: >Unformatted: