Sun Feb 14 08:17:12 2010 UTC ()
DESTDIR support.

XXX: It looks as if it expects to be able to write to its installed data,
XXX: and it can't. I haven't changed the behavior; it needs further
XXX: investigation. More details are noted in the header of patch-al.


(dholland)
diff -r1.35 -r1.36 pkgsrc/games/xconq/Makefile
diff -r1.10 -r1.11 pkgsrc/games/xconq/distinfo
diff -r1.2 -r1.3 pkgsrc/games/xconq/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/games/xconq/patches/patch-ab
diff -r1.7 -r1.8 pkgsrc/games/xconq/patches/patch-ac
diff -r0 -r1.1 pkgsrc/games/xconq/patches/patch-al
diff -r0 -r1.1 pkgsrc/games/xconq/patches/patch-am
diff -r0 -r1.1 pkgsrc/games/xconq/patches/patch-an
cvs diff -r1.35 -r1.36 pkgsrc/games/xconq/Makefile (expand / switch to unified diff)

--- pkgsrc/games/xconq/Makefile 2008/11/10 17:21:35 1.35
+++ pkgsrc/games/xconq/Makefile 2010/02/14 08:17:11 1.36
@@ -1,36 +1,50 @@ @@ -1,36 +1,50 @@
1# $NetBSD: Makefile,v 1.35 2008/11/10 17:21:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.36 2010/02/14 08:17:11 dholland Exp $
2 2
3DISTNAME= xconq-7.4.1 3DISTNAME= xconq-7.4.1
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= games x11 5CATEGORIES= games x11
6MASTER_SITES= ftp://sources.redhat.com/pub/xconq/ 6MASTER_SITES= ftp://sources.redhat.com/pub/xconq/
7 7
8MAINTAINER= kleink@NetBSD.org 8MAINTAINER= kleink@NetBSD.org
9HOMEPAGE= http://sources.redhat.com/xconq/ 9HOMEPAGE= http://sources.redhat.com/xconq/
10COMMENT= Xconq is a general strategy game system 10COMMENT= Xconq is a general strategy game system
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12USE_X11BASE= YES 14USE_X11BASE= YES
13USE_TOOLS+= gmake makeinfo 15USE_TOOLS+= gmake makeinfo
14GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
15CONFIGURE_ARGS+= --enable-alternate-scoresdir=${VARBASE}/games/xconq/scores 17CONFIGURE_ARGS+= --enable-alternate-scoresdir=${SCOREDIR}
16CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" 18CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
17CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib" 19CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib"
18 20
19MAKE_ENV+= LOCALBASE=${LOCALBASE:Q} 21MAKE_ENV+= LOCALBASE=${LOCALBASE:Q}
20MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q} \ 22MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q} \
21 infodir=${PREFIX:Q}/${PKGINFODIR:Q} 23 infodir=${PREFIX:Q}/${PKGINFODIR:Q}
22INFO_FILES= # PLIST 24INFO_FILES= # PLIST
23 25
 26# XXX SETGIDGAME should go away and the rest of these should come from
 27# the infrastructure.
 28SETGIDGAME= yes
 29GAMEDIRMODE?= 775
 30GAMEDIR_PERMS?= ${ROOT_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 31
 32SPECIAL_PERMS+= bin/xconq ${SETGID_GAMES_PERMS}
 33SCOREDIR= ${VARBASE}/games/xconq/scores
 34REQD_DIRS_PERMS+= ${SCOREDIR} ${GAMEDIR_PERMS}
 35
 36BUILD_DEFS+= VARBASE SCOREDIR
 37
24post-build: 38post-build:
25 cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \ 39 cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
26 ${MAKE_PROGRAM} ${MAKE_FLAGS} info 40 ${MAKE_PROGRAM} ${MAKE_FLAGS} info
27 41
28post-install: 42post-install:
29 cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \ 43 cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} \
30 ${MAKE_PROGRAM} ${MAKE_FLAGS} install-info 44 ${MAKE_PROGRAM} ${MAKE_FLAGS} install-info
31 45
32.include "../../lang/tcl/buildlink3.mk" 46.include "../../lang/tcl/buildlink3.mk"
33.include "../../x11/libXaw/buildlink3.mk" 47.include "../../x11/libXaw/buildlink3.mk"
34.include "../../x11/tk/buildlink3.mk" 48.include "../../x11/tk/buildlink3.mk"
35 49
36.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/games/xconq/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xconq/distinfo 2007/04/16 18:47:19 1.10
+++ pkgsrc/games/xconq/distinfo 2010/02/14 08:17:11 1.11
@@ -1,16 +1,19 @@ @@ -1,16 +1,19 @@
1$NetBSD: distinfo,v 1.10 2007/04/16 18:47:19 joerg Exp $ 1$NetBSD: distinfo,v 1.11 2010/02/14 08:17:11 dholland Exp $
2 2
3SHA1 (xconq-7.4.1.tar.gz) = b7d03d17806500f05c23889a00b7608843a27ce7 3SHA1 (xconq-7.4.1.tar.gz) = b7d03d17806500f05c23889a00b7608843a27ce7
4RMD160 (xconq-7.4.1.tar.gz) = e596eaccb6a48709e9ceb58fc59e715e36dbf43a 4RMD160 (xconq-7.4.1.tar.gz) = e596eaccb6a48709e9ceb58fc59e715e36dbf43a
5Size (xconq-7.4.1.tar.gz) = 3402832 bytes 5Size (xconq-7.4.1.tar.gz) = 3402832 bytes
6SHA1 (patch-aa) = 71ca2de62949a33068d145fd8d41246bf97a889d 6SHA1 (patch-aa) = 8b594e6003e3a5b271900f77edf0c62ea364f5e3
7SHA1 (patch-ab) = 8c7c69b453d128f9a1bf816b8946bd39b090f86e 7SHA1 (patch-ab) = 14fbedcc58e8593374972a570e18dd6acc852e1c
8SHA1 (patch-ac) = 97fbb844a3142d648ba24a7dca0487dbc5fd0a83 8SHA1 (patch-ac) = b71d639b3746bd0cb29892ed70df207a8d047403
9SHA1 (patch-ad) = 2e20bd999e935eaccd2c569ca6712ff28187c244 9SHA1 (patch-ad) = 2e20bd999e935eaccd2c569ca6712ff28187c244
10SHA1 (patch-ae) = fc440492eac9aa6feafb31dc6ba6bfceeb5408a4 10SHA1 (patch-ae) = fc440492eac9aa6feafb31dc6ba6bfceeb5408a4
11SHA1 (patch-af) = 420a6702dd189058873da4a5353ebad020bec018 11SHA1 (patch-af) = 420a6702dd189058873da4a5353ebad020bec018
12SHA1 (patch-ag) = 2a5989750d187d911e7bf443a1354a390dd7ab2d 12SHA1 (patch-ag) = 2a5989750d187d911e7bf443a1354a390dd7ab2d
13SHA1 (patch-ah) = 56ed616d61b2029bbf1dcd9a9fb1b89793761c5c 13SHA1 (patch-ah) = 56ed616d61b2029bbf1dcd9a9fb1b89793761c5c
14SHA1 (patch-ai) = 10d285f9693f79f8591f1f24baf8916f0973b9a1 14SHA1 (patch-ai) = 10d285f9693f79f8591f1f24baf8916f0973b9a1
15SHA1 (patch-aj) = 89d6d7e50c776ef2628897a081da7b9f61cddc4d 15SHA1 (patch-aj) = 89d6d7e50c776ef2628897a081da7b9f61cddc4d
16SHA1 (patch-ak) = c8ed8ac403cd9dc1fc1c6befdd175f1e3f4d4ddb 16SHA1 (patch-ak) = c8ed8ac403cd9dc1fc1c6befdd175f1e3f4d4ddb
 17SHA1 (patch-al) = ffe9cd40b051d96e8144aad865a074c002406c2d
 18SHA1 (patch-am) = 9b070c53ef7b7bc0710fdca8e3dfaf9105cec22c
 19SHA1 (patch-an) = 2f8766a947d8fc13a9447df0ec8f20acc2cf347f
