Added support for installation to DESTDIR.

3 files changed, 66 insertions, 11 deletions

diff --git a/games/netmaj/Makefile b/games/netmaj/Makefile
index c6f69d03ab4..3542da93b27 100644
--- a/games/netmaj/Makefile
+++ b/games/netmaj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/09/02 11:45:06 kei Exp $
+# $NetBSD: Makefile,v 1.13 2008/02/02 21:04:00 heinz Exp $
 #
 
 DISTNAME=		netmaj-2.0.7
@@ -10,6 +10,8 @@ MAINTAINER=		kei@NetBSD.org
 HOMEPAGE=		http://www.sfc.wide.ad.jp/~kusune/netmaj/
 COMMENT=		Mahjongg game with network and 1-4 player(s) support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/netmaj
 USE_TOOLS+=		perl:run
 
@@ -21,7 +23,7 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
 
 post-install:
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/html/* ${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/html/* ${DESTDIR}${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/netmaj/distinfo b/games/netmaj/distinfo
index 76812c4a6d5..7e536bac254 100644
--- a/games/netmaj/distinfo
+++ b/games/netmaj/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2007/09/02 11:45:06 kei Exp $
+$NetBSD: distinfo,v 1.6 2008/02/02 21:04:00 heinz Exp $
 
 SHA1 (netmaj-2.0.7.tar.gz) = 1363ea8ca42079fb444b25c605d264b5f083e260
 RMD160 (netmaj-2.0.7.tar.gz) = 9d3fd68b7607b2c3064e9dd8310085818f32f93e
 Size (netmaj-2.0.7.tar.gz) = 213819 bytes
-SHA1 (patch-aa) = 6dcb7829bfb7324725c57e0c0d5bcd73c12fae78
+SHA1 (patch-aa) = acc59856901a04b5236a29d482d0a2b5590b1308
 SHA1 (patch-ab) = 3b58d9456459334df45fda4d1eed5d360e1d3c49
 SHA1 (patch-ac) = 0d5a611ce922c4e3c837f70f1a895d7c72f5535f
 SHA1 (patch-ad) = 0b0c286ea94a52181305bbb1489bc842bb7586bf
diff --git a/games/netmaj/patches/patch-aa b/games/netmaj/patches/patch-aa
index aa71957cec3..24fc90c8d31 100644
--- a/games/netmaj/patches/patch-aa
+++ b/games/netmaj/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/09/02 11:45:06 kei Exp $
+$NetBSD: patch-aa,v 1.4 2008/02/02 21:04:00 heinz Exp $
 
---- Makefile.orig	1996-11-11 23:43:22.000000000 +0900
-+++ Makefile	2007-07-17 14:08:03.000000000 +0900
-@@ -25,29 +25,33 @@
+--- Makefile.orig	1996-11-11 15:43:22.000000000 +0100
++++ Makefile
+@@ -25,29 +25,33 @@ REVISION=0
  INTERNAL_REVISION=7
  ARCFILE=netmaj-$(VERSION).$(REVISION).$(INTERNAL_REVISION).tar.gz
  
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.3 2007/09/02 11:45:06 kei Exp $
  
  # for nec ews
  ##CC=/usr/abiccs/bin/cc -ZXNd=5000
-@@ -60,13 +64,15 @@
+@@ -60,13 +64,15 @@ LDFLAGS =  -Llib 
  #LDFLAGS =  -Llib 
  
  # for Solaris
@@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.3 2007/09/02 11:45:06 kei Exp $
  
  # for nec ews (SVR2)
  #CC=cc
-@@ -163,9 +169,9 @@
+@@ -163,9 +169,9 @@ libs:
  x:
  	-if test -d xui; then \
  	(cd xui; make CC="$(CC)" OS_CFLAGS="$(OS_CFLAGS)" \
@@ -81,3 +81,56 @@ $NetBSD: patch-aa,v 1.3 2007/09/02 11:45:06 kei Exp $
  
  
  netmaj: netmaj.in Makefile
+@@ -179,35 +185,35 @@ player_info: player_info.in Makefile
+ 	chmod 755 player_info
+ 
+ install: netmaj player_info
+-	-if test ! -d ${BINDIR}; then \
+-		mkdir ${BINDIR}; fi
+-	-if test ! -d ${LIBDIR}; then \
+-		mkdir ${LIBDIR}; fi
++	-if test ! -d ${DESTDIR}${BINDIR}; then \
++		mkdir ${DESTDIR}${BINDIR}; fi
++	-if test ! -d ${DESTDIR}${LIBDIR}; then \
++		mkdir ${DESTDIR}${LIBDIR}; fi
+ 	-./server_kill
+-	cp server client auto server_kill player_info $(LIBDIR)
+-	cp proxyserver inputserver proxyclient $(LIBDIR)
+-	cp netmaj.hlp $(LIBDIR)
+-	cp netmaj netmaj1 plview $(BINDIR)
++	cp server client auto server_kill player_info $(DESTDIR)$(LIBDIR)
++	cp proxyserver inputserver proxyclient $(DESTDIR)$(LIBDIR)
++	cp netmaj.hlp $(DESTDIR)$(LIBDIR)
++	cp netmaj netmaj1 plview $(DESTDIR)$(BINDIR)
+ 	-if test -d xui; then \
+ 	(cd xui; make install CC="$(CC)" OS_CFLAGS="$(OS_CFLAGS)" \
+ 	RANLIB="$(RANLIB)" LIBS="$(LIBS)" LIBDIR="$(LIBDIR)" \
+-	BINDIR="$(BINDIR)" \
++	BINDIR="$(BINDIR)" DESTDIR="$(DESTDIR)" \
+ 	); fi
+ 
+ install-remote: netmaj server server_kill auto proxyclient
+-	-if test ! -d ${BINDIR}; then \
+-		mkdir ${BINDIR}; fi
+-	-if test ! -d ${LIBDIR}; then \
+-		mkdir ${LIBDIR}; fi
+-	cp server auto server_kill proxyclient $(LIBDIR)
+-	cp netmaj $(BINDIR)
++	-if test ! -d ${DESTDIR}${BINDIR}; then \
++		mkdir ${DESTDIR}${BINDIR}; fi
++	-if test ! -d ${DESTDIR}${LIBDIR}; then \
++		mkdir ${DESTDIR}${LIBDIR}; fi
++	cp server auto server_kill proxyclient $(DESTDIR)$(LIBDIR)
++	cp netmaj $(DESTDIR)$(BINDIR)
+ 
+ install-pf:
+-	cp *.pf $(LIBDIR)
++	cp *.pf $(DESTDIR)$(LIBDIR)
+ 	-if test -d xui; then \
+ 	(cd xui; make install-pf CC="$(CC)" OS_CFLAGS="$(OS_CFLAGS)" \
+ 	RANLIB="$(RANLIB)" LIBS="$(LIBS)" LIBDIR="$(LIBDIR)" \
+-	BINDIR="$(BINDIR)" \
++	BINDIR="$(BINDIR)" DESTDIR="$(DESTDIR)" \
+ 	); fi
+ 
+ clean: