diff options
| -rw-r--r-- | lang/gawk/Makefile | 16 | ||||
| -rw-r--r-- | lang/gawk/PLIST | 6 | ||||
| -rw-r--r-- | lang/gawk/distinfo | 10 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-aa | 15 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-ab | 16 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-ac | 13 |
6 files changed, 29 insertions, 47 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 2dc7f85afc1..e024c43c5b7 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2004/04/25 07:15:51 snj Exp $ +# $NetBSD: Makefile,v 1.23 2004/08/26 00:00:20 wiz Exp $ # -DISTNAME= gawk-3.1.3 +DISTNAME= gawk-3.1.4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} EXTRACT_SUFX= .tar.bz2 @@ -24,8 +24,16 @@ MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= GAWK_ENABLE_PORTALS -.if ${GAWK_ENABLE_PORTALS} == "YES" +.if !empty(GAWK_ENABLE_PORTALS:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= portals +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.gawk +PKG_SUPPORTED_OPTIONS= portals + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mportals) CONFIGURE_ARGS+= --enable-portals .endif diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST index fa2408972fc..97229404d69 100644 --- a/lang/gawk/PLIST +++ b/lang/gawk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/02/22 15:21:16 seb Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/08/26 00:00:20 wiz Exp $ bin/gawk bin/${PKGNAME} bin/igawk @@ -26,6 +26,7 @@ share/awk/passwd.awk share/awk/readable.awk share/awk/rewind.awk share/awk/round.awk +share/awk/strtonum.awk share/awk/zerofile.awk ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gawk.mo @@ -34,7 +35,10 @@ ${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/ja/LC_MESSAGES/gawk.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gawk.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gawk.mo +${PKGLOCALEDIR}/locale/ro/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 13d065331f5..7d03229af12 100644 --- a/lang/gawk/distinfo +++ b/lang/gawk/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.11 2003/10/06 06:57:40 wiz Exp $ +$NetBSD: distinfo,v 1.12 2004/08/26 00:00:20 wiz Exp $ -SHA1 (gawk-3.1.3.tar.bz2) = 5adeb48ff9a1aaaef91feece8cf27140b2740183 -Size (gawk-3.1.3.tar.bz2) = 1634022 bytes -SHA1 (patch-aa) = 24c4ef1d8484554b86d3d1441cd4b945aea0a1e2 -SHA1 (patch-ab) = 2af7895637c0889edfb192e203fee447656a033c -SHA1 (patch-ac) = 2d9cf9fed0630ef3d6642092458af13520530a86 +SHA1 (gawk-3.1.4.tar.bz2) = ba50753eca7518d5a13fa9a1e1333562cd8477ca +Size (gawk-3.1.4.tar.bz2) = 1732494 bytes +SHA1 (patch-ab) = c0ffd2cc29104e5fefb123a353388d991dc62635 SHA1 (patch-af) = dac29f99def7a70f17aaeb1cb3662ce48008755c diff --git a/lang/gawk/patches/patch-aa b/lang/gawk/patches/patch-aa deleted file mode 100644 index 09cdbf042e9..00000000000 --- a/lang/gawk/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2003/10/05 15:49:06 wiz Exp $ - ---- Makefile.am.orig Mon May 19 13:58:24 2003 -+++ Makefile.am -@@ -137,9 +137,7 @@ install-exec-hook: - cd $(DESTDIR)$(bindir); \ - $(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) -+ exit 0) - - # Undo the above when uninstalling - uninstall-links: diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab index 5b4c26593cf..40cac757947 100644 --- a/lang/gawk/patches/patch-ab +++ b/lang/gawk/patches/patch-ab @@ -1,20 +1,20 @@ -$NetBSD: patch-ab,v 1.8 2003/10/05 15:49:06 wiz Exp $ +$NetBSD: patch-ab,v 1.9 2004/08/26 00:00:20 wiz Exp $ ---- Makefile.in.orig Fri Jul 4 19:49:07 2003 +--- Makefile.in.orig 2004-08-02 11:16:30.000000000 +0200 +++ Makefile.in -@@ -78,7 +78,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -176,7 +176,7 @@ CPP = @CPP@ + 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\"" DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ -@@ -888,9 +888,7 @@ install-exec-hook: - cd $(DESTDIR)$(bindir); \ - $(LN) gawk $$fullname 2>/dev/null ; \ - $(LN) pgawk p$$fullname 2>/dev/null ; \ +@@ -955,9 +955,7 @@ install-exec-hook: + (cd $(DESTDIR)$(bindir); \ + $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ + $(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ - if [ ! -f awk$(EXEEXT) ]; \ - then $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \ - fi; exit 0) diff --git a/lang/gawk/patches/patch-ac b/lang/gawk/patches/patch-ac deleted file mode 100644 index 7f770f2ddd1..00000000000 --- a/lang/gawk/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2003/10/05 15:49:06 wiz Exp $ - ---- 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> |