cvs diff -r1.2 -r1.3 pkgsrc/games/xconq/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/xconq/patches/patch-aa 2000/08/31 07:26:23 1.2
+++ pkgsrc/games/xconq/patches/patch-aa 2010/02/14 08:17:12 1.3
@@ -1,18 +1,44 @@ @@ -1,18 +1,44 @@
1$NetBSD: patch-aa,v 1.2 2000/08/31 07:26:23 kleink Exp $ 1$NetBSD: patch-aa,v 1.3 2010/02/14 08:17:12 dholland Exp $
2 2
3--- Makefile.in.orig Tue Jun 13 15:04:45 2000 3--- Makefile.in.orig 2000-08-22 12:52:56.000000000 +0000
4+++ Makefile.in Thu Aug 31 07:55:46 2000 4+++ Makefile.in
5@@ -28,10 +28,10 @@ 5@@ -28,10 +28,10 @@ srcdir = @srcdir@
6 VPATH = @srcdir@ 6 VPATH = @srcdir@
7  7
8 GAMEUID = games 8 GAMEUID = games
9-GAMEGRP = bin 9-GAMEGRP = bin
10+GAMEGRP = games 10+GAMEGRP = games
11  11
12-GAMEPERM = 04755 12-GAMEPERM = 04755
13-DIRPERM = 0755 13-DIRPERM = 0755
14+GAMEPERM = 02755 14+GAMEPERM = 02755
15+DIRPERM = 0775 15+DIRPERM = 0775
16 FILEPERM = 0644 16 FILEPERM = 0644
17  17
18 SHELL = /bin/sh 18 SHELL = /bin/sh
 19@@ -255,9 +255,9 @@ install-dirs:
 20 @for i in $(MAKEDIRS) ; do \
 21 echo Making $$i... ; \
 22 parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \
 23- if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \
 24- if [ ! -d $$i ] ; then \
 25- if mkdir $$i ; then \
 26+ if [ -d $(DESTDIR)$$parent ] ; then true ; else mkdir $(DESTDIR)$$parent ; fi ; \
 27+ if [ ! -d $(DESTDIR)$$i ] ; then \
 28+ if mkdir $(DESTDIR)$$i ; then \
 29 true ; \
 30 else \
 31 exit 1 ; \
 32@@ -266,9 +266,9 @@ install-dirs:
 33 true ; \
 34 fi ; \
 35 done
 36- chown $(GAMEUID) $(scoresdir)
 37- chgrp $(GAMEGRP) $(scoresdir)
 38- chmod $(DIRPERM) $(scoresdir)
 39+ #chown $(GAMEUID) $(DESTDIR)$(scoresdir)
 40+ #chgrp $(GAMEGRP) $(DESTDIR)$(scoresdir)
 41+ #chmod $(DIRPERM) $(DESTDIR)$(scoresdir)
 42
 43 clean:
 44 @$(MAKE) $(FLAGS_TO_PASS) DO=clean "DODIRS=$(SUBDIRS)" subdir_do
