Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 May 2006 03:30:12 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/97225: Update port: sysutils/cdrtools
Message-ID:  <20060514033012.c084ce24.tkato432@yahoo.com>
Resent-Message-ID: <200605131840.k4DIeJsF007031@freefall.freebsd.org>

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

>Number:         97225
>Category:       ports
>Synopsis:       Update port: sysutils/cdrtools
>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:   Sat May 13 18:40:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p17 i386
>Organization:
>Environment:
>Description:
- Support SUB_FILES

New file:
files/pkg-message.in

Remove file:
pkg-message

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/sysutils/cdrtools/Makefile sysutils/cdrtools/Makefile
--- /usr/ports/sysutils/cdrtools/Makefile	Mon May  8 16:21:49 2006
+++ sysutils/cdrtools/Makefile	Tue May  9 17:42:14 2006
@@ -35,7 +35,7 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 #CFLAGS+=	-DSOURCE_MODIFIED
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
 .if defined(WITH_RSCSI)
 PKGINSTALL=	${PKGDIR}/pkg-install.rscsi
@@ -104,8 +104,6 @@
 #	@${REINPLACE_CMD} -E -e \
 #		's|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE|& "${MAINTAINER}"|' \
 #		${WRKSRC}/cdrecord/cdrecord.c
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message > \
-		${WRKDIR}/pkg-message
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \
@@ -164,6 +162,6 @@
 post-install:
 	-@if [ -f ${PKGINSTALL} ]; then ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; fi
-	@${CAT} ${WRKDIR}/pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/sysutils/cdrtools/files/pkg-message.in sysutils/cdrtools/files/pkg-message.in
--- /usr/ports/sysutils/cdrtools/files/pkg-message.in	Thu Jan  1 09:00:00 1970
+++ sysutils/cdrtools/files/pkg-message.in	Sat May 13 23:21:52 2006
@@ -0,0 +1,13 @@
+===========================================================================
+
+Note: The location of the cdrtools `defaults' files has been set to
+
+	%%PREFIX%%/etc
+
+This is the FreeBSD ports standard config file location, NOT the cdrtools
+standard location, which is /etc/default.
+
+The reason for this is that FreeBSD ports and packages should not use
+configuration files outside of %%PREFIX%%.
+
+===========================================================================
diff -urN /usr/ports/sysutils/cdrtools/pkg-message sysutils/cdrtools/pkg-message
--- /usr/ports/sysutils/cdrtools/pkg-message	Wed Apr 21 05:46:32 2004
+++ sysutils/cdrtools/pkg-message	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
-===========================================================================
-
-Note: The location of the cdrtools `defaults' files has been set to
-
-	%%PREFIX%%/etc
-
-This is the FreeBSD ports standard config file location, NOT the cdrtools
-standard location, which is /etc/default.
-
-The reason for this is that FreeBSD ports and packages should not use
-configuration files outside of %%PREFIX%%.
-
-===========================================================================
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060514033012.c084ce24.tkato432>