Wed Jul 8 17:19:05 2009 UTC ()
user-destdir support


(joerg)
diff -r1.12 -r1.13 pkgsrc/games/xroads/Makefile
diff -r1.6 -r1.7 pkgsrc/games/xroads/distinfo
diff -r1.2 -r1.3 pkgsrc/games/xroads/patches/patch-aa
cvs diff -r1.12 -r1.13 pkgsrc/games/xroads/Makefile (expand / switch to unified diff)

--- pkgsrc/games/xroads/Makefile 2007/02/02 17:13:01 1.12
+++ pkgsrc/games/xroads/Makefile 2009/07/08 17:19:05 1.13
@@ -1,17 +1,21 @@ @@ -1,17 +1,21 @@
1# $NetBSD: Makefile,v 1.12 2007/02/02 17:13:01 joerg Exp $ 1# $NetBSD: Makefile,v 1.13 2009/07/08 17:19:05 joerg Exp $
2# 2#
3 3
4DISTNAME= xroads-v0.5 4DISTNAME= xroads-v0.5
5PKGNAME= xroads-0.5 5PKGNAME= xroads-0.5
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= games 7CATEGORIES= games
8MASTER_SITES= http://www.autobahn.mb.ca/~foxtrot/ 8MASTER_SITES= http://www.autobahn.mb.ca/~foxtrot/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= # http://freshmeat.net/homepage/898367442/ 11HOMEPAGE= # http://freshmeat.net/homepage/898367442/
12COMMENT= Overhead view maze-based shoot 'em up game 12COMMENT= Overhead view maze-based shoot 'em up game
13 13
 14PKG_DESTDIR_SUPPORT= user-destdir
 15
 16INSTALLATION_DIRS= bin
 17
