summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorshannonjr <shannonjr@pkgsrc.org>2004-06-01 20:42:17 +0000
committershannonjr <shannonjr@pkgsrc.org>2004-06-01 20:42:17 +0000
commit71f79b2075e3e81666687d0b09ea162486114f85 (patch)
tree8371d6ab898cfda5dac968ff4213f3741ed994e3 /textproc
parent3eb7d05ce6851d67a760eab40147d79d70633b14 (diff)
downloadpkgsrc-71f79b2075e3e81666687d0b09ea162486114f85.tar.gz
Re: PR 25726 Compilation error on redeclaration of malloc() using gcc 3.4.0
This problem was anticipated in the source Makefile so fix was a trivial matter of setting the CFLAG -DNO_MALLOC_DECL. This closes the referenced PR.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/detex/distinfo4
-rw-r--r--textproc/detex/patches/patch-aa17
2 files changed, 14 insertions, 7 deletions
diff --git a/textproc/detex/distinfo b/textproc/detex/distinfo
index daa3cea0580..0b44c98db87 100644
--- a/textproc/detex/distinfo
+++ b/textproc/detex/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/11/11 20:07:34 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2004/06/01 20:42:17 shannonjr Exp $
SHA1 (detex-2.7.tar) = 84b975a57ea199a29a795d699bb92dca0bad42d5
Size (detex-2.7.tar) = 94720 bytes
-SHA1 (patch-aa) = cb83efacc8af3c33130db37c6418887d2fd314d4
+SHA1 (patch-aa) = 455387166744bb76b38efeaf5cc7b8a6fc072169
diff --git a/textproc/detex/patches/patch-aa b/textproc/detex/patches/patch-aa
index afa161851f7..ed8e6488f37 100644
--- a/textproc/detex/patches/patch-aa
+++ b/textproc/detex/patches/patch-aa
@@ -1,9 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/18 09:55:53 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2004/06/01 20:42:18 shannonjr Exp $
---- Makefile- Wed Oct 18 18:51:39 2000
-+++ Makefile Wed Oct 18 18:51:54 2000
-@@ -39,3 +39,3 @@
+--- Makefile.orig 1999-05-12 11:45:55.000000000 -0600
++++ Makefile
+@@ -35,9 +35,9 @@ DEFS =
+ # Add -DNO_MALLOC_DECL if your system does not like the malloc() declaration
+ # in detex.l (reported by pinard@iro.umontreal.ca)
+ #
+-#DEFS += ${DEFS} -DNO_MALLOC_DECL
++DEFS += -DNO_MALLOC_DECL
#
-CFLAGS = -O ${DEFS}
-+#CFLAGS = -O ${DEFS}
++CFLAGS += ${DEFS}
+ # Use your favorite lexical scanner
+ #