diff options
| author | wiz <wiz@pkgsrc.org> | 2007-07-22 06:34:41 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-07-22 06:34:41 +0000 |
| commit | cbb36f9898dd151ab01d993cbf98373c57ae08dc (patch) | |
| tree | 0ea291d8bd4b1f3dbf7bea9a7a6c94b673bc0b96 /devel | |
| parent | 843c700659c7bf38a11acfc37a3ab496170583bf (diff) | |
| download | pkgsrc-cbb36f9898dd151ab01d993cbf98373c57ae08dc.tar.gz | |
Update to 1.4.10nb1. Like previous update to 1.4.10, but includes
a patch from Eric Blake that fixes the problem that appeared e.g.
in dosbox or mng.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/m4/Makefile | 7 | ||||
| -rw-r--r-- | devel/m4/distinfo | 10 | ||||
| -rw-r--r-- | devel/m4/patches/patch-aa | 32 |
3 files changed, 24 insertions, 25 deletions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile index cbe892d7dd8..04855a46894 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2007/07/20 22:52:44 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2007/07/22 06:34:41 wiz Exp $ -DISTNAME= m4-1.4.9 +DISTNAME= m4-1.4.10 PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=m4/} @@ -13,7 +13,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes -INFO_FILES= # PLIST +INFO_FILES= yes +#LICENSE= GPLv3 TEST_TARGET= check diff --git a/devel/m4/distinfo b/devel/m4/distinfo index 2a6a1ca058f..2f9872f9dac 100644 --- a/devel/m4/distinfo +++ b/devel/m4/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2007/07/20 22:52:44 wiz Exp $ +$NetBSD: distinfo,v 1.19 2007/07/22 06:34:41 wiz Exp $ -SHA1 (m4-1.4.9.tar.gz) = 15ad35c65d4c4f2f856687288e7f6b51704d65e1 -RMD160 (m4-1.4.9.tar.gz) = 5833efd8aaec3f60cff9997ca7cf15cc7a7ea3c1 -Size (m4-1.4.9.tar.gz) = 770647 bytes -SHA1 (patch-aa) = 2cc5688669b1dc5b5ab7ddc46a1912100ea147a4 +SHA1 (m4-1.4.10.tar.gz) = 26d47c893722d683308f5d9fc172a11d5b2ad8a9 +RMD160 (m4-1.4.10.tar.gz) = 0a26a714ce9691006524da7c2c3e2859e7321a95 +Size (m4-1.4.10.tar.gz) = 928375 bytes +SHA1 (patch-aa) = 426327aabb1f48647b3561439dba0261a49860f3 diff --git a/devel/m4/patches/patch-aa b/devel/m4/patches/patch-aa index 3981b0f550c..9467cee1150 100644 --- a/devel/m4/patches/patch-aa +++ b/devel/m4/patches/patch-aa @@ -1,20 +1,18 @@ -$NetBSD: patch-aa,v 1.6 2007/07/20 22:52:44 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2007/07/22 06:34:41 wiz Exp $ -avoid the following incorrect behaviour. +From Eric Blake -- will be in m4-1.4.11. -% echo "eval(-2/2)" | gm4 - -2147483647 - -has been reported on bug-m4@gnu.org - ---- src/eval.c.orig 2007-01-09 16:12:43.000000000 +0000 -+++ src/eval.c -@@ -721,7 +721,7 @@ mult_term (eval_token et, int32_t *v1) - /* Avoid the x86 SIGFPE on INT_MIN / -1. */ - *v1 = (int32_t) -(uint32_t) *v1; - else -- *v1 = (int32_t) ((uint32_t) *v1 / (uint32_t) v2); -+ *v1 = *v1 / v2; - break; +--- src/output.c.orig 2007-07-05 03:56:06.000000000 +0000 ++++ src/output.c +@@ -252,6 +252,11 @@ m4_tmpopen (int divnum) + else if (set_cloexec_flag (fileno (file), true) != 0) + M4ERROR ((warning_status, errno, + "Warning: cannot protect diversion across forks")); ++ /* POSIX states that it is undefined whether an append stream starts ++ at offset 0 or at the end. We want the beginning. */ ++ else if (fseeko (file, 0, SEEK_SET) != 0) ++ M4ERROR ((EXIT_FAILURE, errno, ++ "cannot seek to beginning of diversion")); + return file; + } - case MODULO: |