ports/142530: [patch] games/grubinvaders switch to using DOCSDIR DATADIR in Makefile aswell as $SUB_FILES to dynamically adjust pkg-message

Sevan Janiyan venture37 at geeklan.co.uk
Sat Jan 9 17:30:05 UTC 2010


>Number:         142530
>Category:       ports
>Synopsis:       [patch] games/grubinvaders switch to using DOCSDIR DATADIR in Makefile aswell as $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 17:30:04 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/games/grubinvaders/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	24 Mar 2006 06:23:42 -0000	1.4
+++ Makefile	9 Jan 2010 17:20:08 -0000
@@ -21,11 +21,14 @@
 STRIP=
 WRKSRC=		${WRKDIR}/invaders
 ALL_TARGET=	clean all
+SUB_FILES=	pkg-message
 
 do-install:
-	${MKDIR} ${PREFIX}/share/grubinvaders
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/grubinvaders
-	${INSTALL_PROGRAM} ${WRKSRC}/invaders ${PREFIX}/share/grubinvaders
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
+	${MKDIR} ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
+.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/invaders ${DATADIR}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	14 Apr 2002 00:36:17 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-------------------------------------------------------------
-
-See %%PREFIX%%/share/grubinvaders/README for instructions on
-installing grubinvaders with grub.
-
-------------------------------------------------------------
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/games/grubinvaders/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	14 Apr 2002 00:36:17 -0000	1.1
+++ pkg-plist	9 Jan 2010 17:20:08 -0000
@@ -1,3 +1,4 @@
-share/grubinvaders/README
-share/grubinvaders/invaders
- at dirrm share/grubinvaders
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/invaders
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%DATADIR%%
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 17:20:08 -0000
@@ -0,0 +1,6 @@
+------------------------------------------------------------
+
+See %%DATADIR%%/README for instructions on
+installing grubinvaders with grub.
+
+------------------------------------------------------------


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



More information about the freebsd-ports-bugs mailing list