summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2001-02-05 16:31:37 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2001-02-05 16:31:37 +0000
commitfa9ae02cd3b9145eb3300aa4ba4253bcc7e7f099 (patch)
treef50bb53af801b3cb0c0a99601cd7c90e7ef1009f /devel
parent75fcd1487b1b5159cf5f04a2499451434eac948e (diff)
downloadpkgsrc-fa9ae02cd3b9145eb3300aa4ba4253bcc7e7f099.tar.gz
-split patches into 2 files.
-add missing <string.h> for alpha.
Diffstat (limited to 'devel')
-rw-r--r--devel/ipv6socket_scrub/files/patch-sum5
-rw-r--r--devel/ipv6socket_scrub/patches/patch-aa34
-rw-r--r--devel/ipv6socket_scrub/patches/patch-ab11
3 files changed, 27 insertions, 23 deletions
diff --git a/devel/ipv6socket_scrub/files/patch-sum b/devel/ipv6socket_scrub/files/patch-sum
index a618c28141c..fb45f5d5720 100644
--- a/devel/ipv6socket_scrub/files/patch-sum
+++ b/devel/ipv6socket_scrub/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/12/28 05:30:47 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2001/02/05 16:31:37 dmcmahill Exp $
-MD5 (patch-aa) = 1d2e67eb3299c87789dd6a9ad2265e7a
+MD5 (patch-aa) = 3901d8cf1cd8a0128dbcc71451312f9d
+MD5 (patch-ab) = e4ecf32ee58e540df99bd0234466d1b1
diff --git a/devel/ipv6socket_scrub/patches/patch-aa b/devel/ipv6socket_scrub/patches/patch-aa
index e0b16f645f1..be4a501d548 100644
--- a/devel/ipv6socket_scrub/patches/patch-aa
+++ b/devel/ipv6socket_scrub/patches/patch-aa
@@ -1,17 +1,21 @@
-$NetBSD: patch-aa,v 1.2 1999/11/28 14:37:41 itojun Exp $
---- ipv6socket_scrub.c.orig Fri Oct 15 18:51:40 1999
-+++ ipv6socket_scrub.c Sun Nov 28 23:28:38 1999
-@@ -308,7 +308,7 @@
- -e 's/#.*if/_#_if/' \
+$NetBSD: patch-aa,v 1.3 2001/02/05 16:31:39 dmcmahill Exp $
+
+--- ipv6socket_scrub.c.orig Fri Oct 15 05:51:40 1999
++++ ipv6socket_scrub.c Mon Feb 5 11:26:41 2001
+@@ -32,4 +32,5 @@
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <pwd.h>
+ #include <sys/types.h>
+@@ -309,5 +310,5 @@
-e 's/#.*else/_#_else/' \
%s | \
- /usr/ccs/lib/cpp -BP 2>&1 | \
+ /usr/bin/cpp -P 2>&1 | \
/usr/bin/sed -e 's/_#_include/#include/' \
-e 's/_#_end/#end/' \
- -e 's/_#_if/#if/' \
-@@ -664,8 +664,8 @@
-
+@@ -665,6 +666,6 @@
if ((stat("/usr/bin/sed", &statbuff) == -1) ||
- stat("/usr/ccs/lib/cpp", &statbuff) == -1) {
@@ -20,22 +24,10 @@ $NetBSD: patch-aa,v 1.2 1999/11/28 14:37:41 itojun Exp $
+ fprintf (stderr, "\nCannot find /usr/bin/sed and/or /usr/bin/cpp -P.\n Terminating...\n");
exit (2);
- }
-@@ -1343,7 +1343,7 @@
- }
+@@ -1344,5 +1345,5 @@
if (check_file (buf,ignore_conf,pri_conf,sec_conf,fo1,fo2,tmpfile)) {
- fprintf (stderr, "\nCannot process file %s. Cannot find /usr/bin/sed and/or /usr/ccs/lib/cpp -BP.\n Terminating...\n",buf);
+ fprintf (stderr, "\nCannot process file %s. Cannot find /usr/bin/sed and/or /usr/bin/cpp -P.\n Terminating...\n",buf);
unlink(tmpfile);
exit (2);
- }
---- Makefile.orig Wed Oct 13 18:01:46 1999
-+++ Makefile Sun Nov 28 23:26:42 1999
-@@ -1,5 +1,5 @@
- CC = cc
--CFLAGS = -xO3
-+CFLAGS = -O3
- LDFLAGS =
-
- PROG = ipv6socket_scrub
diff --git a/devel/ipv6socket_scrub/patches/patch-ab b/devel/ipv6socket_scrub/patches/patch-ab
new file mode 100644
index 00000000000..a417ec2af77
--- /dev/null
+++ b/devel/ipv6socket_scrub/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2001/02/05 16:31:40 dmcmahill Exp $
+
+--- Makefile.orig Wed Oct 13 18:01:46 1999
++++ Makefile Sun Nov 28 23:26:42 1999
+@@ -1,5 +1,5 @@
+ CC = cc
+-CFLAGS = -xO3
++CFLAGS = -O3
+ LDFLAGS =
+
+ PROG = ipv6socket_scrub