ports/102005: [maintainer] sysutils/fvcool

[Matthew Seaman]

>Number:         102005
>Category:       ports
>Synopsis:       [maintainer] sysutils/fvcool
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 14 11:20:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 6.1-STABLE FreeBSD 6.1-STABLE #2: Mon Aug 7 21:20:41 BST 2006 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

  * Respect TARGETDIR
  * Makefile cleanup, use SUB_FILES mechanism etc.

Directories renamed:

   sysutils/fvcool/scripts ---> sysutils/fvcool/files

Files moved/renamed:

   sysutils/fvcool/scripts/fvcool.sh --> sysutils/fvcool/files/fvcool.sh.in
   sysutils/fvcool/pkg-message --> sysutils/fvcool/files/pkg-message.in

>How-To-Repeat:
	
>Fix:

	

--- fvcool.diff begins here ---
diff -Nur /usr/ports/sysutils/fvcool/Makefile fvcool/Makefile
--- /usr/ports/sysutils/fvcool/Makefile	Sat May 13 05:15:32 2006
+++ fvcool/Makefile	Mon Aug 14 11:59:15 2006
@@ -17,35 +17,23 @@
 
 ONLY_FOR_ARCHS=	i386
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	fvcool.sh
+SUB_FILES=	pkg-message
+SUB_LIST+=	"PORTNAME=${PORTNAME}"
 ALL_TARGET=	fvcool
 PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,^${PREFIX}/,,}
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-SED_SCRIPT=	-e 's,%%RC_SUBR%%,${RC_SUBR},g'   \
-		-e 's,%%PORTNAME%%,${PORTNAME},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g'
 
 PORTDOCS=	ReadMe ReadMe.jp ReadMe.tech_KT133
-PLIST_FILES=	sbin/fvcool etc/rc.d/fvcool.sh
+PLIST_FILES=	sbin/fvcool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@CC@|& ${CFLAGS}|; \
 		s|-O3||g ; s| -s | |g' ${BUILD_WRKSRC}/Makefile.in
 
-post-build:
-	@${SED} ${SED_SCRIPT} ${SCRIPTDIR}/${PORTNAME}.sh \
-	    > ${WRKDIR}/${PORTNAME}.sh
-	@${SED} ${SED_SCRIPT} ${MSG_FILE} \
-	    > ${PKGMESSAGE}
-
 do-install: install-doc
-	${INSTALL_PROGRAM} ${WRKSRC}/fvcool ${PREFIX}/sbin/fvcool
+	${INSTALL_PROGRAM} ${WRKSRC}/fvcool ${TARGETDIR}/sbin/fvcool
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
-	    ${PREFIX}/etc/rc.d/${PORTNAME}.sh
 	@${CAT} ${PKGMESSAGE}
 
 install-doc:
