DESTDIR support; partly from pkg/40304

3 files changed, 32 insertions, 20 deletions

diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index c263307ba69..46fd5d9a274 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/10/07 15:38:03 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2009/11/15 01:29:33 dholland Exp $
 
 DISTNAME=		xgalaga-2.0.34
 PKGREVISION=		4
@@ -8,6 +8,8 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Very fast true-to-the-original port of galaga for X11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_SRC_ON_FTP=		"already in MASTER_SITE_LOCAL"
 
 GNU_CONFIGURE=		YES
@@ -27,7 +29,7 @@ CONFIGURE_ARGS+=	--x-libraries=${PREFIX}/lib
 INSTALLATION_DIRS=	libexec
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/xgalaga/README
+	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/xgalaga/README
 
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/games/xgalaga/distinfo b/games/xgalaga/distinfo
index bcfcb78f35a..d684d12b363 100644
--- a/games/xgalaga/distinfo
+++ b/games/xgalaga/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2009/01/03 12:37:08 obache Exp $
+$NetBSD: distinfo,v 1.12 2009/11/15 01:29:33 dholland Exp $
 
 SHA1 (xgalaga-2.0.34.tar.gz) = 82dcb328af0d9e779c566f4225d7f072b1c17b7d
 RMD160 (xgalaga-2.0.34.tar.gz) = bf2cc91820c1cdb8e02bd35347b309cac27b3ba4
 Size (xgalaga-2.0.34.tar.gz) = 314189 bytes
-SHA1 (patch-aa) = 5857b8641701bc34a97fbca31411478c0c47501a
+SHA1 (patch-aa) = 63dc49d79e33ba4eaf596e600cdfaa1d00d70bce
 SHA1 (patch-ab) = 97bd43c07f76278245730bbc9724497ab87e552d
 SHA1 (patch-ac) = ca85bafaa637fc03d1c53a527c7804a95c146fe3
 SHA1 (patch-ad) = 22b946b261c4d0969e48bf5de1ba0d55c3649bb8
diff --git a/games/xgalaga/patches/patch-aa b/games/xgalaga/patches/patch-aa
index de93951fff4..9c3bb2197fd 100644
--- a/games/xgalaga/patches/patch-aa
+++ b/games/xgalaga/patches/patch-aa
@@ -1,7 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2006/01/13 02:02:50 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2009/11/15 01:29:34 dholland Exp $
 
---- Makefile.in.orig	1998-05-11 06:52:59.000000000 +0000
-+++ Makefile.in
+Patch installation paths. DESTDIR support.
+
+--- Makefile.in.orig	1998-05-11 02:52:59.000000000 -0400
++++ Makefile.in	2009-11-14 20:26:16.000000000 -0500
 @@ -20,12 +20,12 @@ SOUNDSRV = @SOUNDSERVER@
  SOUNDOBJS = @SOUNDSERVER@.o
  SOUNDSRCS = @SOUNDSERVER@.c
@@ -25,21 +27,29 @@ $NetBSD: patch-aa,v 1.6 2006/01/13 02:02:50 joerg Exp $
 +	$(CC) $(LDFLAGS) -o $(SOUNDSRV) $(SOUNDOBJS) $(SOUNDLIBS) $(LIBOSSAUDIO)
  
  install: all
- 	./mkinstalldirs $(bindir)
- 	./mkinstalldirs $(prefix)
- 	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
+-	./mkinstalldirs $(bindir)
+-	./mkinstalldirs $(prefix)
+-	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
 -	$(INSTALL) $(SOUNDSRV) $(prefix)/$(SOUNDSRV)
-+	$(INSTALL) $(SOUNDSRV) ${PREFIX}/libexec/xgalaga.sndsrv
- 	./mkinstalldirs $(prefix)/sounds
- 	./mkinstalldirs $(prefix)/levels
- 	for i in levels/*.xgl; do $(INSTALL) $$i $(prefix)/$$i ; done
- 	for i in sounds/*.raw; do $(INSTALL) $$i $(prefix)/$$i ; done
- 	touch $(prefix)/scores
+-	./mkinstalldirs $(prefix)/sounds
+-	./mkinstalldirs $(prefix)/levels
+-	for i in levels/*.xgl; do $(INSTALL) $$i $(prefix)/$$i ; done
+-	for i in sounds/*.raw; do $(INSTALL) $$i $(prefix)/$$i ; done
+-	touch $(prefix)/scores
 -	chmod 666 $(prefix)/scores
-+	chown ${GAMEOWN}:${GAMEGRP} $(prefix)/scores
-+	chown ${GAMEOWN}:${GAMEGRP} $(bindir)/$(TARGET)
-+	chmod ${GAMEMODE} $(bindir)/$(TARGET)
-+	chmod ${GAMEDATAMODE} $(prefix)/scores
++	./mkinstalldirs $(DESTDIR)$(bindir)
++	./mkinstalldirs $(DESTDIR)$(prefix)
++	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
++	$(INSTALL) $(SOUNDSRV) $(DESTDIR)${PREFIX}/libexec/xgalaga.sndsrv
++	./mkinstalldirs $(DESTDIR)$(prefix)/sounds
++	./mkinstalldirs $(DESTDIR)$(prefix)/levels
++	for i in levels/*.xgl; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
++	for i in sounds/*.raw; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
++	touch $(DESTDIR)$(prefix)/scores
++	chown ${GAMEOWN}:${GAMEGRP} $(DESTDIR)$(prefix)/scores
++	chown ${GAMEOWN}:${GAMEGRP} $(DESTDIR)$(bindir)/$(TARGET)
++	chmod ${GAMEMODE} $(DESTDIR)$(bindir)/$(TARGET)
++	chmod ${GAMEDATAMODE} $(DESTDIR)$(prefix)/scores
  
  subdirs:
  	for i in $(SUBDIRS); do cd $$i ; make ; done