diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2008-05-14 06:22:46 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2008-05-14 06:22:46 +0000 |
commit | 63177ec9dfd966c14aaec75e5be7f40ffb7415f5 (patch) | |
tree | 9ec9d94246b0371725a320cb4172b3ad49031f31 /lang/gawk | |
parent | Update to 1.8 (diff) |
Update to 3.1.6
Notes
Notes:
svn path=/head/; revision=213016
Diffstat (limited to 'lang/gawk')
-rw-r--r-- | lang/gawk/Makefile | 3 | ||||
-rw-r--r-- | lang/gawk/distinfo | 6 | ||||
-rw-r--r-- | lang/gawk/files/patch-hard-locale.h | 22 | ||||
-rw-r--r-- | lang/gawk/files/patch-io.c | 29 | ||||
-rw-r--r-- | lang/gawk/pkg-plist | 1 |
5 files changed, 5 insertions, 56 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index d0776fe8644d..b444d0cb7c75 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= gawk -PORTVERSION= 3.1.5 -PORTREVISION= 1 +PORTVERSION= 3.1.6 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gawk diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo index 3f4abadc5dc5..e664890237ff 100644 --- a/lang/gawk/distinfo +++ b/lang/gawk/distinfo @@ -1,3 +1,3 @@ -MD5 (gawk-3.1.5.tar.gz) = 4760325489479cac17fe0114b8f62f30 -SHA256 (gawk-3.1.5.tar.gz) = 463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8 -SIZE (gawk-3.1.5.tar.gz) = 2310919 +MD5 (gawk-3.1.6.tar.gz) = b237751aef53c9ead9644e376bc53386 +SHA256 (gawk-3.1.6.tar.gz) = 06dd872da7145088ae08475f7b11e5b9e810b8ead7d78d039003e671bb76ec65 +SIZE (gawk-3.1.6.tar.gz) = 2488684 diff --git a/lang/gawk/files/patch-hard-locale.h b/lang/gawk/files/patch-hard-locale.h deleted file mode 100644 index 7da22744c3cc..000000000000 --- a/lang/gawk/files/patch-hard-locale.h +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- hard-locale.h.orig -+++ hard-locale.h -@@ -22,6 +22,8 @@ - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - - -+static ptr_t xmalloc PARAMS ((size_t n)); -+ - /* Return nonzero if the current CATEGORY locale is hard, i.e. if you - can't get away with assuming traditional C or POSIX behavior. */ - static int -@@ -40,7 +42,6 @@ - if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) - hard = 0; - # else -- static ptr_t xmalloc PARAMS ((size_t n)); - - char *locale = xmalloc (strlen (p) + 1); - strcpy (locale, p); diff --git a/lang/gawk/files/patch-io.c b/lang/gawk/files/patch-io.c deleted file mode 100644 index 9d8f06f8c2fc..000000000000 --- a/lang/gawk/files/patch-io.c +++ /dev/null @@ -1,29 +0,0 @@ - -$FreeBSD$ - ---- io.c.orig -+++ io.c -@@ -2480,9 +2480,12 @@ - { - struct stat sbuf; - struct open_hook *oh; -+ int iop_malloced = FALSE; - -- if (iop == NULL) -+ if (iop == NULL) { - emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc"); -+ iop_malloced = TRUE; -+ } - memset(iop, '\0', sizeof(IOBUF)); - iop->flag = 0; - iop->fd = fd; -@@ -2495,7 +2498,8 @@ - } - - if (iop->fd == INVALID_HANDLE) { -- free(iop); -+ if (iop_malloced) -+ free(iop); - return NULL; - } - if (isatty(iop->fd)) diff --git a/lang/gawk/pkg-plist b/lang/gawk/pkg-plist index 57c7ec0eaad0..bc0fffe58da1 100644 --- a/lang/gawk/pkg-plist +++ b/lang/gawk/pkg-plist @@ -41,6 +41,7 @@ share/awk/zerofile.awk %%NLS%%share/locale/sv/LC_MESSAGES/gawk.mo %%NLS%%share/locale/tr/LC_MESSAGES/gawk.mo %%NLS%%share/locale/vi/LC_MESSAGES/gawk.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/gawk.mo @dirrm share/awk @dirrm libexec/awk @dirrmtry share/locale/rw/LC_MESSAGES |