DESTDIR support

7 files changed, 31 insertions, 22 deletions

diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile
index 98bc9935e22..bd901744cd9 100644
--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/29 20:26:04 joerg Exp $
 #
 
 DISTNAME=		circuslinux-1.0.3
@@ -10,11 +10,15 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.newbreedsoftware.com/circus-linux/
 COMMENT=		Clone of the Atari 2600 game "Circus Atari"
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-joystick
 CONFIGURE_ENV+=		TARGET_DEF=LINUX
 
+INSTALL_MAKE_FLAGS+=	pkgdatadir=${DESTDIR}${PREFIX}/share/circuslinux
+
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/games/dungeon/Makefile b/games/dungeon/Makefile
index b6a6bfb15e9..39416e8e81b 100644
--- a/games/dungeon/Makefile
+++ b/games/dungeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/11/28 20:25:40 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/29 20:27:03 joerg Exp $
 #
 
 DISTNAME=	dungeon-3.2b
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://eblong.com/zarf/glk/
 COMMENT=	Classic game of Dungeon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # There really isn't any license in any of the source code or in the
 # accompanying documentation, but the sources of many versions have
 # been freely made available for many years with the assumption that
@@ -44,9 +46,10 @@ MAKE_ENV+=	GDT_FLAG=-DHAVE_GDT
 pre-build:
 	cd ${WRKDIR}/glkterm && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
+INSTALLATION_DIRS+=	bin ${DATADIR}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dungeon ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/dundat ${DESTDIR}${DATADIR}/
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/games/exchess/Makefile b/games/exchess/Makefile
index 51d49f536f7..aea0467985f 100644
--- a/games/exchess/Makefile
+++ b/games/exchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 21:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/29 20:29:26 joerg Exp $
 
 DISTNAME=		EXCH314S
 # 5.01beta available
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://personal.denison.edu/~homand/EXchess.htm
 COMMENT=		Experimental chess engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 NO_CONFIGURE=		yes
 
@@ -27,8 +29,11 @@ post-build:
 	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
 		< ${WRKSRC}/search.par.in > ${WRKSRC}/search.par
 
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCDIR}
+INSTALLATION_DIRS+=	bin lib/exchess ${DOCDIR}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/exchess ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/search.par ${DESTDIR}${PREFIX}/lib/exchess
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/exchess/files/Makefile b/games/exchess/files/Makefile
index bc746ed77f9..3db776cb520 100644
--- a/games/exchess/files/Makefile
+++ b/games/exchess/files/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/10/25 08:40:00 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/29 20:29:26 joerg Exp $
 
-BINDIR=		${PREFIX}/bin
 LIBDIR=		${PREFIX}/lib/exchess
 
 CPPFLAGS=	-DEXCHESS_DIR=\"${LIBDIR}/\"
@@ -14,12 +13,6 @@ all: exchess
 exchess: ${OBJS}
 	${CXX} -o ${.TARGET} ${OBJS} -lm
 
-install: exchess
-	${BSD_INSTALL_PROGRAM_DIR} ${BINDIR}
-	${BSD_INSTALL_PROGRAM} exchess ${BINDIR}
-	${BSD_INSTALL_DATA_DIR} ${LIBDIR}
-	${BSD_INSTALL_DATA} search.par ${LIBDIR}
-
 .SUFFIXES: .cpp
 
 .cpp.o:
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index 49e1e7e2ecb..3192dad8d77 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/19 09:16:21 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/29 20:31:33 joerg Exp $
 #
 
 DISTNAME=	finalbattle.0.0
@@ -12,10 +12,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://web.archive.org/web/2/http://www.newbreedsoftware.com/finalbattle/
 COMMENT=	Multiplayer space battle simulation for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/final
 MAKE_FILE=	makefile
 
 USE_X11BASE=	yes
 
+INSTALLATION_DIRS+=	bin
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/finalbattle/distinfo b/games/finalbattle/distinfo
index 67f603fc353..4d2800fface 100644
--- a/games/finalbattle/distinfo
+++ b/games/finalbattle/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/10/22 01:06:27 rillig Exp $
+$NetBSD: distinfo,v 1.5 2010/01/29 20:31:33 joerg Exp $
 
 SHA1 (finalbattle.0.0.tar.gz) = 36942d8bb0bd79b04cff52c085a0d1406973b965
 RMD160 (finalbattle.0.0.tar.gz) = f1df6916ebdda9bebf10f005a9ccdb97c77f6e39
 Size (finalbattle.0.0.tar.gz) = 86579 bytes
-SHA1 (patch-aa) = 5c92e158bab8914117d1e50a9efa3099066b9efb
+SHA1 (patch-aa) = 30ed8792fefa22d507ef626fffcd6b6276c513ee
 SHA1 (patch-ab) = cad883f747d86f8526a9d1a9d6138a4f75e9d0ca
diff --git a/games/finalbattle/patches/patch-aa b/games/finalbattle/patches/patch-aa
index 485ed4ff194..54507e1dc45 100644
--- a/games/finalbattle/patches/patch-aa
+++ b/games/finalbattle/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2006/10/22 01:06:27 rillig Exp $
+$NetBSD: patch-aa,v 1.5 2010/01/29 20:31:33 joerg Exp $
 
 --- makefile.orig	Thu Apr  2 21:55:07 1998
 +++ makefile	Sun Jul 26 06:51:44 1998
@@ -10,9 +10,9 @@ $NetBSD: patch-aa,v 1.4 2006/10/22 01:06:27 rillig Exp $
 -XLIB=-L/usr/X11/lib -lX11
 -
 +XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11
-+INSTALLROOT=$(PREFIX)
-+DATA=$(PREFIX)/share/finalbattle
-+SPRITES=$(PREFIX)/share/finalbattle/sprites
++INSTALLROOT=${DESTDIR}$(PREFIX)
++DATA=${DESTDIR}$(PREFIX)/share/finalbattle
++SPRITES=${DESTDIR}$(PREFIX)/share/finalbattle/sprites
 +DEFS=-DSPRITES=\"$(SPRITES)\" -DDATA=\"$(DATA)\"
 +CFLAGS+= -I$(X11BASE)/include $(DEFS)