un-hardwire 'cc' to give this a chance of building on various

platforms.

3 files changed, 71 insertions, 1 deletions

diff --git a/net/netcat/distinfo b/net/netcat/distinfo
index 53b39c57132..c83be8d6f7a 100644
--- a/net/netcat/distinfo
+++ b/net/netcat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/10/08 14:29:36 abs Exp $
+$NetBSD: distinfo,v 1.5 2003/04/30 04:08:26 grant Exp $
 
 SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
 Size (nc110.tgz) = 75267 bytes
@@ -6,3 +6,5 @@ SHA1 (patch-aa) = 44dc8cf9072a1c127925a4efed6bb7f1428360bc
 SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
 SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
 SHA1 (patch-ad) = ee5e1c6a8e3e2a239135d74dbf46fc25c8d2ec80
+SHA1 (patch-ae) = c55c885bc255f6a20aa14bda8ff8b2c25f3da810
+SHA1 (patch-af) = 45b3824ff84c2557b0016d97b0309d5c8b597690
diff --git a/net/netcat/patches/patch-ae b/net/netcat/patches/patch-ae
new file mode 100644
index 00000000000..b1d9f2f5a31
--- /dev/null
+++ b/net/netcat/patches/patch-ae
@@ -0,0 +1,50 @@
+$NetBSD: patch-ae,v 1.3 2003/04/30 04:08:27 grant Exp $
+
+--- Makefile.orig	Wed Mar 20 14:16:06 1996
++++ Makefile
+@@ -9,12 +9,10 @@
+ # pick gcc if you'd rather , and/or do -g instead of -O if debugging
+ # debugging
+ # DFLAGS = -DTEST -DDEBUG
+-CFLAGS = -O
+ XFLAGS = 	# xtra cflags, set by systype targets
+ XLIBS =		# xtra libs if necessary?
+ # -Bstatic for sunos,  -static for gcc, etc.  You want this, trust me.
+ STATIC =
+-CC = cc $(CFLAGS)
+ LD = $(CC) -s	# linker; defaults to stripped executables
+ o = o		# object extension
+ 
+@@ -28,7 +26,7 @@ bogus:
+ ### HARD TARGETS
+ 
+ nc:	netcat.c
+-	$(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
++	$(LD) $(CFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
+ 
+ nc-dos:
+ 	@echo "DOS?!  Maybe someday, but not now"
+@@ -56,12 +54,12 @@ sunos:
+ # Kludged for gcc, which many regard as the only thing available.
+ solaris-static:
+ 	make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+-	CC=gcc STATIC=-static XLIBS='-lnsl -lsocket -lresolv'
++	STATIC=-static XLIBS='-lnsl -lsocket -lresolv'
+ 
+ # the more usual shared-lib version...
+ solaris:
+ 	make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+-	CC=gcc STATIC= XLIBS='-lnsl -lsocket -lresolv'
++	STATIC= XLIBS='-lnsl -lsocket -lresolv'
+ 
+ aix:
+ 	make -e $(ALL) $(MFLAGS) XFLAGS='-DAIX'
+@@ -103,7 +101,7 @@ unixware:
+ 
+ # from Declan Rieb at sandia, for a/ux 3.1.1 [also suggests using gcc]:
+ aux:
+-	make -e $(ALL) $(MFLAGS) XFLAGS='-DAUX' STATIC=-static CC=gcc
++	make -e $(ALL) $(MFLAGS) XFLAGS='-DAUX' STATIC=-static
+ 
+ # Nexstep from mudge: NeXT cc is really old gcc
+ next:
diff --git a/net/netcat/patches/patch-af b/net/netcat/patches/patch-af
new file mode 100644
index 00000000000..0c9ba953867
--- /dev/null
+++ b/net/netcat/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2003/04/30 04:08:27 grant Exp $
+
+--- data/Makefile.orig	Thu Mar 21 07:14:44 1996
++++ data/Makefile
+@@ -1,10 +1,10 @@
+ all:	data rservice xor
+ 
+ data:	data.c
+-	cc -s -O -o data data.c
++	$(CC) $(CFLAGS) -s -o data data.c
+ rservice:	rservice.c
+-	cc -s -O -o rservice rservice.c
++	$(CC) $(CFLAGS) -s -o rservice rservice.c
+ xor:	xor.c
+-	cc -s -O -o xor xor.c
++	$(CC) $(CFLAGS) -s -o xor xor.c
+ clean:
+ 	rm -f *.o data rservice xor