diff options
| -rw-r--r-- | lang/gawk/Makefile | 16 | ||||
| -rw-r--r-- | lang/gawk/PLIST | 7 | ||||
| -rw-r--r-- | lang/gawk/distinfo | 16 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-aa | 17 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-ab | 29 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-ac | 10 |
6 files changed, 43 insertions, 52 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 5741f1c7119..5472ff1d232 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2003/08/09 12:30:52 seb Exp $ -# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $ +# $NetBSD: Makefile,v 1.19 2003/10/05 15:49:06 wiz Exp $ +# -DISTNAME= gawk-3.1.1 -PKGREVISION= 1 +DISTNAME= gawk-3.1.3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} @@ -12,14 +11,10 @@ COMMENT= GNU awk CONFLICTS= ja-gawk-[0-9]* -# We need ${GETTEXT_PREFIX}/share/gettext/po/Makefile.in.in. -BUILD_DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext - USE_BUILDLINK2= # defined USE_GMAKE= # defined GNU_CONFIGURE= # defined USE_PKGLOCALEDIR= # defined -EVAL_PREFIX+= GETTEXT_PREFIX=gettext TEST_DIRS= ${WRKSRC} TEST_TARGET= check @@ -34,10 +29,5 @@ BUILD_DEFS+= GAWK_ENABLE_PORTALS CONFIGURE_ARGS+= --enable-portals .endif -pre-configure: - ${RM} -f ${WRKSRC}/po/Makefile.in.in - ${CP} ${GETTEXT_PREFIX}/share/gettext/po/Makefile.in.in \ - ${WRKSRC}/po/Makefile.in.in - .include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST index 77c25bcb9c9..167121df3ec 100644 --- a/lang/gawk/PLIST +++ b/lang/gawk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/07/04 20:57:21 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/10/05 15:49:06 wiz Exp $ bin/gawk bin/${PKGNAME} bin/igawk @@ -10,6 +10,7 @@ libexec/awk/grcat libexec/awk/pwcat man/man1/gawk.1 man/man1/igawk.1 +man/man1/pgawk.1 share/awk/assert.awk share/awk/bits2str.awk share/awk/cliff_rand.awk @@ -27,11 +28,15 @@ share/awk/passwd.awk share/awk/readable.awk share/awk/rewind.awk share/awk/round.awk +share/awk/zerofile.awk +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gawk.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gawk.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gawk.mo @dirrm share/awk diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo index eef5612b280..a1b94bda238 100644 --- a/lang/gawk/distinfo +++ b/lang/gawk/distinfo @@ -1,12 +1,8 @@ -$NetBSD: distinfo,v 1.9 2003/07/04 20:57:22 seb Exp $ +$NetBSD: distinfo,v 1.10 2003/10/05 15:49:06 wiz Exp $ -SHA1 (gawk-3.1.1.tar.gz) = 0cdfff32cebd43519dc6027424b74439d98cc5db -Size (gawk-3.1.1.tar.gz) = 1875134 bytes -SHA1 (patch-aa) = 77dd89bd66daf46946d45e00979058fdcc04f648 -SHA1 (patch-ab) = 2110d61001524f973a59d7a6947c38178674eda8 -SHA1 (patch-ac) = 5bc12ac7dbf7cbd1d5fd70ffde78e42074069468 -SHA1 (patch-ad) = 81ed27305a80da999fa47c3287f6a4a49f189f25 -SHA1 (patch-ae) = 654beb3821050557102dfd6236ae663ee0fe9082 +SHA1 (gawk-3.1.3.tar.gz) = 0900eab07506ecff1ce52756e687a810149bb296 +Size (gawk-3.1.3.tar.gz) = 2078246 bytes +SHA1 (patch-aa) = 24c4ef1d8484554b86d3d1441cd4b945aea0a1e2 +SHA1 (patch-ab) = 2af7895637c0889edfb192e203fee447656a033c +SHA1 (patch-ac) = 2d9cf9fed0630ef3d6642092458af13520530a86 SHA1 (patch-af) = dac29f99def7a70f17aaeb1cb3662ce48008755c -SHA1 (patch-ag) = da832e4c992f7cd97dd30aa450eafac1e98c482a -SHA1 (patch-ah) = 2071627abc6a57eb5ebb866525c642c270681d5b diff --git a/lang/gawk/patches/patch-aa b/lang/gawk/patches/patch-aa index 396ce85f5fe..09cdbf042e9 100644 --- a/lang/gawk/patches/patch-aa +++ b/lang/gawk/patches/patch-aa @@ -1,16 +1,15 @@ -$NetBSD: patch-aa,v 1.4 2002/12/12 03:17:14 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.5 2003/10/05 15:49:06 wiz Exp $ ---- Makefile.am.orig Sun Apr 28 10:27:54 2002 +--- Makefile.am.orig Mon May 19 13:58:24 2003 +++ Makefile.am -@@ -137,10 +137,7 @@ install-exec-hook: - (fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \ +@@ -137,9 +137,7 @@ install-exec-hook: cd $(DESTDIR)$(bindir); \ - $(LN) gawk $$fullname ; \ -- $(LN) pgawk p$$fullname ; \ -- if [ ! -f awk ]; \ -- then $(LN_S) gawk awk; \ + $(LN) gawk $$fullname 2>/dev/null ; \ + $(LN) pgawk p$$fullname 2>/dev/null ; \ +- if [ ! -f awk$(EXEEXT) ]; \ +- then $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \ - fi; exit 0) -+ $(LN) pgawk p$$fullname; exit 0) ++ exit 0) # Undo the above when uninstalling uninstall-links: diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab index e4ced614d50..5b4c26593cf 100644 --- a/lang/gawk/patches/patch-ab +++ b/lang/gawk/patches/patch-ab @@ -1,25 +1,24 @@ -$NetBSD: patch-ab,v 1.7 2003/06/07 16:03:05 jmmv Exp $ +$NetBSD: patch-ab,v 1.8 2003/10/05 15:49:06 wiz Exp $ ---- Makefile.in.orig Mon Apr 29 10:36:46 2002 +--- Makefile.in.orig Fri Jul 4 19:49:07 2003 +++ Makefile.in -@@ -224,7 +224,7 @@ awkdatadir = @datadir@/awk - # stuff for compiling gawk/pgawk - DEFPATH = "\".$(PATH_SEPARATOR)$(awkdatadir)\"" +@@ -78,7 +78,7 @@ CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DATADIRNAME = @DATADIRNAME@ -DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\"" +DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(prefix)/$(PKGLOCALEDIR)/locale\"" - - INCLUDES = -I$(srcdir)/intl - -@@ -760,10 +760,7 @@ install-exec-hook: - (fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \ + DEPDIR = @DEPDIR@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -888,9 +888,7 @@ install-exec-hook: cd $(DESTDIR)$(bindir); \ - $(LN) gawk $$fullname ; \ -- $(LN) pgawk p$$fullname ; \ -- if [ ! -f awk ]; \ -- then $(LN_S) gawk awk; \ + $(LN) gawk $$fullname 2>/dev/null ; \ + $(LN) pgawk p$$fullname 2>/dev/null ; \ +- if [ ! -f awk$(EXEEXT) ]; \ +- then $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \ - fi; exit 0) -+ $(LN) pgawk p$$fullname; exit 0) ++ exit 0) # Undo the above when uninstalling uninstall-links: diff --git a/lang/gawk/patches/patch-ac b/lang/gawk/patches/patch-ac index 40ecee23cfa..7f770f2ddd1 100644 --- a/lang/gawk/patches/patch-ac +++ b/lang/gawk/patches/patch-ac @@ -1,11 +1,13 @@ -$NetBSD: patch-ac,v 1.5 2002/12/12 03:17:14 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.6 2003/10/05 15:49:06 wiz Exp $ ---- awk.h.orig Tue Apr 16 07:40:18 2002 -+++ awk.h Sat Dec 7 21:05:58 2002 -@@ -77,5 +77,5 @@ +--- awk.h.orig Sun Jun 29 14:52:40 2003 ++++ awk.h +@@ -73,7 +73,7 @@ extern int errno; + #ifdef HAVE_SIGNUM_H #include <signum.h> #endif -#if defined(HAVE_MBRLEN) && defined(HAVE_MBRTOWC) && defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H) +#if defined(HAVE_MBRLEN) && defined(HAVE_MBRTOWC) && defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H) && !defined(__NetBSD__) /* We can handle multibyte strings. */ #define MBS_SUPPORT + #include <wchar.h> |