diff -Nur /usr/ports/sysutils/fvcool/files/fvcool.sh.in fvcool/files/fvcool.sh.in
--- /usr/ports/sysutils/fvcool/files/fvcool.sh.in	Thu Jan  1 01:00:00 1970
+++ fvcool/files/fvcool.sh.in	Mon Feb 20 20:47:42 2006
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# @(#) $FreeBSD: ports/sysutils/fvcool/scripts/fvcool.sh,v 1.2 2006/02/20 20:47:42 dougb Exp $
+
+# PROVIDE: %%PORTNAME%%
+# REQUIRE: LOGIN abi
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `%%PORTNAME%%':
+#
+#%%PORTNAME%%_enable="YES"
+#
+# Other rc.conf variables:
+#
+#  %%PORTNAME%%_flags    Set to "-v" for verbose mode.
+#
+
+. %%RC_SUBR%%
+
+name="%%PORTNAME%%"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/%%PORTNAME%%"
+command_args="-e"
+
+# %%PORTNAME%% is a command to be run during startup and shutdown, not a
+# long running daemon process.  There's no pidfile to check, and it's
+# hard to tell if %%PORTNAME%% is enabled or not -- just run '%%PORTNAME%% -e' to
+# force enable it, '%%PORTNAME%% -d' to disable.
+
+stop_cmd="stop_cmd"
+stop_cmd()
+{
+    $command -d
+}
+
+status_cmd="status_cmd"
+status_cmd()
+{
+    echo "Can't check %%PORTNAME%% status"
+}
+
+load_rc_config "$name"
+: ${%%PORTNAME%%_enable="NO"}
+: ${%%PORTNAME%%_flags=""}
+
+run_rc_command "$1"
diff -Nur /usr/ports/sysutils/fvcool/files/pkg-message.in fvcool/files/pkg-message.in
--- /usr/ports/sysutils/fvcool/files/pkg-message.in	Thu Jan  1 01:00:00 1970
+++ fvcool/files/pkg-message.in	Sun Oct 17 04:32:08 2004
@@ -0,0 +1,21 @@
+===> How to enable the %%PORTNAME%% package
+
+    If you want to invoke %%PORTNAME%% automatically on system startup,
+    add the following line to /etc/rc.conf:
+
+        fvcool_enable="YES"
+
+    See %%PREFIX%%/etc/rc.d/%%PORTNAME%%.sh for more details.
+
+===> WARNING
+
+    This software can have a negative impact on system stability. In
+    particular while doing heavy duty work such as encoding music,
+    under certain conditions the system can freeze.
+
+    Don't use this software in production or mission-critical
+    environments!
+
+    Also note that this software is supposed to be used with AMD
+    Athlon (XP) an AMD Duron processors only.
+
diff -Nur /usr/ports/sysutils/fvcool/pkg-message fvcool/pkg-message
--- /usr/ports/sysutils/fvcool/pkg-message	Sun Oct 17 04:32:08 2004
+++ fvcool/pkg-message	Thu Jan  1 01:00:00 1970
@@ -1,21 +0,0 @@
-===> How to enable the %%PORTNAME%% package
-
-    If you want to invoke %%PORTNAME%% automatically on system startup,
-    add the following line to /etc/rc.conf:
-
-        fvcool_enable="YES"
-
-    See %%PREFIX%%/etc/rc.d/%%PORTNAME%%.sh for more details.
-
-===> WARNING
-
-    This software can have a negative impact on system stability. In
-    particular while doing heavy duty work such as encoding music,
-    under certain conditions the system can freeze.
-
-    Don't use this software in production or mission-critical
-    environments!
-
-    Also note that this software is supposed to be used with AMD
-    Athlon (XP) an AMD Duron processors only.
-
diff -Nur /usr/ports/sysutils/fvcool/scripts/fvcool.sh fvcool/scripts/fvcool.sh
--- /usr/ports/sysutils/fvcool/scripts/fvcool.sh	Mon Feb 20 20:47:42 2006
+++ fvcool/scripts/fvcool.sh	Thu Jan  1 01:00:00 1970
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# @(#) $FreeBSD: ports/sysutils/fvcool/scripts/fvcool.sh,v 1.2 2006/02/20 20:47:42 dougb Exp $
-
-# PROVIDE: %%PORTNAME%%
-# REQUIRE: LOGIN abi
-# BEFORE:  securelevel
-# KEYWORD: shutdown
-
-# Add the following line to /etc/rc.conf to enable `%%PORTNAME%%':
-#
-#%%PORTNAME%%_enable="YES"
-#
-# Other rc.conf variables:
-#
-#  %%PORTNAME%%_flags    Set to "-v" for verbose mode.
-#
-
-. %%RC_SUBR%%
-
-name="%%PORTNAME%%"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/sbin/%%PORTNAME%%"
-command_args="-e"
-
-# %%PORTNAME%% is a command to be run during startup and shutdown, not a
-# long running daemon process.  There's no pidfile to check, and it's
-# hard to tell if %%PORTNAME%% is enabled or not -- just run '%%PORTNAME%% -e' to
-# force enable it, '%%PORTNAME%% -d' to disable.
-
-stop_cmd="stop_cmd"
-stop_cmd()
-{
-    $command -d
-}
-
-status_cmd="status_cmd"
-status_cmd()
-{
-    echo "Can't check %%PORTNAME%% status"
-}
-
-load_rc_config "$name"
-: ${%%PORTNAME%%_enable="NO"}
-: ${%%PORTNAME%%_flags=""}
-
-run_rc_command "$1"
--- fvcool.diff ends here ---


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