pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/xconq DESTDIR support.
details: https://anonhg.NetBSD.org/pkgsrc/rev/118402ffe6db
branches: trunk
changeset: 571509:118402ffe6db
user: dholland <dholland%pkgsrc.org@localhost>
date: Sun Feb 14 08:17:11 2010 +0000
description:
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:
games/xconq/Makefile | 20 ++++++++++++++++--
games/xconq/distinfo | 11 ++++++---
games/xconq/patches/patch-aa | 34 ++++++++++++++++++++++++++++---
games/xconq/patches/patch-ab | 17 +++++++++++++--
games/xconq/patches/patch-ac | 46 +++++++++++++++++++++++++++++++++++++------
games/xconq/patches/patch-al | 37 +++++++++++++++++++++++++++++++++++
games/xconq/patches/patch-am | 26 ++++++++++++++++++++++++
games/xconq/patches/patch-an | 15 ++++++++++++++
8 files changed, 185 insertions(+), 21 deletions(-)
diffs (truncated from 328 to 300 lines):
diff -r a40b1d8a9912 -r 118402ffe6db games/xconq/Makefile
--- a/games/xconq/Makefile Sun Feb 14 06:58:25 2010 +0000
+++ b/games/xconq/Makefile Sun Feb 14 08:17:11 2010 +0000
@@ -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 @@
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 @@
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 -r a40b1d8a9912 -r 118402ffe6db games/xconq/distinfo
--- a/games/xconq/distinfo Sun Feb 14 06:58:25 2010 +0000
+++ b/games/xconq/distinfo Sun Feb 14 08:17:11 2010 +0000
@@ -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-ai) = 10d285f9693f79f8591f1f24baf8916f0973b9a1
SHA1 (patch-aj) = 89d6d7e50c776ef2628897a081da7b9f61cddc4d
SHA1 (patch-ak) = c8ed8ac403cd9dc1fc1c6befdd175f1e3f4d4ddb
+SHA1 (patch-al) = ffe9cd40b051d96e8144aad865a074c002406c2d
+SHA1 (patch-am) = 9b070c53ef7b7bc0710fdca8e3dfaf9105cec22c
+SHA1 (patch-an) = 2f8766a947d8fc13a9447df0ec8f20acc2cf347f
diff -r a40b1d8a9912 -r 118402ffe6db games/xconq/patches/patch-aa
--- a/games/xconq/patches/patch-aa Sun Feb 14 06:58:25 2010 +0000
+++ b/games/xconq/patches/patch-aa Sun Feb 14 08:17:11 2010 +0000
@@ -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 @@
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 -r a40b1d8a9912 -r 118402ffe6db games/xconq/patches/patch-ab
--- a/games/xconq/patches/patch-ab Sun Feb 14 06:58:25 2010 +0000
+++ b/games/xconq/patches/patch-ab Sun Feb 14 08:17:11 2010 +0000
@@ -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 @@
.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 -r a40b1d8a9912 -r 118402ffe6db games/xconq/patches/patch-ac
--- a/games/xconq/patches/patch-ac Sun Feb 14 06:58:25 2010 +0000
+++ b/games/xconq/patches/patch-ac Sun Feb 14 08:17:11 2010 +0000
@@ -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 @@
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 @@
# 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 @@
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 @@
# Override this to disable SelFile calls.
-@@ -173,7 +173,7 @@
+@@ -154,7 +154,7 @@ HFLAGS = @HFLAGS@
X11_INCLUDE_FLAGS = @XINCLUDES@
@@ -60,3 +60,35 @@
.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 -r a40b1d8a9912 -r 118402ffe6db games/xconq/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xconq/patches/patch-al Sun Feb 14 08:17:11 2010 +0000
@@ -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 -r a40b1d8a9912 -r 118402ffe6db games/xconq/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xconq/patches/patch-am Sun Feb 14 08:17:11 2010 +0000
@@ -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)/*
Home |
Main Index |
Thread Index |
Old Index