Date: Sat, 9 Jan 2010 18:58:48 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/142538: [patch] graphics/cqcam switch to using macros in plist & use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001091858.o09IwmYg043579@www.freebsd.org> Resent-Message-ID: <201001091900.o09J0EuC029145@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142538
>Category: ports
>Synopsis: [patch] graphics/cqcam switch to using macros in plist & use $SUB_FILES to dynamically adjust pkg-message
>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 Jan 09 19:00:14 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release:
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/cqcam/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 18 Jul 2009 11:10:45 -0000 1.38
+++ Makefile 9 Jan 2010 18:53:41 -0000
@@ -24,6 +24,7 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALL_TARGET= bininstall
+SUB_FILES= pkg-message
MAN1= cqcam.1
MLINKS= cqcam.1 webcam.1 \
@@ -37,15 +38,15 @@
@${STRIP_CMD} ${PREFIX}/bin/${file}
.endfor
${INSTALL_MAN} ${WRKSRC}/docs/cqcam.1 ${MANPREFIX}/man/man1
- @${MKDIR} ${PREFIX}/share/examples/cqcam
- ${INSTALL_DATA} ${WRKSRC}/.cqcrc ${PREFIX}/share/examples/cqcam/sample.cqcrc
- ${INSTALL_DATA} ${WRKSRC}/webcam/nph-webcam ${PREFIX}/share/examples/cqcam/sample.nph-webcam
+ @${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/.cqcrc ${EXAMPLESDIR}/sample.cqcrc
+ ${INSTALL_DATA} ${WRKSRC}/webcam/nph-webcam ${EXAMPLESDIR}/sample.nph-webcam
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in ${MYPORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
- @${SED} -e "s:/usr/local:${PREFIX}:" ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 14 Jul 2000 12:46:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-************************************************************
-Please copy /usr/local/share/examples/cqcam/sample.cqcrc to
-~/.cqcrc, and edit it for your system.
-************************************************************
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/cqcam/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 21 Sep 2001 14:45:06 -0000 1.6
+++ pkg-plist 9 Jan 2010 18:53:41 -0000
@@ -3,14 +3,14 @@
bin/movify
bin/webcam
bin/xcqcam
-%%PORTDOCS%%share/doc/cqcam/APINOTES
-%%PORTDOCS%%share/doc/cqcam/CHANGES
-%%PORTDOCS%%share/doc/cqcam/README
-%%PORTDOCS%%share/doc/cqcam/README.movies
-%%PORTDOCS%%share/doc/cqcam/README.webcam
-%%PORTDOCS%%share/doc/cqcam/refresh.html
-%%PORTDOCS%%share/doc/cqcam/webcam.html
-share/examples/cqcam/sample.cqcrc
-share/examples/cqcam/sample.nph-webcam
-@dirrm share/examples/cqcam
-%%PORTDOCS%%@dirrm share/doc/cqcam
+%%PORTDOCS%%%%DOCSDIR%%/APINOTES
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.movies
+%%PORTDOCS%%%%DOCSDIR%%/README.webcam
+%%PORTDOCS%%%%DOCSDIR%%/refresh.html
+%%PORTDOCS%%%%DOCSDIR%%/webcam.html
+%%EXAMPLESDIR%%/sample.cqcrc
+%%EXAMPLESDIR%%/sample.nph-webcam
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in 9 Jan 2010 18:53:41 -0000
@@ -0,0 +1,4 @@
+************************************************************
+Please copy %%EXAMPLESDIR%%/sample.cqcrc to
+~/.cqcrc, and edit it for your system.
+************************************************************
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001091858.o09IwmYg043579>