Date: Thu, 28 Jan 2010 19:43:59 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143322: [PATCH] palm/ppmtoTbmp: make DOCS & DATADIR safe, support NOPORTDATA Message-ID: <201001281943.o0SJhxSS068594@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001281950.o0SJo7XH080533@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143322
>Category: ports
>Synopsis: [PATCH] palm/ppmtoTbmp: make DOCS & DATADIR safe, support NOPORTDATA
>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: Thu Jan 28 19:50:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC
>Description:
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- ppmtoTbmp-1.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/palm/ppmtoTbmp/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 31 Jul 2009 13:55:07 -0000 1.12
+++ Makefile 28 Jan 2010 19:42:19 -0000
@@ -26,10 +26,12 @@
${INSTALL_PROGRAM} ${WRKSRC}/ppmtoTbmp ${WRKSRC}/Tbmptopnm \
${PREFIX}/bin
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/ppmtoTbmp
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ppmtoTbmp
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
+.if !defined(NOPORTDATA)
+ ${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/q?.map ${DATADIR}
.endif
- ${MKDIR} ${PREFIX}/share/ppmtoTbmp
- ${INSTALL_DATA} ${WRKSRC}/q?.map ${PREFIX}/share/${PORTNAME}
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/palm/ppmtoTbmp/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 11 Jun 2001 11:29:05 -0000 1.1
+++ pkg-plist 28 Jan 2010 19:42:19 -0000
@@ -1,7 +1,7 @@
bin/ppmtoTbmp
bin/Tbmptopnm
-share/ppmtoTbmp/q2.map
-share/ppmtoTbmp/q4.map
-@dirrm share/ppmtoTbmp
-%%PORTDOCS%%share/doc/ppmtoTbmp/README
-%%PORTDOCS%%@dirrm share/doc/ppmtoTbmp
+%%PORTDATA%%%%DATADIR%%/q2.map
+%%PORTDATA%%%%DATADIR%%/q4.map
+%%PORTDATA%%@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- ppmtoTbmp-1.1_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?201001281943.o0SJhxSS068594>