- Fix build on -current

- Convert to new options framework
- Use shebangfix for rulesets
- Support staging
- Switch to PLIST_FILES

PR:		ports/184842
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

2 files changed, 32 insertions, 53 deletions

diff --git a/net/netscript/Makefile b/net/netscript/Makefile
index 924f6a2fbb6b..693658badd4c 100644
--- a/net/netscript/Makefile
+++ b/net/netscript/Makefile
@@ -3,41 +3,48 @@
 
 PORTNAME=	netscript
 PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF \
 		http://fakehalo.deadpig.org/%SUBDIR%/
-
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable/multi-platform lightweight TCP socket scripting
 
-WANT_GNOME=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES GTK1
+
+USES=		ncurses shebangfix
+SHEBANG_FILES=	examples/*.ruleset examples/gui/*.ruleset \
+		examples/ncurses/*.ruleset
+SHEBANG_LANG=	netscript
+netscript_OLD_CMD=	/usr/bin/netscript
+netscript_CMD=		${LOCALBASE}/bin/netscript
+
+CFLAGS+=	-DNCURSES -DARPA -DBSD_T -Wl,--export-dynamic
+LDFLAGS+=	-lcurses
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/netscript
 
-.if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME+=	gtk12
-PKGNAMESUFFIX=	-gtk
-ALL_TARGET=	gbsd
-.else
-ALL_TARGET=	bsd
-.endif
+GTK1_USE=	GNOME=gtk12
+GTK1_CFLAGS=	-DGTK
+GTK1_CPPFLAGS=	$$(gtk-config --cflags gthread)
+GTK1_LDFLAGS=	$$(gtk-config --libs gthread)
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
+do-build:
+	(cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} netscript.c \
+		-o netscript ${LDFLAGS})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/netscript ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	@${CHMOD} -R og+r ${EXAMPLESDIR}
-	@${CHMOD} og+x ${EXAMPLESDIR}/gui ${EXAMPLESDIR}/ncurses
-.endif
-
-.include <bsd.port.post.mk>
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} netscript \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README \
+		${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR})
+
+.include <bsd.port.mk>
diff --git a/net/netscript/pkg-plist b/net/netscript/pkg-plist
deleted file mode 100644
index 8dc3abf2aa4e..000000000000
--- a/net/netscript/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/netscript
-%%PORTDOCS%%share/doc/netscript/README
-%%PORTDOCS%%share/examples/netscript/README
-%%PORTDOCS%%share/examples/netscript/dict.ruleset
-%%PORTDOCS%%share/examples/netscript/extern.ruleset
-%%PORTDOCS%%share/examples/netscript/fingerd.ruleset
-%%PORTDOCS%%share/examples/netscript/ftp.ruleset
-%%PORTDOCS%%share/examples/netscript/gui/README
-%%PORTDOCS%%share/examples/netscript/gui/gdict.ruleset
-%%PORTDOCS%%share/examples/netscript/gui/gidentd.ruleset
-%%PORTDOCS%%share/examples/netscript/http.ruleset
-%%PORTDOCS%%share/examples/netscript/httpd.ruleset
-%%PORTDOCS%%share/examples/netscript/identd.ruleset
-%%PORTDOCS%%share/examples/netscript/irc.ruleset
-%%PORTDOCS%%share/examples/netscript/irc2.ruleset
-%%PORTDOCS%%share/examples/netscript/ncurses/README
-%%PORTDOCS%%share/examples/netscript/ncurses/nfingerd.ruleset
-%%PORTDOCS%%share/examples/netscript/ncurses/nidentd.ruleset
-%%PORTDOCS%%share/examples/netscript/ncurses/nirc.ruleset
-%%PORTDOCS%%share/examples/netscript/pop3.ruleset
-%%PORTDOCS%%share/examples/netscript/quake.ruleset
-%%PORTDOCS%%share/examples/netscript/smtp.ruleset
-%%PORTDOCS%%share/examples/netscript/telnet.ruleset
-%%PORTDOCS%%share/examples/netscript/telnetd.ruleset
-%%PORTDOCS%%@dirrm share/doc/netscript
-%%PORTDOCS%%@dirrm share/examples/netscript/gui
-%%PORTDOCS%%@dirrm share/examples/netscript/ncurses
-%%PORTDOCS%%@dirrm share/examples/netscript