cvs diff -r1.5 -r1.6 pkgsrc/games/xconq/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/games/xconq/patches/patch-ab 2002/09/23 10:28:27 1.5
+++ pkgsrc/games/xconq/patches/patch-ab 2010/02/14 08:17:12 1.6
@@ -1,13 +1,24 @@ @@ -1,13 +1,24 @@
1$NetBSD: patch-ab,v 1.5 2002/09/23 10:28:27 jlam Exp $ 1$NetBSD: patch-ab,v 1.6 2010/02/14 08:17:12 dholland Exp $
2 2
3--- tcltk/Makefile.in.orig Wed Jun 14 17:02:05 2000 3--- tcltk/Makefile.in.orig 2000-07-14 15:39:55.000000000 +0000
4+++ tcltk/Makefile.in 4+++ tcltk/Makefile.in
5@@ -95,7 +95,7 @@ 5@@ -96,7 +96,7 @@ HFLAGS = @HFLAGS@
6  6
7 X11_INCLUDE_FLAGS = @XINCLUDES@ 7 X11_INCLUDE_FLAGS = @XINCLUDES@
8  8
9-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) 9-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS)
10+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(LOCALBASE)/include/tcl/generic -I$(LOCALBASE)/include/tk/generic $(X11_INCLUDE_FLAGS) 10+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(LOCALBASE)/include/tcl/generic -I$(LOCALBASE)/include/tk/generic $(X11_INCLUDE_FLAGS)
11  11
12 .c.o: 12 .c.o:
13 $(CC) -c $(ALL_CFLAGS) $< 13 $(CC) -c $(ALL_CFLAGS) $<
 14@@ -125,8 +125,8 @@ libtkiapp.a: tkiapp.o
 15 install: all install-only
 16
 17 install-only:
 18- $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(datadir)
 19- $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(datadir)
 20+ $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(DESTDIR)$(datadir)
 21+ $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(DESTDIR)$(datadir)
 22
 23 # Usual cleaning, and flushing of anything junk-like.
 24
