Wed Jul 8 17:07:41 2009 UTC ()
user-destdir support


(joerg)
diff -r1.31 -r1.32 pkgsrc/games/xbill/Makefile
diff -r1.12 -r1.13 pkgsrc/games/xbill/distinfo
diff -r1.9 -r1.10 pkgsrc/games/xbill/patches/patch-aa
cvs diff -r1.31 -r1.32 pkgsrc/games/xbill/Makefile (expand / switch to unified diff)

--- pkgsrc/games/xbill/Makefile 2008/11/10 17:21:35 1.31
+++ pkgsrc/games/xbill/Makefile 2009/07/08 17:07:41 1.32
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: Makefile,v 1.31 2008/11/10 17:21:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2009/07/08 17:07:41 joerg Exp $
2# 2#
3 3
4DISTNAME= xbill-2.0 4DISTNAME= xbill-2.0
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= games x11 6CATEGORIES= games x11
7MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/} 7MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.xbill.org/ 11HOMEPAGE= http://www.xbill.org/
12COMMENT= Stop the dreaded Windows virus from infecting computers 12COMMENT= Stop the dreaded Windows virus from infecting computers
13 13
 14PKG_DESTDIR_SUPPORT= user-destdir
 15
14CONFLICTS+= gnome-games-[0-9]* 16CONFLICTS+= gnome-games-[0-9]*
15 17
16USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
17USE_IMAKE= YES 19USE_IMAKE= YES
18NO_INSTALL_MANPAGES= YES 20NO_INSTALL_MANPAGES= YES
19 21
20CPPFLAGS+= -DVARBASE=\"${VARBASE}\" 22CPPFLAGS+= -DVARBASE=\"${VARBASE}\"
21CPPFLAGS.SunOS+= -DXBILL_HOME=\"${PREFIX}/share/xbill/\" 23CPPFLAGS.SunOS+= -DXBILL_HOME=\"${PREFIX}/share/xbill/\"
22PKG_USERS= ${GAMEOWN}:${GAMEGRP} 24PKG_USERS= ${GAMEOWN}:${GAMEGRP}
23PKG_GROUPS= ${GAMEGRP} 25PKG_GROUPS= ${GAMEGRP}
24MAKE_DIRS_PERMS+= ${VARBASE}/games ${GAMEOWN} ${GAMEGRP} 0775 26MAKE_DIRS_PERMS+= ${VARBASE}/games ${GAMEOWN} ${GAMEGRP} 0775
25MAKE_ENV+= GAMEOWN=${GAMEOWN:Q} 27MAKE_ENV+= GAMEOWN=${GAMEOWN:Q}
26MAKE_ENV+= GAMEGRP=${GAMEGRP:Q} 28MAKE_ENV+= GAMEGRP=${GAMEGRP:Q}
27MAKE_ENV+= GAMEMODE=${GAMEMODE:Q} 29MAKE_ENV+= GAMEMODE=${GAMEMODE:Q}
28CONF_FILES_PERMS+= ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE} 30CONF_FILES_PERMS+= ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
29 31
30INSTALLATION_DIRS+= ${PKGMANDIR}/man6 share/examples 32INSTALLATION_DIRS+= ${PKGMANDIR}/man6 share/examples
31 33
32post-install: 34post-install:
33 ${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/${PKGMANDIR}/man6/xbill.6 35 ${INSTALL_MAN} ${WRKSRC}/xbill.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xbill.6
34 ${INSTALL_DATA} ${WRKSRC}/scores ${PREFIX}/share/examples/xbill.scores 36 ${INSTALL_DATA} ${WRKSRC}/scores ${DESTDIR}${PREFIX}/share/examples/xbill.scores
35 37
36.include "../../x11/libXaw/buildlink3.mk" 38.include "../../x11/libXaw/buildlink3.mk"
37.include "../../x11/libXpm/buildlink3.mk" 39.include "../../x11/libXpm/buildlink3.mk"
38.include "../../x11/libXt/buildlink3.mk" 40.include "../../x11/libXt/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/games/xbill/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xbill/distinfo 2005/10/23 22:57:55 1.12
+++ pkgsrc/games/xbill/distinfo 2009/07/08 17:07:41 1.13
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.12 2005/10/23 22:57:55 rillig Exp $ 1$NetBSD: distinfo,v 1.13 2009/07/08 17:07:41 joerg Exp $
2 2
3SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537 3SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537
4RMD160 (xbill-2.0.tgz) = 8f1551fb5f2bf7b620243ba4787c88c91d00d460 4RMD160 (xbill-2.0.tgz) = 8f1551fb5f2bf7b620243ba4787c88c91d00d460
5Size (xbill-2.0.tgz) = 46909 bytes 5Size (xbill-2.0.tgz) = 46909 bytes
6SHA1 (patch-aa) = 6dbb52be7523877ae52a5b6f8f913acc2e7d8a5d 6SHA1 (patch-aa) = c24632f4e81460b200485f2f644d68144a27a2e6
7SHA1 (patch-ab) = 13a90b12c94352e228406541db06bacab8cd4a0d 7SHA1 (patch-ab) = 13a90b12c94352e228406541db06bacab8cd4a0d
8SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6 8SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6
9SHA1 (patch-ad) = 841d5ff9bbd984b62076a96e82b04e082d09a40c 9SHA1 (patch-ad) = 841d5ff9bbd984b62076a96e82b04e082d09a40c
cvs diff -r1.9 -r1.10 pkgsrc/games/xbill/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/xbill/patches/patch-aa 2005/10/23 22:57:55 1.9
+++ pkgsrc/games/xbill/patches/patch-aa 2009/07/08 17:07:41 1.10
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.9 2005/10/23 22:57:55 rillig Exp $ 1$NetBSD: patch-aa,v 1.10 2009/07/08 17:07:41 joerg Exp $
2 2
3--- Imakefile.orig 1997-01-23 10:38:35.000000000 -0600 3--- Imakefile.orig 1997-01-23 17:38:35.000000000 +0100
4+++ Imakefile 4+++ Imakefile
5@@ -1,4 +1,4 @@ 5@@ -1,4 +1,4 @@
6-XBILL_DIR = /var/lib/games/xbill/ 6-XBILL_DIR = /var/lib/games/xbill/
7+XBILL_DIR = $(PREFIX)/share/xbill/ 7+XBILL_DIR = $(PREFIX)/share/xbill/
8 XCOMM XBILL_DIR = $(HOME)/.xbill/ 8 XCOMM XBILL_DIR = $(HOME)/.xbill/
9  9
10 XCOMM Which widget set? Motif looks slightly better; Athena is free. 10 XCOMM Which widget set? Motif looks slightly better; Athena is free.
11@@ -10,7 +10,7 @@ XCOMM If you do not have libXpm installe 11@@ -10,7 +10,7 @@ XCOMM If you do not have libXpm installe
12 XCOMM the statement below and insert the correct path. 12 XCOMM the statement below and insert the correct path.
13 XCOMM Make sure xpm.h can be referenced as <X11/xpm.h> 13 XCOMM Make sure xpm.h can be referenced as <X11/xpm.h>
14  14
15-XPMINC = -I$(HOME)/include 15-XPMINC = -I$(HOME)/include
16+XCOMM XPMINC = -I$(HOME)/include 16+XCOMM XPMINC = -I$(HOME)/include
@@ -35,19 +35,21 @@ $NetBSD: patch-aa,v 1.9 2005/10/23 22:57 @@ -35,19 +35,21 @@ $NetBSD: patch-aa,v 1.9 2005/10/23 22:57
35 #endif 35 #endif
36  36
37 LOCAL_LIBRARIES = $(WIDGETLIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) 37 LOCAL_LIBRARIES = $(WIDGETLIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
38-DEFINES = -D$(WIDGET) 38-DEFINES = -D$(WIDGET)
39+DEFINES = -D$(WIDGET) $(XBILL_DEF) 39+DEFINES = -D$(WIDGET) $(XBILL_DEF)
40  40
41 TARGET = xbill 41 TARGET = xbill
42  42
43@@ -136,6 +134,9 @@ XBMS = bitmaps/apple.xbm \ 43@@ -136,6 +134,9 @@ XBMS = bitmaps/apple.xbm \
44  44
45 ComplexProgramTarget($(TARGET)) 45 ComplexProgramTarget($(TARGET))
46  46
47-InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777) 47-InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777)
 48-InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
 49-InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)
48+install:: 50+install::
49+ mkdir -p $(XBILL_DIR) 51+ mkdir -p ${DESTDIR}$(XBILL_DIR)
50+ ${INSTALL} -c -s -m ${GAMEMODE} -o ${GAMEOWN} -g ${GAMEGRP} xbill $(PREFIX)/bin 52+ ${INSTALL} -c -s -m ${GAMEMODE} -o ${GAMEOWN} -g ${GAMEGRP} xbill ${DESTDIR}$(PREFIX)/bin
51+ 53+
52 InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps) 54+InstallMultiple ($(XPMS),$(XBILL_DIR)pixmaps)
53 InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps) 55+InstallMultiple ($(XBMS),$(XBILL_DIR)bitmaps)