Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Jul 2008 04:24:13 GMT
From:      "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        KOT@MATPOCKuH.Ru
Subject:   ports/125623: [PATCH] audio/autocd: USE_RC_SUBR != yes
Message-ID:  <200807150424.m6F4ODnp096360@riderwayinc.com>
Resent-Message-ID: <200807150430.m6F4U2fg006992@freefall.freebsd.org>

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

>Number:         125623
>Category:       ports
>Synopsis:       [PATCH] audio/autocd: USE_RC_SUBR != yes
>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:   Tue Jul 15 04:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.0-RELEASE amd64
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008
>Description:
- Respect NO_INSTALL_MANPAGES
- repocopy [files/autocd.sh -> files/autocd.in]
  itectu@: no more .sh
  dougb@: move load_config above variables checks
- Bump PORTREVISION

Added file(s):
- files/autocd.in

Removed file(s):
- files/autocd.sh

Port maintainer (KOT@MATPOCKuH.Ru) is cc'd.

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

--- autocd-3.02.12b_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/autocd/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile	2 May 2007 07:11:57 -0000	1.12
+++ Makefile	15 Jul 2008 04:22:44 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	autocd
 PORTVERSION=	3.02.12b
+PORTREVISION=	1
 CATEGORIES=	audio sysutils
 MASTER_SITES=	ftp://kot.spb.ru/pub/src/projects/autocd/
 
@@ -15,22 +16,18 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+.if !defined (NO_INSTALL_MANPAGES)
 MAN1=		cdctl.1 acdplay.1
 MAN8=		autocd.8
 MLINKS=		cdctl.1 eject.1 cdctl.1 pause.1
+.endif
+
 PLIST_FILES=	sbin/autocd bin/acdplay bin/cdctl bin/pause bin/eject
 PORTDOCS=	README.rus.html
 
-USE_RC_SUBR=	yes
-RC_SUFX=	.sh
-SED_SCRIPT+=	-e '{ s,%%PREFIX%%,${PREFIX},g; s,%%RC_SUBR%%,${RC_SUBR},g; }'
-PLIST_FILES+=	etc/rc.d/autocd${RC_SUFX}
-
-post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/autocd.sh >${WRKDIR}/autocd.sh
+USE_RC_SUBR=	autocd
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/autocd.sh ${PREFIX}/etc/rc.d/autocd${RC_SUFX}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
Index: files/autocd.in
===================================================================
RCS file: files/autocd.in
diff -N files/autocd.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/autocd.in	15 Jul 2008 04:22:44 -0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/audio/autocd/files/autocd.sh,v 1.2 2006/02/20 20:46:47 dougb Exp $
+#
+
+# PROVIDE: autocd
+# REQUIRE:
+# BEFORE:
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable autocd:
+#
+#autocd_enable="YES"
+#
+# See autocd(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=autocd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/autocd
+
+load_rc_config $name
+
+autocd_enable=${autocd_enable:-"NO"}
+autocd_flags=${autocd_flags:-""}
+
+stop_cmd=stop_cmd
+
+stop_cmd()
+{
+  %%PREFIX%%/bin/cdctl die
+}
+
+run_rc_command "$1"
Index: files/autocd.sh
===================================================================
RCS file: files/autocd.sh
diff -N files/autocd.sh
--- files/autocd.sh	20 Feb 2006 20:46:47 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/audio/autocd/files/autocd.sh,v 1.2 2006/02/20 20:46:47 dougb Exp $
-#
-
-# PROVIDE: autocd
-# REQUIRE:
-# BEFORE:
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable autocd:
-#
-#autocd_enable="YES"
-#
-# See autocd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=autocd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/autocd
-
-stop_cmd=stop_cmd
-
-stop_cmd()
-{
-  %%PREFIX%%/bin/cdctl die
-}
-
-# set defaults
-autocd_enable=${autocd_enable:-"NO"}
-autocd_flags=${autocd_flags:-""}
-
-load_rc_config $name
-run_rc_command "$1"
--- autocd-3.02.12b_1.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?200807150424.m6F4ODnp096360>