cvs diff -r1.7 -r1.8 pkgsrc/games/xconq/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/games/xconq/patches/patch-ac 2007/04/16 18:47:19 1.7
+++ pkgsrc/games/xconq/patches/patch-ac 2010/02/14 08:17:12 1.8
@@ -1,62 +1,94 @@ @@ -1,62 +1,94 @@
1$NetBSD: patch-ac,v 1.7 2007/04/16 18:47:19 joerg Exp $ 1$NetBSD: patch-ac,v 1.8 2010/02/14 08:17:12 dholland Exp $
2 2
3--- x11/Makefile.in.orig Mon Jun 19 17:36:18 2000 3--- x11/Makefile.in.orig 2000-08-22 12:52:56.000000000 +0000
4+++ x11/Makefile.in 4+++ x11/Makefile.in
5@@ -25,10 +25,10 @@ 5@@ -25,10 +25,10 @@ VPATH = @srcdir@
6 krnsrcdir = $(srcdir)/../kernel 6 krnsrcdir = $(srcdir)/../kernel
7  7
8 GAMEUID = games 8 GAMEUID = games
9-GAMEGRP = bin 9-GAMEGRP = bin
10+GAMEGRP = games 10+GAMEGRP = games
11  11
12-GAMEPERM = 04755 12-GAMEPERM = 04755
13-DIRPERM = 0755 13-DIRPERM = 0755
14+GAMEPERM = 02755 14+GAMEPERM = 02755
15+DIRPERM = 0775 15+DIRPERM = 0775
16 FILEPERM = 0644 16 FILEPERM = 0644
17  17
18 SHELL = /bin/sh 18 SHELL = /bin/sh
19@@ -49,7 +49,7 @@ 19@@ -49,7 +49,7 @@ XAW_LIB = -lXaw -lXt $(X11_LIB) -lXext -
20  20
21 #TCLTK_LIB = -ltk -ltcl -ldl -lm 21 #TCLTK_LIB = -ltk -ltcl -ldl -lm
22 #TCLTK_LIB = ../tcl/unix/libtcl8.0.a ../tk/unix/libtk8.0.a -ldl -lm 22 #TCLTK_LIB = ../tcl/unix/libtcl8.0.a ../tk/unix/libtk8.0.a -ldl -lm
23-TCLTK_LIB = $(TCL) $(TK) 23-TCLTK_LIB = $(TCL) $(TK)
24+TCLTK_LIB = $(TCL) $(TK) -Wl,-R$(libdir) 24+TCLTK_LIB = $(TCL) $(TK) -Wl,-R$(libdir)
25  25
26 # Extra flags that the TCLTK files need: 26 # Extra flags that the TCLTK files need:
27 TCLTK_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) 27 TCLTK_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS)
28@@ -65,14 +65,14 @@ 28@@ -65,14 +65,14 @@ LIB_INSTALL_DIR = $(libdir)
29 # This variable is needed when doing dynamic linking. 29 # This variable is needed when doing dynamic linking.
30 LIB_RUNTIME_DIR = $(libdir) 30 LIB_RUNTIME_DIR = $(libdir)
31 TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@ 31 TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@
32-TCL_CFLAGS = @TCLHDIR@ 32-TCL_CFLAGS = @TCLHDIR@
33+TCL_CFLAGS = -I${LOCALBASE}/include 33+TCL_CFLAGS = -I${LOCALBASE}/include
34 TCL_DEPS = 34 TCL_DEPS =
35  35
36 TCL_DL_LIBS = @TCL_DL_LIBS@ 36 TCL_DL_LIBS = @TCL_DL_LIBS@
37  37
38 # Tk stuff. 38 # Tk stuff.
39 TK = @TK_LIB_SPEC@ 39 TK = @TK_LIB_SPEC@
40-TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@ 40-TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@
41+TK_CFLAGS = -I${LOCALBASE}/include @TK_BUILD_INCLUDES@ 41+TK_CFLAGS = -I${LOCALBASE}/include @TK_BUILD_INCLUDES@
42 TK_DEPS = 42 TK_DEPS =
43  43
44 X11_CFLAGS = @TK_XINCLUDES@ 44 X11_CFLAGS = @TK_XINCLUDES@
45@@ -81,7 +81,7 @@ 45@@ -81,7 +81,7 @@ X11_LIBS =
46  46
47 GUI_CFLAGS_X = @GUI_CFLAGS_X@ 47 GUI_CFLAGS_X = @GUI_CFLAGS_X@
48  48
49-X11_LIB_FLAGS = @XLIBS@ 49-X11_LIB_FLAGS = @XLIBS@
50+X11_LIB_FLAGS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib 50+X11_LIB_FLAGS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib
51  51
52 # Override this to disable SelFile calls. 52 # Override this to disable SelFile calls.
53  53
54@@ -173,7 +173,7 @@ 54@@ -154,7 +154,7 @@ HFLAGS = @HFLAGS@
55  55
56 X11_INCLUDE_FLAGS = @XINCLUDES@ 56 X11_INCLUDE_FLAGS = @XINCLUDES@
57  57
58-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS) 58-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS)
59+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS) $(TCLTK_CFLAGS) 59+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS) $(TCLTK_CFLAGS)
60  60
61 .c.o: 61 .c.o:
62 $(CC) -c $(ALL_CFLAGS) $< 62 $(CC) -c $(ALL_CFLAGS) $<
 63@@ -209,20 +209,20 @@ install: all install-only
 64
 65 install-only:
 66 srcroot=`cd $(srcroot); pwd`; export srcroot; \
 67- $(INSTALL_PROGRAM) xconq $(bindir); \
 68- chown $(GAMEUID) $(bindir)/xconq; \
 69- chgrp $(GAMEGRP) $(bindir)/xconq; \
 70- chmod $(GAMEPERM) $(bindir)/xconq; \
 71- $(INSTALL_PROGRAM) imf2x $(bindir); \
 72- $(INSTALL_PROGRAM) x2imf $(bindir); \
 73- $(INSTALL_PROGRAM) ximfapp $(bindir); \
 74- $(INSTALL_DATA) xconq.6 $(man6dir)
 75+ $(INSTALL_PROGRAM) xconq $(DESTDIR)$(bindir); \
 76+ #chown $(GAMEUID) $(DESTDIR)$(bindir)/xconq; \
 77+ #chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/xconq; \
 78+ #chmod $(GAMEPERM) $(DESTDIR)$(bindir)/xconq; \
 79+ $(INSTALL_PROGRAM) imf2x $(DESTDIR)$(bindir); \
 80+ $(INSTALL_PROGRAM) x2imf $(DESTDIR)$(bindir); \
 81+ $(INSTALL_PROGRAM) ximfapp $(DESTDIR)$(bindir); \
 82+ $(INSTALL_DATA) xconq.6 $(DESTDIR)$(man6dir)
 83
 84 install-xshowimf:
 85 srcroot=`cd $(srcroot); pwd`; export srcroot; \
 86- $(INSTALL_PROGRAM) xshowimf $(bindir); \
 87- $(INSTALL_DATA) XShowimf $(appdefaultsdir); \
 88- $(INSTALL_DATA) XShowimf-color $(appdefaultsdir); \
 89+ $(INSTALL_PROGRAM) xshowimf $(DESTDIR)$(bindir); \
 90+ $(INSTALL_DATA) XShowimf $(DESTDIR)$(appdefaultsdir); \
 91+ $(INSTALL_DATA) XShowimf-color $(DESTDIR)$(appdefaultsdir); \
 92
 93 # Cleanliness support.
 94
