summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo>2006-09-23 14:53:46 +0000
committersalo <salo>2006-09-23 14:53:46 +0000
commitc9eb87d2a0a5a95466ceb2a5d91cf062c408a108 (patch)
tree3dc53b1bfe08e983ce90b5bab1845590e1b3acd2
parent80a7270c43300b8105925aaaeb43a00941e5b9d1 (diff)
downloadpkgsrc-c9eb87d2a0a5a95466ceb2a5d91cf062c408a108.tar.gz
Pullup ticket 1831 - requested by briggs
gcc 4.x build fix for dict-server Revisions pulled up: - pkgsrc/textproc/dict-server/distinfo 1.16 - pkgsrc/textproc/dict-server/patches/patch-aa 1.5 - pkgsrc/textproc/dict-server/patches/patch-ab 1.6 Module Name: pkgsrc Committed By: seb Date: Sun Jul 16 22:37:49 UTC 2006 Modified Files: pkgsrc/textproc/dict-server: distinfo pkgsrc/textproc/dict-server/patches: patch-aa patch-ab Log Message: On NetBSD too don't define alloca as it conflicts with stdlib.h (exposed with current's gcc 4.1.2).
-rw-r--r--textproc/dict-server/distinfo6
-rw-r--r--textproc/dict-server/patches/patch-aa4
-rw-r--r--textproc/dict-server/patches/patch-ab4
3 files changed, 7 insertions, 7 deletions
diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo
index 673c758a38d..3ab8acb88d4 100644
--- a/textproc/dict-server/distinfo
+++ b/textproc/dict-server/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2006/06/26 11:39:00 rillig Exp $
+$NetBSD: distinfo,v 1.15.2.1 2006/09/23 14:53:46 salo Exp $
SHA1 (dictd-1.9.15.tar.gz) = 081ea97a4a6a936855af30d9c2a31f5733985822
RMD160 (dictd-1.9.15.tar.gz) = 4cdef7132855d4ef949ba7ceacbea16881e3ef5d
Size (dictd-1.9.15.tar.gz) = 741597 bytes
-SHA1 (patch-aa) = ac64b226ea700d1b6484009b829dca1a9eab3cef
-SHA1 (patch-ab) = cca19a370d6eb23b6176ab8788256a9ac86fc177
+SHA1 (patch-aa) = 2d5bd58779a1b5de577dad4c5aa523888c26098a
+SHA1 (patch-ab) = a3c387c393cdf192dffc1d95280cfc3ebf238b4a
SHA1 (patch-ad) = 75d08ce1778898edcd52b4b94c974aba54f769a7
SHA1 (patch-ae) = 1b161f8c52a6029f0af2ddb824fc23ee5f867cff
SHA1 (patch-ag) = 4473d472bddc34c5d5be2d6be6a0cee015717a79
diff --git a/textproc/dict-server/patches/patch-aa b/textproc/dict-server/patches/patch-aa
index 3386f132246..7f044f2f7f9 100644
--- a/textproc/dict-server/patches/patch-aa
+++ b/textproc/dict-server/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2006/01/02 10:55:24 joerg Exp $
+$NetBSD: patch-aa,v 1.4.4.1 2006/09/23 14:53:46 salo Exp $
--- dictP.h.orig 2006-01-02 10:35:42.000000000 +0000
+++ dictP.h
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2006/01/02 10:55:24 joerg Exp $
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
-# if !defined(__svr4__) && !defined(__sgi__) /* not on IRIX */
-+# if !defined(__svr4__) && !defined(__sgi__) && !defined(__DragonFly__) && !defined(__FreeBSD__) /* not on IRIX */
++# if !defined(__svr4__) && !defined(__sgi__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) /* not on IRIX */
char *alloca ();
# endif
# endif
diff --git a/textproc/dict-server/patches/patch-ab b/textproc/dict-server/patches/patch-ab
index 1989a9ec2c3..35fa9312457 100644
--- a/textproc/dict-server/patches/patch-ab
+++ b/textproc/dict-server/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2006/01/02 10:55:24 joerg Exp $
+$NetBSD: patch-ab,v 1.5.4.1 2006/09/23 14:53:46 salo Exp $
--- libmaa/maaP.h.orig 2006-01-02 10:42:04.000000000 +0000
+++ libmaa/maaP.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.5 2006/01/02 10:55:24 joerg Exp $
# pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
-+# if !defined(__DragonFly__) && !defined(__FreeBSD__)
++# if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
char *alloca ();
# endif
+# endif