diff options
author | dholland <dholland> | 2010-02-14 08:17:11 +0000 |
---|---|---|
committer | dholland <dholland> | 2010-02-14 08:17:11 +0000 |
commit | e0a9788de2810bca2ecd1377c7cc0db11613e6bf (patch) | |
tree | b4f36425197e8a047996fea66ecde2724a2cb009 /games | |
parent | 6d8dc018877ca3ba25b16e850bb52f3f88eb1058 (diff) | |
download | pkgsrc-e0a9788de2810bca2ecd1377c7cc0db11613e6bf.tar.gz |
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.
Diffstat (limited to 'games')
-rw-r--r-- | games/xconq/Makefile | 20 | ||||
-rw-r--r-- | games/xconq/distinfo | 11 | ||||
-rw-r--r-- | games/xconq/patches/patch-aa | 34 | ||||
-rw-r--r-- | games/xconq/patches/patch-ab | 17 | ||||
-rw-r--r-- | games/xconq/patches/patch-ac | 46 | ||||
-rw-r--r-- | games/xconq/patches/patch-al | 37 | ||||
-rw-r--r-- | games/xconq/patches/patch-am | 26 | ||||
-rw-r--r-- | games/xconq/patches/patch-an | 15 |
8 files changed, 185 insertions, 21 deletions
diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 3fd74b51284..1da44f6c773 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2008/11/10 17:21:35 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2010/02/14 08:17:11 dholland Exp $ DISTNAME= xconq-7.4.1 PKGREVISION= 7 @@ -9,10 +9,12 @@ MAINTAINER= kleink@NetBSD.org HOMEPAGE= http://sources.redhat.com/xconq/ COMMENT= Xconq is a general strategy game system +PKG_DESTDIR_SUPPORT= user-destdir + USE_X11BASE= YES USE_TOOLS+= gmake makeinfo GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-alternate-scoresdir=${VARBASE}/games/xconq/scores +CONFIGURE_ARGS+= --enable-alternate-scoresdir=${SCOREDIR} CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib" @@ -21,12 +23,24 @@ MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q} \ infodir=${PREFIX:Q}/${PKGINFODIR:Q} INFO_FILES= # PLIST +# XXX SETGIDGAME should go away and the rest of these should come from +# the infrastructure. +SETGIDGAME= yes +GAMEDIRMODE?= 775 +GAMEDIR_PERMS?= ${ROOT_USER} ${GAMES_GROUP} ${GAMEDIRMODE} + +SPECIAL_PERMS+= bin/xconq ${SETGID_GAMES_PERMS} +SCOREDIR= ${VARBASE}/games/xconq/scores +REQD_DIRS_PERMS+= ${SCOREDIR} ${GAMEDIR_PERMS} + +BUILD_DEFS+= VARBASE SCOREDIR + post-build: cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} info post-install: - cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \ + cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} install-info .include "../../lang/tcl/buildlink3.mk" diff --git a/games/xconq/distinfo b/games/xconq/distinfo index 8af05e77f64..4bd288439a1 100644 --- a/games/xconq/distinfo +++ b/games/xconq/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.10 2007/04/16 18:47:19 joerg Exp $ +$NetBSD: distinfo,v 1.11 2010/02/14 08:17:11 dholland Exp $ SHA1 (xconq-7.4.1.tar.gz) = b7d03d17806500f05c23889a00b7608843a27ce7 RMD160 (xconq-7.4.1.tar.gz) = e596eaccb6a48709e9ceb58fc59e715e36dbf43a Size (xconq-7.4.1.tar.gz) = 3402832 bytes -SHA1 (patch-aa) = 71ca2de62949a33068d145fd8d41246bf97a889d -SHA1 (patch-ab) = 8c7c69b453d128f9a1bf816b8946bd39b090f86e -SHA1 (patch-ac) = 97fbb844a3142d648ba24a7dca0487dbc5fd0a83 +SHA1 (patch-aa) = 8b594e6003e3a5b271900f77edf0c62ea364f5e3 +SHA1 (patch-ab) = 14fbedcc58e8593374972a570e18dd6acc852e1c +SHA1 (patch-ac) = b71d639b3746bd0cb29892ed70df207a8d047403 SHA1 (patch-ad) = 2e20bd999e935eaccd2c569ca6712ff28187c244 SHA1 (patch-ae) = fc440492eac9aa6feafb31dc6ba6bfceeb5408a4 SHA1 (patch-af) = 420a6702dd189058873da4a5353ebad020bec018 @@ -14,3 +14,6 @@ SHA1 (patch-ah) = 56ed616d61b2029bbf1dcd9a9fb1b89793761c5c SHA1 (patch-ai) = 10d285f9693f79f8591f1f24baf8916f0973b9a1 SHA1 (patch-aj) = 89d6d7e50c776ef2628897a081da7b9f61cddc4d SHA1 (patch-ak) = c8ed8ac403cd9dc1fc1c6befdd175f1e3f4d4ddb +SHA1 (patch-al) = ffe9cd40b051d96e8144aad865a074c002406c2d +SHA1 (patch-am) = 9b070c53ef7b7bc0710fdca8e3dfaf9105cec22c +SHA1 (patch-an) = 2f8766a947d8fc13a9447df0ec8f20acc2cf347f diff --git a/games/xconq/patches/patch-aa b/games/xconq/patches/patch-aa index d2ce359888c..c1fd81771e5 100644 --- a/games/xconq/patches/patch-aa +++ b/games/xconq/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2000/08/31 07:26:23 kleink Exp $ +$NetBSD: patch-aa,v 1.3 2010/02/14 08:17:12 dholland Exp $ ---- Makefile.in.orig Tue Jun 13 15:04:45 2000 -+++ Makefile.in Thu Aug 31 07:55:46 2000 -@@ -28,10 +28,10 @@ +--- Makefile.in.orig 2000-08-22 12:52:56.000000000 +0000 ++++ Makefile.in +@@ -28,10 +28,10 @@ srcdir = @srcdir@ VPATH = @srcdir@ GAMEUID = games @@ -16,3 +16,29 @@ $NetBSD: patch-aa,v 1.2 2000/08/31 07:26:23 kleink Exp $ FILEPERM = 0644 SHELL = /bin/sh +@@ -255,9 +255,9 @@ install-dirs: + @for i in $(MAKEDIRS) ; do \ + echo Making $$i... ; \ + parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \ +- if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \ +- if [ ! -d $$i ] ; then \ +- if mkdir $$i ; then \ ++ if [ -d $(DESTDIR)$$parent ] ; then true ; else mkdir $(DESTDIR)$$parent ; fi ; \ ++ if [ ! -d $(DESTDIR)$$i ] ; then \ ++ if mkdir $(DESTDIR)$$i ; then \ + true ; \ + else \ + exit 1 ; \ +@@ -266,9 +266,9 @@ install-dirs: + true ; \ + fi ; \ + done +- chown $(GAMEUID) $(scoresdir) +- chgrp $(GAMEGRP) $(scoresdir) +- chmod $(DIRPERM) $(scoresdir) ++ #chown $(GAMEUID) $(DESTDIR)$(scoresdir) ++ #chgrp $(GAMEGRP) $(DESTDIR)$(scoresdir) ++ #chmod $(DIRPERM) $(DESTDIR)$(scoresdir) + + clean: + @$(MAKE) $(FLAGS_TO_PASS) DO=clean "DODIRS=$(SUBDIRS)" subdir_do diff --git a/games/xconq/patches/patch-ab b/games/xconq/patches/patch-ab index 7709f5b49f3..bfda19f67b2 100644 --- a/games/xconq/patches/patch-ab +++ b/games/xconq/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2002/09/23 10:28:27 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2010/02/14 08:17:12 dholland Exp $ ---- tcltk/Makefile.in.orig Wed Jun 14 17:02:05 2000 +--- tcltk/Makefile.in.orig 2000-07-14 15:39:55.000000000 +0000 +++ tcltk/Makefile.in -@@ -95,7 +95,7 @@ +@@ -96,7 +96,7 @@ HFLAGS = @HFLAGS@ X11_INCLUDE_FLAGS = @XINCLUDES@ @@ -11,3 +11,14 @@ $NetBSD: patch-ab,v 1.5 2002/09/23 10:28:27 jlam Exp $ .c.o: $(CC) -c $(ALL_CFLAGS) $< +@@ -125,8 +125,8 @@ libtkiapp.a: tkiapp.o + install: all install-only + + install-only: +- $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(datadir) +- $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(datadir) ++ $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(DESTDIR)$(datadir) ++ $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(DESTDIR)$(datadir) + + # Usual cleaning, and flushing of anything junk-like. + diff --git a/games/xconq/patches/patch-ac b/games/xconq/patches/patch-ac index 32a6c416a20..53e08de4487 100644 --- a/games/xconq/patches/patch-ac +++ b/games/xconq/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2007/04/16 18:47:19 joerg Exp $ +$NetBSD: patch-ac,v 1.8 2010/02/14 08:17:12 dholland Exp $ ---- x11/Makefile.in.orig Mon Jun 19 17:36:18 2000 +--- x11/Makefile.in.orig 2000-08-22 12:52:56.000000000 +0000 +++ x11/Makefile.in -@@ -25,10 +25,10 @@ +@@ -25,10 +25,10 @@ VPATH = @srcdir@ krnsrcdir = $(srcdir)/../kernel GAMEUID = games @@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.7 2007/04/16 18:47:19 joerg Exp $ FILEPERM = 0644 SHELL = /bin/sh -@@ -49,7 +49,7 @@ +@@ -49,7 +49,7 @@ XAW_LIB = -lXaw -lXt $(X11_LIB) -lXext - #TCLTK_LIB = -ltk -ltcl -ldl -lm #TCLTK_LIB = ../tcl/unix/libtcl8.0.a ../tk/unix/libtk8.0.a -ldl -lm @@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.7 2007/04/16 18:47:19 joerg Exp $ # Extra flags that the TCLTK files need: TCLTK_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) -@@ -65,14 +65,14 @@ +@@ -65,14 +65,14 @@ LIB_INSTALL_DIR = $(libdir) # This variable is needed when doing dynamic linking. LIB_RUNTIME_DIR = $(libdir) TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@ @@ -42,7 +42,7 @@ $NetBSD: patch-ac,v 1.7 2007/04/16 18:47:19 joerg Exp $ TK_DEPS = X11_CFLAGS = @TK_XINCLUDES@ -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ X11_LIBS = GUI_CFLAGS_X = @GUI_CFLAGS_X@ @@ -51,7 +51,7 @@ $NetBSD: patch-ac,v 1.7 2007/04/16 18:47:19 joerg Exp $ # Override this to disable SelFile calls. -@@ -173,7 +173,7 @@ +@@ -154,7 +154,7 @@ HFLAGS = @HFLAGS@ X11_INCLUDE_FLAGS = @XINCLUDES@ @@ -60,3 +60,35 @@ $NetBSD: patch-ac,v 1.7 2007/04/16 18:47:19 joerg Exp $ .c.o: $(CC) -c $(ALL_CFLAGS) $< +@@ -209,20 +209,20 @@ install: all install-only + + install-only: + srcroot=`cd $(srcroot); pwd`; export srcroot; \ +- $(INSTALL_PROGRAM) xconq $(bindir); \ +- chown $(GAMEUID) $(bindir)/xconq; \ +- chgrp $(GAMEGRP) $(bindir)/xconq; \ +- chmod $(GAMEPERM) $(bindir)/xconq; \ +- $(INSTALL_PROGRAM) imf2x $(bindir); \ +- $(INSTALL_PROGRAM) x2imf $(bindir); \ +- $(INSTALL_PROGRAM) ximfapp $(bindir); \ +- $(INSTALL_DATA) xconq.6 $(man6dir) ++ $(INSTALL_PROGRAM) xconq $(DESTDIR)$(bindir); \ ++ #chown $(GAMEUID) $(DESTDIR)$(bindir)/xconq; \ ++ #chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/xconq; \ ++ #chmod $(GAMEPERM) $(DESTDIR)$(bindir)/xconq; \ ++ $(INSTALL_PROGRAM) imf2x $(DESTDIR)$(bindir); \ ++ $(INSTALL_PROGRAM) x2imf $(DESTDIR)$(bindir); \ ++ $(INSTALL_PROGRAM) ximfapp $(DESTDIR)$(bindir); \ ++ $(INSTALL_DATA) xconq.6 $(DESTDIR)$(man6dir) + + install-xshowimf: + srcroot=`cd $(srcroot); pwd`; export srcroot; \ +- $(INSTALL_PROGRAM) xshowimf $(bindir); \ +- $(INSTALL_DATA) XShowimf $(appdefaultsdir); \ +- $(INSTALL_DATA) XShowimf-color $(appdefaultsdir); \ ++ $(INSTALL_PROGRAM) xshowimf $(DESTDIR)$(bindir); \ ++ $(INSTALL_DATA) XShowimf $(DESTDIR)$(appdefaultsdir); \ ++ $(INSTALL_DATA) XShowimf-color $(DESTDIR)$(appdefaultsdir); \ + + # Cleanliness support. + diff --git a/games/xconq/patches/patch-al b/games/xconq/patches/patch-al new file mode 100644 index 00000000000..8fd713a9217 --- /dev/null +++ b/games/xconq/patches/patch-al @@ -0,0 +1,37 @@ +$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: + diff --git a/games/xconq/patches/patch-am b/games/xconq/patches/patch-am new file mode 100644 index 00000000000..6d9def725a3 --- /dev/null +++ b/games/xconq/patches/patch-am @@ -0,0 +1,26 @@ +$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: + diff --git a/games/xconq/patches/patch-an b/games/xconq/patches/patch-an new file mode 100644 index 00000000000..edd05f17463 --- /dev/null +++ b/games/xconq/patches/patch-an @@ -0,0 +1,15 @@ +$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. |