Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/sixxs-aiccu/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile	1 Jul 2010 04:43:36 -0000	1.12
+++ Makefile	19 Jul 2010 18:57:01 -0000
@@ -9,7 +9,8 @@
 PORTVERSION=	20070115
 PORTREVISION=	1
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://noc.sixxs.net/archive/sixxs/aiccu/unix/
+MASTER_SITES=	http://noc.sixxs.net/archive/sixxs/aiccu/unix/ \
+		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 PKGNAMEPREFIX=	sixxs-
 DISTNAME=	aiccu_20070115
 
Index: files/sixxs-aiccu.in
===================================================================
RCS file: /home/ncvs/ports/net/sixxs-aiccu/files/sixxs-aiccu.in,v
retrieving revision 1.2
diff -u -u -r1.2 sixxs-aiccu.in
--- files/sixxs-aiccu.in	27 Mar 2010 00:14:04 -0000	1.2
+++ files/sixxs-aiccu.in	19 Jul 2010 18:57:01 -0000
@@ -14,17 +14,29 @@
 
 . /etc/rc.subr
 
-name=sixxs_aiccu
-rcvar=`set_rcvar`
+name="sixxs_aiccu"
+rcvar=${name}_enable
 
 command="%%PREFIX%%/sbin/sixxs-aiccu"
-command_args=%%PREFIX%%/etc/aiccu.conf
-start_cmd="%%PREFIX%%/sbin/sixxs-aiccu start $command_args"
-stop_cmd="%%PREFIX%%/sbin/sixxs-aiccu stop $command_args"
-required_files=%%PREFIX%%/etc/aiccu.conf
 
-# set default
-sixxs_aiccu_enable=${sixxs_aiccu_enable:-"NO"}
+load_rc_config $name
+
+: ${sixxs_aiccu_enable="NO"}
+: ${sixxs_aiccu_config="%%PREFIX%%/etc/aiccu.conf"}
+
+command_args="${sixxs_aiccu_config}"
+
+extra_commands="brokers tunnels test autotest license version"
+
+start_cmd="${command} start $command_args"
+stop_cmd="${command} stop $command_args"
+brokers_cmd="${command} brokers"
+tunnels_cmd="${command} tunnels $command_args"
+test_cmd="${command} test $command_args"
+autotest_cmd="${command} autotest $command_args"
+license_cmd="${command} license"
+version_cmd="${command} version"
+required_files="%%PREFIX%%/etc/aiccu.conf"
+
 
-load_rc_config ${name}
 run_rc_command "$1"