update to 0.2 beta

many enhancements.
much better rule list view.

PR:		ports/70007
Submitted by:	maintainer

6 files changed, 100 insertions, 19 deletions

diff --git a/net-mgmt/netustad/Makefile b/net-mgmt/netustad/Makefile
index 8c9299d3c5a7..ffa721ff5ada 100644
--- a/net-mgmt/netustad/Makefile
+++ b/net-mgmt/netustad/Makefile
@@ -1,23 +1,42 @@
 # New ports collection makefile for:   netustad
 # Date created:                 4 July 2004
-# Whom:                         ozkan@enderunix.org
+# Whom:                         Ozkan KIRIK <ozkan@enderunix.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	netustad
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2b
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://www.enderunix.org/netustad/
+DISTNAME=	${PORTNAME}-0.2-BETA
 
 MAINTAINER=	ozkan@enderunix.org
-COMMENT=	A web based admin tool that manages network services
+COMMENT=	A Web based admin tool that manages network services
 
 MAN8=		netustad.8 netustadpasswd.8
 MAN5=		netustad.conf.5
 
+USE_RC_SUBR=	yes
+SED_SCRIPT+=    -e '{ s,%%PREFIX%%,${PREFIX},g; }'
+
+post-build:
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/netustad.sh >${WRKDIR}/netustad.sh
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/netustadctl >${WRKDIR}/netustadctl
+
 post-install:
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g'
-	@${INSTALL_SCRIPT} ${FILESDIR}/netustad.sh.sample ${PREFIX}/etc/rc.d/
+	@${CAT} ${PKGMESSAGE} | ${SED} ${SED_SCRIPT}
+	${INSTALL_SCRIPT} ${WRKDIR}/netustad.sh ${PREFIX}/etc/rc.d/
+	${INSTALL_SCRIPT} ${WRKDIR}/netustadctl ${PREFIX}/sbin
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES	${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING	${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/FAQ		${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/GPL-License	${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL	${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/THANKS	${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO		${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netustad/distinfo b/net-mgmt/netustad/distinfo
index e8b0618272a9..b1cc865badd7 100644
--- a/net-mgmt/netustad/distinfo
+++ b/net-mgmt/netustad/distinfo
@@ -1,2 +1,2 @@
-MD5 (netustad-0.1.1.tar.gz) = 5446b002d68367239867d4e29f039d81
-SIZE (netustad-0.1.1.tar.gz) = 39334
+MD5 (netustad-0.2-BETA.tar.gz) = 7d17d20783ab2a9d09df1f7d5daae7f8
+SIZE (netustad-0.2-BETA.tar.gz) = 54906
diff --git a/net-mgmt/netustad/files/netustad.sh.sample b/net-mgmt/netustad/files/netustad.sh
index 881833ac0ad7..7048d90f26f3 100644
--- a/net-mgmt/netustad/files/netustad.sh.sample
+++ b/net-mgmt/netustad/files/netustad.sh
@@ -16,7 +16,7 @@
 
 unset rcNG
 name="netustad"
-command=/usr/local/sbin/netustad
+command=%%PREFIX%%/sbin/netustad
 extra_commands=reload
 reload_cmd="killall -HUP ${name}"
 stop_cmd="killall ${name}"
@@ -24,8 +24,8 @@ stop_cmd="killall ${name}"
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr && rcNG=yes
 else
-	if [ -f /usr/local/etc/rc.subr ]; then
-		. /usr/local/etc/rc.subr && rcNG=yes
+	if [ -f %%PREFIX%%/etc/rc.subr ]; then
+		. %%PREFIX%%/etc/rc.subr && rcNG=yes
 	fi
 fi
 
diff --git a/net-mgmt/netustad/files/netustadctl b/net-mgmt/netustad/files/netustadctl
new file mode 100644
index 000000000000..bec5fbef4c31
--- /dev/null
+++ b/net-mgmt/netustad/files/netustadctl
@@ -0,0 +1,30 @@
+#!/bin/csh
+######################################
+# netustadctl: netUstad ConTroLler #
+######################################
+
+set prefix="%%PREFIX%%"
+
+switch ($1)
+	case start:
+		$prefix/sbin/netustad
+		breaksw
+	case stop:
+		killall netustad
+		breaksw
+	case reload:
+		killall -HUP netustad
+		echo ""
+		echo "netUstad configuration reloaded"
+		echo ""
+		breaksw
+	case restart:
+		killall netustad
+		$prefix/sbin/netustad
+		breaksw
+	default:
+		echo ""
+		echo "usage: netustadctl start|stop|restart|reload"
+		echo ""
+		exit 64
+endsw
diff --git a/net-mgmt/netustad/pkg-descr b/net-mgmt/netustad/pkg-descr
index 5ead952f42f2..5389188b3b82 100644
--- a/net-mgmt/netustad/pkg-descr
+++ b/net-mgmt/netustad/pkg-descr
@@ -15,6 +15,8 @@ network services (routing tables, network interfaces)
 Project Page:
 WWW: http://www.enderunix.org/netustad
 
-- Ozkan KIRIK
-ozkan@enderunix.org
-EnderUNIX SDT @ Turkey
+Author: 
+      Ozkan KIRIK
+  ozkan@enderunix.org
+ EnderUNIX SDT @ Turkey
+http://www.enderunix.org/
diff --git a/net-mgmt/netustad/pkg-plist b/net-mgmt/netustad/pkg-plist
index dc2be8a91653..79124b563694 100644
--- a/net-mgmt/netustad/pkg-plist
+++ b/net-mgmt/netustad/pkg-plist
@@ -1,32 +1,61 @@
 sbin/netustad
 sbin/netustadctl
 sbin/netustadpasswd
-etc/rc.d/netustad.sh.sample
-@unexec if [ -f %D/etc/rc.d/netustad.sh ]; then rm -f %D/etc/rc.d/netustad.sh; fi
+etc/rc.d/netustad.sh
 @unexec if cmp -s %D/etc/netustad.conf %D/etc/netustad.conf-dist; then rm -f %D/etc/netustad.conf; fi
 etc/netustad.conf-dist
 @exec [ -f %B/netustad.conf ] || cp %B/%f %B/netustad.conf
 %%DATADIR%%/script/English
-%%DATADIR%%/script/Turkce
 %%DATADIR%%/script/action1.inc
 %%DATADIR%%/script/action2.inc
 %%DATADIR%%/script/addform
 %%DATADIR%%/script/addrule.inc
 %%DATADIR%%/script/authform
-%%DATADIR%%/script/bg.png
-%%DATADIR%%/script/delete.jpg
 %%DATADIR%%/script/edit-parse
 %%DATADIR%%/script/editform
 %%DATADIR%%/script/editrule.inc
+%%DATADIR%%/script/footer
+%%DATADIR%%/script/header
 %%DATADIR%%/script/intf-parse
-%%DATADIR%%/script/loginform.inc
+%%DATADIR%%/script/loadindex
 %%DATADIR%%/script/maketable
 %%DATADIR%%/script/netustad.css
 %%DATADIR%%/script/proto.inc
 %%DATADIR%%/script/ruleoption1.inc
 %%DATADIR%%/script/ruleoption2.inc
+%%DATADIR%%/script/service-parse
 %%DATADIR%%/script/showrule
 %%DATADIR%%/script/static-parse
+%%DATADIR%%/script/images/action_allow.png
+%%DATADIR%%/script/images/action_checkstate.png
+%%DATADIR%%/script/images/action_count.png
+%%DATADIR%%/script/images/action_deny.png
+%%DATADIR%%/script/images/action_divert.png
+%%DATADIR%%/script/images/action_forward.png
+%%DATADIR%%/script/images/action_pipequeue.png
+%%DATADIR%%/script/images/action_skipto.png
+%%DATADIR%%/script/images/action_tee.png
+%%DATADIR%%/script/images/action_unreach.png
+%%DATADIR%%/script/images/banner-alt.png
+%%DATADIR%%/script/images/banner.png
+%%DATADIR%%/script/images/bg.png
+%%DATADIR%%/script/images/btn_bg.png
+%%DATADIR%%/script/images/buton_0.png
+%%DATADIR%%/script/images/buton_1.png
+%%DATADIR%%/script/images/buton_2.png
+%%DATADIR%%/script/images/buton_3.png
+%%DATADIR%%/script/images/buton_4.png
+%%DATADIR%%/script/images/buton_5.png
+%%DATADIR%%/script/images/buton_6.png
+%%DATADIR%%/script/images/buton_7.png
+%%DATADIR%%/script/images/editor.png
+%%DATADIR%%/script/images/editor_static.png
+%%DATADIR%%/script/images/eraser.png
+%%DATADIR%%/script/images/eraser_static.png
+%%DATADIR%%/script/images/menu_addrule.png
+%%DATADIR%%/script/images/menu_login.png
+%%DATADIR%%/script/images/menu_logout.png
+%%DATADIR%%/script/images/menu_rulelist.png
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -34,6 +63,7 @@ etc/netustad.conf-dist
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+@dirrm %%DATADIR%%/script/images
 @dirrm %%DATADIR%%/script
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%