summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritojun <itojun@pkgsrc.org>1999-11-28 14:37:40 +0000
committeritojun <itojun@pkgsrc.org>1999-11-28 14:37:40 +0000
commit541b2eea3a9cb6aeacb8c3bdda6b08fce5cf614c (patch)
tree64d42a0e0d46fca1a7070d76d613b046857f4940
parent7f9408e73e8871efb95df8deefebf3eee906324d (diff)
downloadpkgsrc-541b2eea3a9cb6aeacb8c3bdda6b08fce5cf614c.tar.gz
GNU cpp does not have -B option.
XXX this program sometime fails if you specify too many files at once.
-rw-r--r--devel/ipv6socket_scrub/Makefile9
-rw-r--r--devel/ipv6socket_scrub/patches/patch-aa16
2 files changed, 14 insertions, 11 deletions
diff --git a/devel/ipv6socket_scrub/Makefile b/devel/ipv6socket_scrub/Makefile
index cda8664e722..165274588e8 100644
--- a/devel/ipv6socket_scrub/Makefile
+++ b/devel/ipv6socket_scrub/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.2 1999/11/25 13:46:30 itojun Exp $
+# $NetBSD: Makefile,v 1.3 1999/11/28 14:37:40 itojun Exp $
+# KAME Id: Makefile,v 1.6 1999/11/28 14:36:04 itojun Exp
#
DISTNAME= IPv6socket_scrub
@@ -19,8 +20,10 @@ RESTRICTED= "not redistributable, license agreement required"
MIRROR_DISTFILES= no
do-fetch:
- @${ECHO} "===> You need to sign the agreement on ${HOMEPAGE}"
- @${ECHO} " and fetch on your own."
+ @if test \! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; then \
+ ${ECHO} "===> You need to sign the agreement on ${HOMEPAGE}"; \
+ ${ECHO} " and fetch on your own."; \
+ fi
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ipv6socket_scrub ${PREFIX}/bin
diff --git a/devel/ipv6socket_scrub/patches/patch-aa b/devel/ipv6socket_scrub/patches/patch-aa
index a8f67eb0050..e0b16f645f1 100644
--- a/devel/ipv6socket_scrub/patches/patch-aa
+++ b/devel/ipv6socket_scrub/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/25 01:54:01 itojun Exp $
---- ipv6socket_scrub.c- Thu Nov 25 10:06:57 1999
-+++ ipv6socket_scrub.c Thu Nov 25 10:07:26 1999
+$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/' \
-e 's/#.*else/_#_else/' \
%s | \
- /usr/ccs/lib/cpp -BP 2>&1 | \
-+ /usr/bin/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/' \
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/25 01:54:01 itojun Exp $
- stat("/usr/ccs/lib/cpp", &statbuff) == -1) {
- fprintf (stderr, "\nCannot find /usr/bin/sed and/or /usr/ccs/lib/cpp -BP.\n Terminating...\n");
+ stat("/usr/bin/cpp", &statbuff) == -1) {
-+ fprintf (stderr, "\nCannot find /usr/bin/sed and/or /usr/bin/cpp -BP.\n Terminating...\n");
++ fprintf (stderr, "\nCannot find /usr/bin/sed and/or /usr/bin/cpp -P.\n Terminating...\n");
exit (2);
}
@@ -26,12 +26,12 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/25 01:54:01 itojun Exp $
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 -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- Thu Nov 25 10:08:47 1999
-+++ Makefile Thu Nov 25 10:08:50 1999
+--- 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