Date: Sat, 27 Mar 2010 23:55:08 GMT From: Doug Barton <dougb@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/145092: Patch bsd.port.mk remove RC_SUBR and RC_SUBR_SUFFIX Message-ID: <201003272355.o2RNt8w6049358@freefall.freebsd.org> Resent-Message-ID: <201003280000.o2S00Ntk049546@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003272355.o2RNt8w6049358>