* add user-destdir support

* set LICENSE=gnu-gpl-v2
* some cosmetics fix.

6 files changed, 52 insertions, 28 deletions

diff --git a/lang/ja-gawk/Makefile b/lang/ja-gawk/Makefile
index e74e55096e4..f7cf0211187 100644
--- a/lang/ja-gawk/Makefile
+++ b/lang/ja-gawk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/06/09 16:14:17 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/20 08:14:44 obache Exp $
 
 DISTNAME=	gawk-3.0.6
-PKGNAME=	ja-gawk-3.0.6
+PKGNAME=	ja-${DISTNAME}
 CATEGORIES=	japanese lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 
@@ -12,17 +12,21 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gawk/gawk.html
 COMMENT=	GNU awk + multi-byte extension
+LICENSE=	gnu-gpl-v2
 
 CONFLICTS=	gawk-[0-9]*
 
-INFO_FILES=	# PLIST
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INFO_FILES=	yes
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	yacc
 
+INSTALLATION_DIRS+=	share/doc/ja-gawk
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-gawk
-	${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-gawk
-	${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-gawk
+	${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${DESTDIR}${PREFIX}/share/doc/ja-gawk
+	${INSTALL_DATA} ${WRKSRC}/README.MB ${DESTDIR}${PREFIX}/share/doc/ja-gawk
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ja-gawk/distinfo b/lang/ja-gawk/distinfo
index 541d2c87c6b..e6a7d6acda9 100644
--- a/lang/ja-gawk/distinfo
+++ b/lang/ja-gawk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/03/11 13:04:07 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/02/20 08:14:44 obache Exp $
 
 SHA1 (gawk-3.0.6.tar.gz) = 01543b1832a604ebd1510b39b4bd44be0aea0c62
 RMD160 (gawk-3.0.6.tar.gz) = 67f52f9a2a1c168c5480c66df7b955adc9907329
@@ -6,7 +6,7 @@ Size (gawk-3.0.6.tar.gz) = 1047328 bytes
 SHA1 (gawkmb115.diff.gz) = ba4637157766440f097b6252c1f127a8b7e26591
 RMD160 (gawkmb115.diff.gz) = 1a9c337e2ef7f5f0e4dc6705941bef1870b434d5
 Size (gawkmb115.diff.gz) = 86858 bytes
-SHA1 (patch-aa) = b9132f65b5cfbb26b3278585f7edeefca0537169
-SHA1 (patch-ab) = a9afa0d46b6412f5a77e578a6b1eeb66fe2af50c
-SHA1 (patch-ac) = 22e49c3d295e8f5f8217f35b12cbb0120c11c13c
-SHA1 (patch-ad) = d604f0af916307fc6f1e7f647cbcae0b6cdcfec9
+SHA1 (patch-aa) = 0e67b1f5b426532c24d03673dd64a7bd82dce311
+SHA1 (patch-ab) = c888364b061b9ef85033e170805e9357a07c0a4c
+SHA1 (patch-ac) = e26be5eebbfe7c18d1cf7e6b27e06190e9cea8a2
+SHA1 (patch-ad) = e95d23a4a39160d9eebba975ab54c8398e884458
diff --git a/lang/ja-gawk/patches/patch-aa b/lang/ja-gawk/patches/patch-aa
index 01f7c98176e..f7ab283d1ca 100644
--- a/lang/ja-gawk/patches/patch-aa
+++ b/lang/ja-gawk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2006/03/11 13:04:07 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2010/02/20 08:14:44 obache Exp $
 
---- Makefile.in.orig	2005-10-23 20:59:29.000000000 +0900
+--- Makefile.in.orig	2010-02-20 07:58:13.000000000 +0000
 +++ Makefile.in
 @@ -46,7 +46,7 @@ LN_S = @LN_S@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2006/03/11 13:04:07 wiz Exp $
  manprefix =
  
  bindir = @bindir@
-@@ -194,14 +194,8 @@ alloca.o:	alloca.c
+@@ -194,31 +194,20 @@ alloca.o:	alloca.c
  mbc.o: Makefile
  
  install:	gawk info installdirs
@@ -24,11 +24,17 @@ $NetBSD: patch-aa,v 1.2 2006/03/11 13:04:07 wiz Exp $
 -	then	$(LN_S) gawk awk; \
 -	fi; exit 0)
 +	$(INSTALL_PROGRAM) gawk$(exec_suffix) \
-+		$(bindir)/$(binprefix)gawk$(exec_suffix)
++		$(DESTDIR)$(bindir)/$(binprefix)gawk$(exec_suffix)
  	cd doc && $(MAKE) install
  	cd awklib && $(MAKE) install
  
-@@ -213,12 +207,7 @@ install-strip:
+ installdirs: mkinstalldirs
+-	$(srcdir)/mkinstalldirs $(bindir) $(datadir) \
+-		$(libdir) $(infodir) $(mandir) $(libexecdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
++		$(DESTDIR)$(libdir) $(DESTDIR)$(infodir) $(DESTDIR)$(mandir) $(DESTDIR)$(libexecdir)
+ 
+ install-strip:
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
  
  uninstall:
diff --git a/lang/ja-gawk/patches/patch-ab b/lang/ja-gawk/patches/patch-ab
index 62bd7a04123..04879933ab2 100644
--- a/lang/ja-gawk/patches/patch-ab
+++ b/lang/ja-gawk/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2006/03/11 13:04:07 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2010/02/20 08:14:44 obache Exp $
 
---- awklib/Makefile.in.orig	2005-10-23 20:59:29.000000000 +0900
+--- awklib/Makefile.in.orig	2010-02-20 07:58:14.000000000 +0000
 +++ awklib/Makefile.in
 @@ -33,7 +33,7 @@ CFLAGS = @CFLAGS@
  
@@ -11,16 +11,22 @@ $NetBSD: patch-ab,v 1.2 2006/03/11 13:04:07 wiz Exp $
  manprefix =
  
  bindir = @bindir@
-@@ -74,7 +74,7 @@ group.awk: $(srcdir)/eg/lib/groupawk.in
+@@ -74,19 +74,19 @@ group.awk: $(srcdir)/eg/lib/groupawk.in
  	sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
  
  install: igawk $(AUXPROGS) $(AUXAWK)
 -	$(INSTALL_PROGRAM) igawk $(bindir)/igawk
-+	$(INSTALL_PROGRAM:-s=) igawk $(bindir)/$(binprefix)igawk
++	$(INSTALL_PROGRAM:-s=) igawk $(DESTDIR)$(bindir)/$(binprefix)igawk
  	for i in $(AUXPROGS) ; do \
- 		$(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
+-		$(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
++		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(libexecdir)/$$i ; \
  	done
-@@ -86,7 +86,7 @@ install: igawk $(AUXPROGS) $(AUXAWK)
+ 	for i in $(AUXAWK) $(srcdir)/eg/lib/*.awk ; do \
+ 		progname=`echo $$i | sed 's;.*/;;'` ; \
+-		$(INSTALL_DATA) $$i $(datadir)/$$progname ; \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/$$progname ; \
+ 	done
+ 
  # libexecdir and datadir are removed in the top level Makefile's uninstall
  uninstall:
  	rm -fr $(libexecdir)/* $(datadir)/*
diff --git a/lang/ja-gawk/patches/patch-ac b/lang/ja-gawk/patches/patch-ac
index b12050ffed1..07b130ab759 100644
--- a/lang/ja-gawk/patches/patch-ac
+++ b/lang/ja-gawk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/03/11 13:04:07 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2010/02/20 08:14:44 obache Exp $
 
---- doc/Makefile.in.orig	2000-06-07 17:48:18.000000000 +0900
+--- doc/Makefile.in.orig	2000-06-07 08:48:18.000000000 +0000
 +++ doc/Makefile.in
-@@ -31,7 +31,7 @@ INSTALL_DATA = @INSTALL_DATA@
+@@ -31,13 +31,13 @@ INSTALL_DATA = @INSTALL_DATA@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  binprefix =
@@ -11,6 +11,14 @@ $NetBSD: patch-ac,v 1.3 2006/03/11 13:04:07 wiz Exp $
  
  bindir = @bindir@
  libdir = @libdir@
+-mandir = @mandir@/man1
++mandir = $(DESTDIR)@mandir@/man1
+ manext = .1
+-infodir = @infodir@
++infodir = $(DESTDIR)@infodir@
+ datadir = @datadir@/awk
+ 
+ TEXI2DVI = texi2dvi
 @@ -80,18 +80,15 @@ $(infodir)/gawk.info::
  		exit 0; \
  	fi; \
diff --git a/lang/ja-gawk/patches/patch-ad b/lang/ja-gawk/patches/patch-ad
index cc46171cdc5..acd4bbf1845 100644
--- a/lang/ja-gawk/patches/patch-ad
+++ b/lang/ja-gawk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/01/13 21:51:06 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2010/02/20 08:14:44 obache Exp $
 
---- io.c.orig	2006-01-13 21:48:53.000000000 +0000
+--- io.c.orig	2010-02-20 07:58:14.000000000 +0000
 +++ io.c
-@@ -1055,7 +1055,6 @@ int interesting;	/* pid of interest, if 
+@@ -1072,7 +1072,6 @@ int interesting;	/* pid of interest, if 
  	int pid;
  	int status = 0;
  	struct redirect *redp;