Convert to use buildlink2. Remove s/make/${MAKE}/g changes in patch-ae

made unnecessary by tools.mk.

3 files changed, 15 insertions, 85 deletions

diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 9c85d7375f1..091de691b51 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/06 23:04:16 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/23 01:23:58 jlam Exp $
 
 DISTNAME=	nc110
 PKGNAME=	netcat-1.10
@@ -17,6 +17,7 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.atstake.com/research/tools/network_utilities/
 COMMENT=	Read and write data across network connections
 
+USE_BUILDLINK2=	yes
 MAKE_ENV+=	DFLAGS="-DGAPING_SECURITY_HOLE -DTELNET"
 ALL_TARGET=	${LOWER_OPSYS}
 
diff --git a/net/netcat/distinfo b/net/netcat/distinfo
index 957a9fad1c7..8dea39ea8e3 100644
--- a/net/netcat/distinfo
+++ b/net/netcat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/11/10 03:30:33 danw Exp $
+$NetBSD: distinfo,v 1.8 2003/11/23 01:23:58 jlam Exp $
 
 SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
 Size (nc110.tgz) = 75267 bytes
@@ -6,5 +6,5 @@ SHA1 (patch-aa) = 44dc8cf9072a1c127925a4efed6bb7f1428360bc
 SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
 SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
 SHA1 (patch-ad) = ee5e1c6a8e3e2a239135d74dbf46fc25c8d2ec80
-SHA1 (patch-ae) = 7131c52a9f1f19b66346a841447a88ad0ceb377e
+SHA1 (patch-ae) = 510e4ac6c1649af4c719f3fc0ba5c65eadbe3564
 SHA1 (patch-af) = 45b3824ff84c2557b0016d97b0309d5c8b597690
diff --git a/net/netcat/patches/patch-ae b/net/netcat/patches/patch-ae
index 9f3b4254f99..842be696adb 100644
--- a/net/netcat/patches/patch-ae
+++ b/net/netcat/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 2003/11/10 03:30:33 danw Exp $
+$NetBSD: patch-ae,v 1.6 2003/11/23 01:23:58 jlam Exp $
 
---- Makefile.orig	Wed Mar 20 04:16:06 1996
-+++ Makefile
+--- Makefile.orig	Tue Mar 19 19:16:06 1996
++++ Makefile	Sat Nov 22 17:32:15 2003
 @@ -9,12 +9,10 @@
  # pick gcc if you'd rather , and/or do -g instead of -O if debugging
  # debugging
@@ -15,107 +15,36 @@ $NetBSD: patch-ae,v 1.5 2003/11/10 03:30:33 danw Exp $
  LD = $(CC) -s	# linker; defaults to stripped executables
  o = o		# object extension
  
-@@ -28,7 +26,7 @@ bogus:
+@@ -28,7 +26,7 @@
  ### HARD TARGETS
  
  nc:	netcat.c
 -	$(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
-+	$(LD) $(CFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
++	$(CC) $(CFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
  
  nc-dos:
  	@echo "DOS?!  Maybe someday, but not now"
-@@ -43,11 +41,11 @@ dos:
- 	XFLAGS="/AS -D__MSDOS__ -DMSDOS"  o=obj
- 
- ultrix:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DULTRIX'
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DULTRIX'
- 
- # you may need XLIBS='-lresolv -l44bsd' if you have BIND 4.9.x
- sunos:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DSUNOS' STATIC=-Bstatic \
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DSUNOS' STATIC=-Bstatic \
- 	XLIBS='-lresolv'
- 
- # Pick this one ahead of "solaris" if you actually have the nonshared
-@@ -55,63 +53,63 @@ sunos:
- # or install them, forcing you to use shared libs for any network apps.
+@@ -56,12 +54,12 @@
  # Kludged for gcc, which many regard as the only thing available.
  solaris-static:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+ 	make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
 -	CC=gcc STATIC=-static XLIBS='-lnsl -lsocket -lresolv'
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
 +	STATIC=-static XLIBS='-lnsl -lsocket -lresolv'
  
  # the more usual shared-lib version...
  solaris:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+ 	make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
 -	CC=gcc STATIC= XLIBS='-lnsl -lsocket -lresolv'
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
 +	STATIC= XLIBS='-lnsl -lsocket -lresolv'
  
  aix:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DAIX'
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DAIX'
- 
- linux:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DLINUX' STATIC=-static
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DLINUX' STATIC=-static
- 
- # irix 5.2, dunno 'bout earlier versions.  If STATIC='-non_shared' doesn't
- # work for you, null it out and yell at SGI for their STUPID default
- # of apparently not installing /usr/lib/nonshared/*.  Sheesh.
- irix:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DIRIX -DSYSV=4 -D__svr4__' \
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DIRIX -DSYSV=4 -D__svr4__' \
- 	STATIC=-non_shared
- 
- osf:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DOSF' STATIC=-non_shared
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DOSF' STATIC=-non_shared
- 
- # virtually the same as netbsd/bsd44lite/whatever
- freebsd:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' STATIC=-static
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' STATIC=-static
- 
- bsdi:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DBSDI' STATIC=-Bstatic
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DBSDI' STATIC=-Bstatic
- 
- netbsd:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DNETBSD' STATIC=-static
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DNETBSD' STATIC=-static
- 
- # finally got to an hpux box, which turns out to be *really* warped. 
- # STATIC here means "linker subprocess gets args '-a archive'" which causes
- # /lib/libc.a to be searched ahead of '-a shared', or /lib/libc.sl.
- hpux:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DHPUX' STATIC="-Wl,-a,archive"
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DHPUX' STATIC="-Wl,-a,archive"
- 
- # unixware from bmc@telebase.com; apparently no static because of the
- # same idiotic lack of link libraries
- unixware:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DUNIXWARE -DSYSV=4 -D__svr4__' \
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DUNIXWARE -DSYSV=4 -D__svr4__' \
- 	STATIC= XLIBS='-L/usr/lib -lnsl -lsocket -lresolv'
+ 	make -e $(ALL) $(MFLAGS) XFLAGS='-DAIX'
+@@ -103,7 +101,7 @@
  
  # 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
++	make -e $(ALL) $(MFLAGS) XFLAGS='-DAUX' STATIC=-static
  
  # Nexstep from mudge: NeXT cc is really old gcc
  next:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
- 
- # start with this for a new architecture, and see what breaks.
--generic:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DGENERIC' STATIC=
-+generic darwin:
-+	${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DGENERIC' STATIC=
- 
- # Still at large: dgux dynix ???
-