File Added: pkgsrc/games/xconq/patches/patch-al
$NetBSD: patch-al,v 1.1 2010/02/14 08:17:12 dholland Exp $

DESTDIR support.

XXX: I've disabled the chown/chgrp because as things previously were,
XXX: it had no effect.
XXX: 
XXX: It was installing the data files as 644/755 games.bin, while the
XXX: program was installed setgid games because we patched things that
XXX: way. Installing the files with the pkgsrc default ownership will
XXX: not change the behavior (no write permission).
XXX: 
XXX: However, it is likely wrong and someone needs to wade in and find
XXX: out if these things really need to be writeable, and if so figure
XXX: out the best way to arrange that. SPECIAL_PERMS for all these files
XXX: (there are a lot) won't be pretty.

--- lib/Makefile.in.orig	2000-06-09 14:52:41.000000000 +0000
+++ lib/Makefile.in
@@ -51,12 +51,12 @@ install: all install-only
 install-only:
 	for i in `ls $(srcdir)/*.dir $(srcdir)/*.g $(srcdir)/*.imf $(srcdir)/news.txt`; do \
 		echo $$i; \
-		$(INSTALL_DATA) $(srcdir)/$$i $(gamelibdir); \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(gamelibdir); \
 	done
-	chown $(GAMEUID) $(gamelibdir) $(gamelibdir)/*
-	chgrp $(GAMEGRP) $(gamelibdir) $(gamelibdir)/*
-	chmod $(DIRPERM) $(gamelibdir)
-	chmod $(FILEPERM) $(gamelibdir)/*
+	#chown $(GAMEUID) $(gamelibdir) $(gamelibdir)/*
+	#chgrp $(GAMEGRP) $(gamelibdir) $(gamelibdir)/*
+	#chmod $(DIRPERM) $(gamelibdir)
+	#chmod $(FILEPERM) $(gamelibdir)/*
 
 clean:
File Added: pkgsrc/games/xconq/patches/patch-am
$NetBSD: patch-am,v 1.1 2010/02/14 08:17:12 dholland Exp $

DESTDIR support.

XXX: see comment in patch-al (same issue)

--- images/Makefile.in~	2000-06-09 14:52:41.000000000 +0000
+++ images/Makefile.in
@@ -51,12 +51,12 @@ install: all install-only
 install-only:
 	for i in `ls $(srcdir)/*.gif `; do \
 		echo $$i; \
-		$(INSTALL_DATA) $(srcdir)/$$i $(imagesdir); \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(imagesdir); \
 	done
-	chown $(GAMEUID) $(imagesdir) $(imagesdir)/*
-	chgrp $(GAMEGRP) $(imagesdir) $(imagesdir)/*
-	chmod $(DIRPERM) $(imagesdir)
-	chmod $(FILEPERM) $(imagesdir)/*
+	#chown $(GAMEUID) $(DESTDIR)$(imagesdir) $(DESTDIR)$(imagesdir)/*
+	#chgrp $(GAMEGRP) $(DESTDIR)$(imagesdir) $(DESTDIR)$(imagesdir)/*
+	#chmod $(DIRPERM) $(DESTDIR)$(imagesdir)
+	#chmod $(FILEPERM) $(DESTDIR)$(imagesdir)/*
 
 clean:
File Added: pkgsrc/games/xconq/patches/patch-an
$NetBSD: patch-an,v 1.1 2010/02/14 08:17:12 dholland Exp $

DESTDIR support.

--- doc/Makefile.in.orig	2000-06-09 14:52:40.000000000 +0000
+++ doc/Makefile.in
@@ -92,7 +92,7 @@ hacking.info:	$(DOCFILES_HACKING)
 
 install-info: info
 	for i in *.info* ; do \
-		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
+		$(BSD_INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
 	done
 
 # Generation of DVI files.