summaryrefslogtreecommitdiff
path: root/devel/m4
diff options
context:
space:
mode:
authortnn <tnn>2010-07-20 13:40:02 +0000
committertnn <tnn>2010-07-20 13:40:02 +0000
commit49304f377ad9d30100734598f933a5365cc65237 (patch)
treed5e9d4c1ce2e7853f53eda8e97fbddbfdb6bec4a /devel/m4
parentbfb47f54b91776df228899af82d085cc4e55ae66 (diff)
downloadpkgsrc-49304f377ad9d30100734598f933a5365cc65237.tar.gz
Dragonfly PR pkg/43098: Goetz Isenmann: devel/m4 broken
(bustage due to gnulib compat mess)
Diffstat (limited to 'devel/m4')
-rw-r--r--devel/m4/Makefile3
-rw-r--r--devel/m4/distinfo3
-rw-r--r--devel/m4/patches/patch-ab23
3 files changed, 27 insertions, 2 deletions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 696128a26a0..1c83ee81c7f 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2010/03/18 10:05:48 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2010/07/20 13:40:02 tnn Exp $
DISTNAME= m4-1.4.14
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=m4/}
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index d2c0fdf146f..4247fc23227 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.29 2010/03/25 04:39:01 jklos Exp $
+$NetBSD: distinfo,v 1.30 2010/07/20 13:40:02 tnn Exp $
SHA1 (m4-1.4.14.tar.gz) = 8bf68b7a072d68affaccd281138ec73aca23b954
RMD160 (m4-1.4.14.tar.gz) = 80c6a4a7ac22419777fe2890f05dfaaa5c53f946
Size (m4-1.4.14.tar.gz) = 1509355 bytes
SHA1 (patch-aa) = fc7fc68865763098060ee11f0c13fc57956ec820
+SHA1 (patch-ab) = a7cf3e8c6a8f325d8be44d75507dba8df54ba1fa
diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-ab
new file mode 100644
index 00000000000..a0a9c0b225b
--- /dev/null
+++ b/devel/m4/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.9 2010/07/20 13:40:02 tnn Exp $
+
+DragonFly PR pkg/43098
+Upstream supposedly has a better fix for this for the next m4 release.
+
+--- lib/spawn.in.h.orig 2010-01-28 13:04:07.000000000 +0000
++++ lib/spawn.in.h
+@@ -110,6 +110,7 @@ typedef struct
+
+
+ /* 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. */
+@@ -122,6 +123,7 @@ typedef struct
+ # 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 \
+ ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1) \