14WRKSRC= ${WRKDIR}/xroads-v0.5 18WRKSRC= ${WRKDIR}/xroads-v0.5
15 19
16.include "../../x11/libX11/buildlink3.mk" 20.include "../../x11/libX11/buildlink3.mk"
17.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/games/xroads/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xroads/distinfo 2006/08/02 19:24:55 1.6
+++ pkgsrc/games/xroads/distinfo 2009/07/08 17:19:05 1.7
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.6 2006/08/02 19:24:55 kristerw Exp $ 1$NetBSD: distinfo,v 1.7 2009/07/08 17:19:05 joerg Exp $
2 2
3SHA1 (xroads-v0.5.tar.gz) = 559f916eda55ba4700c2cea6fcb42d1b1a47fa06 3SHA1 (xroads-v0.5.tar.gz) = 559f916eda55ba4700c2cea6fcb42d1b1a47fa06
4RMD160 (xroads-v0.5.tar.gz) = c0399b391d2113d93c08c25ad6370273791261b7 4RMD160 (xroads-v0.5.tar.gz) = c0399b391d2113d93c08c25ad6370273791261b7
5Size (xroads-v0.5.tar.gz) = 48641 bytes 5Size (xroads-v0.5.tar.gz) = 48641 bytes
6SHA1 (patch-aa) = 4978b1b718b920871d06acff54895da60642c949 6SHA1 (patch-aa) = 4484ea71864b6db650faddf793b850ab251f34ad
7SHA1 (patch-ab) = f22b139e84c4e2d4d9d190d818d0ce6aba816a23 7SHA1 (patch-ab) = f22b139e84c4e2d4d9d190d818d0ce6aba816a23
8SHA1 (patch-ac) = 19c91236e36cced0c26f527fdc99a565dfdb245f 8SHA1 (patch-ac) = 19c91236e36cced0c26f527fdc99a565dfdb245f
9SHA1 (patch-ad) = eb76c3ee57d8b18f70e7f8bcd41d96d5e1dd4dad 9SHA1 (patch-ad) = eb76c3ee57d8b18f70e7f8bcd41d96d5e1dd4dad
10SHA1 (patch-ae) = 7770ab7e6fec64d836f3ed886e1709dab508d9c5 10SHA1 (patch-ae) = 7770ab7e6fec64d836f3ed886e1709dab508d9c5
cvs diff -r1.2 -r1.3 pkgsrc/games/xroads/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/xroads/patches/patch-aa 2000/09/26 00:46:05 1.2
+++ pkgsrc/games/xroads/patches/patch-aa 2009/07/08 17:19:05 1.3
@@ -1,33 +1,50 @@ @@ -1,33 +1,50 @@
1$NetBSD: patch-aa,v 1.2 2000/09/26 00:46:05 hubertf Exp $ 1$NetBSD: patch-aa,v 1.3 2009/07/08 17:19:05 joerg Exp $
2 2
3--- Makefile.orig Wed Jun 30 20:25:02 1999 3--- Makefile.orig 1999-06-30 20:25:02.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -5,8 +5,8 @@ 5@@ -5,8 +5,8 @@ VERSION = v0.5
6 # it's data, and BINPATH is where it puts the executable 6 # it's data, and BINPATH is where it puts the executable
7 ########################################################################### 7 ###########################################################################
8  8
9-DATAPATH = /usr/games/xroads/ 9-DATAPATH = /usr/games/xroads/
10-BINPATH = /usr/X11R6/bin/ 10-BINPATH = /usr/X11R6/bin/
11+DATAPATH = ${PREFIX}/share/xroads/ 11+DATAPATH = ${PREFIX}/share/xroads/
12+BINPATH = ${PREFIX}/bin/ 12+BINPATH = ${PREFIX}/bin/
13 # I imagine you would use this BINPATH for Solaris: 13 # I imagine you would use this BINPATH for Solaris:
14 #BINPATH = /usr/openwin/bin/ 14 #BINPATH = /usr/openwin/bin/
15  15
16@@ -15,7 +15,7 @@ 16@@ -15,7 +15,7 @@ BINPATH = /usr/X11R6/bin/
17 # optimizations. Check the manual for your compiler. 17 # optimizations. Check the manual for your compiler.
18 ########################################################################### 18 ###########################################################################
19  19
20-CFLAGS = -fomit-frame-pointer -O2 -Wall -DXRMPATH=\"$(DATAPATH)\" 20-CFLAGS = -fomit-frame-pointer -O2 -Wall -DXRMPATH=\"$(DATAPATH)\"
21+CFLAGS = -O2 -Wall -DXRMPATH=\"$(DATAPATH)\" -I${X11BASE}/include -I${X11BASE}/include/X11 21+CFLAGS = -O2 -Wall -DXRMPATH=\"$(DATAPATH)\" -I${X11BASE}/include -I${X11BASE}/include/X11
22 #CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\" 22 #CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\"
23  23
24 ########################################################################### 24 ###########################################################################
25@@ -33,7 +33,7 @@ 25@@ -33,7 +33,7 @@ CFLAGS = -fomit-frame-pointer -O2 -Wall
26 ########################################################################### 26 ###########################################################################
27  27
28 ### Linux machines use this line: 28 ### Linux machines use this line:
29-LINK = -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 -lm 29-LINK = -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 -lm
30+LINK = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -I${X11BASE}/include -lX11 -lm 30+LINK = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -I${X11BASE}/include -lX11 -lm
31  31
32 ### I'm told this line works fine on Solaris 2.5.1 with X11R5: 32 ### I'm told this line works fine on Solaris 2.5.1 with X11R5:
33 #LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm 33 #LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm
 34@@ -73,11 +73,11 @@ all: $(OBJECTS)
 35 $(CC) $(FLAGS) $(LINK) -o xroads $(OBJECTS)
 36
 37 install: all
 38- rm -fr $(DATAPATH)
 39- mkdir $(DATAPATH)
 40- cp -f *.xrm $(DATAPATH)
 41- cp -f README $(DATAPATH)
 42- cp -f xroads $(BINPATH)
 43+ rm -fr ${DESTDIR}$(DATAPATH)
 44+ mkdir ${DESTDIR}$(DATAPATH)
 45+ ${BSD_INSTALL_DATA} *.xrm ${DESTDIR}$(DATAPATH)
 46+ ${BSD_INSTALL_DATA} README ${DESTDIR}$(DATAPATH)
 47+ ${BSD_INSTALL_PROGRAM} xroads ${DESTDIR}$(BINPATH)
 48
 49 uninstall:
 50 rm -fr $(DATAPATH)