From d59c333b4ca4d8a3bed0926a76f4e2c353d09b5e Mon Sep 17 00:00:00 2001 From: Johan van Selst Date: Sun, 5 Sep 2010 22:23:53 +0000 Subject: [PATCH] - Update to GNU m4 1.4.15 - Remove local patch that's now included upstream PR: ports/150270 Tested by: exp-run by pav --- devel/m4/Makefile | 3 +- devel/m4/distinfo | 6 ++-- devel/m4/files/patch-lib_spawn.in.h | 50 ----------------------------- 3 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 devel/m4/files/patch-lib_spawn.in.h diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 6dddf4e92a28..6a1695f01d79 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -6,8 +6,7 @@ # PORTNAME= m4 -PORTVERSION= 1.4.14 -PORTREVISION= 1 +PORTVERSION= 1.4.15 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} diff --git a/devel/m4/distinfo b/devel/m4/distinfo index 9998d796d596..3638d621b506 100644 --- a/devel/m4/distinfo +++ b/devel/m4/distinfo @@ -1,3 +1,3 @@ -MD5 (m4-1.4.14.tar.bz2) = e6fb7d08d50d87e796069cff12a52a93 -SHA256 (m4-1.4.14.tar.bz2) = 0885ffa93256353a96b1cf0bcbc4d639ed09953b687e6cc412c4048e656f4dd2 -SIZE (m4-1.4.14.tar.bz2) = 1125670 +MD5 (m4-1.4.15.tar.bz2) = c7c32540bc3842d5550f88d47ef551d8 +SHA256 (m4-1.4.15.tar.bz2) = 0aafea5cb30f9304a73535c4ef473e6657a8fcfc0ccb2d0ae4861a4824d4fff9 +SIZE (m4-1.4.15.tar.bz2) = 1201245 diff --git a/devel/m4/files/patch-lib_spawn.in.h b/devel/m4/files/patch-lib_spawn.in.h deleted file mode 100644 index 2e683dcb2a77..000000000000 --- a/devel/m4/files/patch-lib_spawn.in.h +++ /dev/null @@ -1,50 +0,0 @@ -2010-03-02 Bruno Haible - - spawn: Don't override the system defined values on FreeBSD 8. - * lib/spawn.in.h (POSIX_SPAWN_RESETIDS, POSIX_SPAWN_SETPGROUP, - POSIX_SPAWN_SETSIGDEF, POSIX_SPAWN_SETSIGMASK, - POSIX_SPAWN_SETSCHEDPARAM, POSIX_SPAWN_SETSCHEDULER): Don't redefine - if HAVE_POSIX_SPAWN is 1. - Reported by Johan van Selst via Eric Blake. - -*** lib/spawn.in.h.orig Tue Mar 2 11:53:02 2010 ---- lib/spawn.in.h Tue Mar 2 11:48:54 2010 -*************** -*** 110,126 **** - - - /* Flags to be set in the `posix_spawnattr_t'. */ -! #if @REPLACE_POSIX_SPAWN@ - /* Use the values from the system, for better compatibility. */ - /* But this implementation does not support AIX extensions. */ -! # undef POSIX_SPAWN_FORK_HANDLERS -! #else -! # define POSIX_SPAWN_RESETIDS 0x01 -! # define POSIX_SPAWN_SETPGROUP 0x02 -! # define POSIX_SPAWN_SETSIGDEF 0x04 -! # define POSIX_SPAWN_SETSIGMASK 0x08 -! # define POSIX_SPAWN_SETSCHEDPARAM 0x10 -! # define POSIX_SPAWN_SETSCHEDULER 0x20 - #endif - /* A GNU extension. Use the next free bit position. */ - #define POSIX_SPAWN_USEVFORK \ ---- 110,128 ---- - - - /* Flags to be set in the `posix_spawnattr_t'. */ -! #if !@HAVE_POSIX_SPAWN@ -! # if @REPLACE_POSIX_SPAWN@ - /* Use the values from the system, for better compatibility. */ - /* But this implementation does not support AIX extensions. */ -! # undef POSIX_SPAWN_FORK_HANDLERS -! # else -! # define POSIX_SPAWN_RESETIDS 0x01 -! # define POSIX_SPAWN_SETPGROUP 0x02 -! # define POSIX_SPAWN_SETSIGDEF 0x04 -! # define POSIX_SPAWN_SETSIGMASK 0x08 -! # define POSIX_SPAWN_SETSCHEDPARAM 0x10 -! # define POSIX_SPAWN_SETSCHEDULER 0x20 -! # endif - #endif - /* A GNU extension. Use the next free bit position. */ - #define POSIX_SPAWN_USEVFORK \