- Update MASTER_SITES and WWW: line

- Cleanup pkg-descr
- Switch to optionsng

PR:           ports/169420
Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
Approved by:  beat (mentor)

3 files changed, 31 insertions, 90 deletions

diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index d84980492af1..b0b9b5584b9d 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -10,55 +10,60 @@ PORTNAME=	netcat
 PORTVERSION=	1.10
 PORTREVISION=	3
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/netcat/  \
-		ftp://ftp.cuhk.edu.hk/pub/packages/security/purdue/netutils/netcat/  \
-		http://www.planetmirror.com/pub/lprng/TOOLS/
-DISTNAME=	nc110
+MASTER_SITES=	SF/${DISTNAME}/unix%20netcat%20${PORTVERSION}%20by%20_Hobbit_/%5BUnnamed%20release%5D
+DISTNAME=	nc${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
 
-PATCH_SITES=	ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/
+#PATCH_SITES=	ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/
+PATCH_SITES=	${MASTER_SITE_GENTOO}
+PATCH_SITE_SUBDIR=	distfiles
 PATCHFILES=	nc-v6-20000918.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple utility which reads and writes data across network connections
 
+OPTIONS_DEFINE=	IPV6 TELNET GAPING DOCS
+OPTIONS_DEFAULT=IPV6 TELNET GAPING
+TELNET_DESC=	Enable TELNET support
+GAPING_DESC=	Enable GAPING_SECURITY_HOLE support
+
 NO_WRKSUBDIR=	yes
-ALL_TARGET=	freebsd
 
-OPTIONS=	IPV6 "enable IPv6 support" on \
-		TELNET "enable TELNET support" on \
-		GAPING "enable GAPING_SECURITY_HOLE support" on
+CFLAGS+=	-D${OPSYS:U}
+LDFLAGS+=	-static
 
-PLIST_FILES=	bin/netcat
-PORTDOCS=	README
 MAN1=		netcat.1
+PORTDOCS=	README
+PLIST_FILES=	bin/netcat
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined (WITH_IPV6)
-XFLAGS+=	-DIPV6
+.if ${PORT_OPTIONS:MIPV6}
+CFLAGS+=	-DINET6
 .endif
 
-.if defined (WITH_TELNET)
-XFLAGS+=	-DTELNET
+.if ${PORT_OPTIONS:MTELNET}
+CFLAGS+=	-DTELNET
 .endif
 
-.if defined (WITH_GAPING)
-XFLAGS+=	-DGAPING_SECURITY_HOLE
+.if ${PORT_OPTIONS:MGAPING}
+CFLAGS+=	-DGAPING_SECURITY_HOLE
 .endif
 
-MAKE_ENV=	XFLAGS="${XFLAGS}"
-
 post-patch:
-	${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' ${FILESDIR}/nc.1 > ${WRKDIR}/${PORTNAME}.1
+	@${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' ${FILESDIR}/nc.1 \
+		> ${WRKDIR}/${PORTNAME}.1
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${PORTNAME}.c -o ${PORTNAME} ${LDFLAGS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nc ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/netcat/files/patch-ab b/net/netcat/files/patch-ab
deleted file mode 100644
index 4ded35297111..000000000000
--- a/net/netcat/files/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig	Tue Mar 19 19:16:06 1996
-+++ Makefile	Sat Jul 24 13:30:04 1999
-@@ -9,12 +9,11 @@
- # 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
-+CFLAGS ?= -O
- XLIBS =		# xtra libs if necessary?
- # -Bstatic for sunos,  -static for gcc, etc.  You want this, trust me.
- STATIC =
--CC = cc $(CFLAGS)
-+CC ?= cc
- LD = $(CC) -s	# linker; defaults to stripped executables
- o = o		# object extension
- 
-@@ -28,7 +28,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)
- 
- nc-dos:
- 	@echo "DOS?!  Maybe someday, but not now"
-@@ -81,7 +81,7 @@
- 
- # virtually the same as netbsd/bsd44lite/whatever
- freebsd:
--	make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' STATIC=-static
-+	make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD $(XFLAGS)' STATIC=-static
- 
- bsdi:
- 	make -e $(ALL) $(MFLAGS) XFLAGS='-DBSDI' STATIC=-Bstatic
diff --git a/net/netcat/pkg-descr b/net/netcat/pkg-descr
index 800e9783b513..679c7e38f823 100644
--- a/net/netcat/pkg-descr
+++ b/net/netcat/pkg-descr
@@ -6,33 +6,4 @@ network debugging and exploration tool, since it can create almost any
 kind of connection you would need and has several interesting built-in
 capabilities.
 
-Some of netcat's major features are:
-
-	Outbound or inbound connections, IPv4 or IPv6, TCP or UDP,
-		to or from any ports
-	Full DNS forward/reverse checking, with appropriate warnings
-	Ability to use any local source port
-	Ability to use any locally-configured network source address
-	Built-in port-scanning capabilities, with randomizer
-	Built-in loose source-routing capability
-	Can read command line arguments from standard input
-	Slow-send mode, one line every N seconds
-	Hex dump of transmitted and received data
-	Optional ability to let another program service established connections
-	Optional telnet-options responder
-
-A very short list of potential uses:
-
-	Script backends
-	Scanning ports and inventorying services, automated probes
-	Backup handlers
-	File transfers
-	Server testing, simulation, debugging, and hijacking
-	Firewall testing
-	Proxy gatewaying
-	Network performance testing
-	Address spoofing tests
-	Protecting X servers
-	1001 other uses you'll likely come up with
-
-_H* 960320
+WWW: http://nc110.sourceforge.net/