- fix PORTOPTION s/:MWITH_MYSQL/:MMYSQL/

- rename OPTION POSTGRESQL -> PGSQL
- USES shebangfix
- use new LIB_DEPENSD notation
- enable staging
- bump PORTREVISION

2 files changed, 117 insertions, 137 deletions

diff --git a/net-mgmt/netams/Makefile b/net-mgmt/netams/Makefile
index ff299e35edb6..a677c8b90e08 100644
--- a/net-mgmt/netams/Makefile
+++ b/net-mgmt/netams/Makefile
@@ -3,73 +3,67 @@
 
 PORTNAME=	netams
 PORTVERSION=	3.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netams.com/files/
 
 MAINTAINER=	jura@netams.com
 COMMENT=	Network Traffic Accounting and Monitoring Software
 
-LIB_DEPENDS=	pcap.1:${PORTSDIR}/net/libpcap
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
 
 SSP_UNSAFE=	kernel module does not support ssp
 USE_SUBMAKE=	yes
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	netams
-MANCOMPRESSED=	no
+USES=		shebangfix
+SHEBANG_LANG=	perl
+SHEBANG_FILES=	cgi-bin/*.cgi cgi-bin/*.pl \
+		cgi-bin/admin/*.cgi addon/*.pl
 
-OPTIONS_DEFINE=	DEBUG CGI
+OPTIONS_DEFINE=		DEBUG CGI
 OPTIONS_DEFAULT=	MYSQL
-OPTIONS_MULTI=	DATABASE
-OPTIONS_MULTI_DATABASE=	MYSQL POSTGRESQL
-DEBUG_DESC=	Build with debug symbols
-MYSQL_DESC=	Build with MySQL storage support
-POSTGRESQL_DESC=	Build with PostgreSQL storage support
+OPTIONS_MULTI=		DATABASE
+OPTIONS_MULTI_DATABASE=	MYSQL PGSQL
+
 CGI_DESC=	Install admin/user CGI scripts
 
+OPTIONS_SUB=	yes
+PGSQL_USE=	PGSQL=yes
+MYSQL_USE=	MYSQL=yes
+
+.include <bsd.port.options.mk>
+
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		PREFIX="${PREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
 		REALCURDIR="${.CURDIR}"
 
-ADMINCGI=	.htaccess index.cgi policy.cgi showusercard.cgi user.cgi  \
-		access.cgi login.cgi quota.cgi showusercard.tmpl view.cgi \
-		account.cgi netams.cgi radius.cgi subplan.cgi config.cgi  \
-		plan.cgi russian.res unit.cgi cardtool.cgi graph.cgi \
-		monitor.cgi rrdgraph.cgi statistic.cgi
-USERCGI=	.htaccess config.cgi netams_api.pl russian.res \
-		netams_example.cgi usertool.cgi admintool.cgi login.cgi \
-		netams_graph.cgi activate.cgi activate.tmpl netams_html.cgi \
-		statistic.pl
-IMAGES=		logo_sm.jpg admintool-logo.gif showtable-logo.gif rrdgraph-logo.gif
-MAN8=		netams.8 flowprobe.8 netamsctl.8
+SBIN_FILES=	ascii2netflow flowprobe ipfw2netflow
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+ADDONS=		.netamsctl.rc netams-apache-freebsd.conf \
+		snmp2netams.pl ua-networks-get.sh
 
-.if ${PORT_OPTIONS:MPOSTGRESQL}
-USE_PGSQL=		yes
-PLIST_SUB+=		POSTGRESQL=""
-.else
-PLIST_SUB+=		POSTGRESQL="@comment "
-.endif
+ADMINCGI=	.htaccess access.cgi account.cgi cardtool.cgi config.cgi \
+		graph.cgi index.cgi login.cgi monitor.cgi netams.cgi \
+		plan.cgi policy.cgi quota.cgi radius.cgi rrdgraph.cgi \
+		russian.res showusercard.cgi showusercard.tmpl \
+		statistic.cgi subplan.cgi unit.cgi user.cgi view.cgi
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
-BROKEN_WITH_MYSQL=	323
-PLIST_SUB+=		MYSQL=""
-.else
-PLIST_SUB+=		MYSQL="@comment "
-.endif
+USERCGI=	.htaccess activate.cgi activate.tmpl admintool.cgi config.cgi \
+		login.cgi netams_api.pl netams_example.cgi netams_graph.cgi \
+		netams_html.cgi russian.res statistic.pl usertool.cgi
 
-.if ${PORT_OPTIONS:MPOSTGRESQL} && ${PORT_OPTIONS:MCGI}
-RUN_DEPENDS+=		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-.endif
+IMAGES=		logo_sm.jpg admintool-logo.gif showtable-logo.gif rrdgraph-logo.gif
 
-.if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MCGI}
-RUN_DEPENDS+=		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-.endif
+ORA_FILES=	netams.sh netams_drop.sql netams_tb.sql netams_tg.sql netams_ts.sql
+
+PGSQL_FILES=	cardtool_schema-Pg.sql postgresql_schema.sql
+
+MAN_8=		netams.8 flowprobe.8 netamsctl.8
 
 .if ${PORT_OPTIONS:MCGI}
 RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
@@ -78,83 +72,66 @@ RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-Crypt-GeneratePassword>=0:${PORTSDIR}/security/p5-Crypt-GeneratePassword
-LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd \
-		jpeg:${PORTSDIR}/graphics/jpeg
-PLIST_SUB+=	CGI=""
-.else
-PLIST_SUB+=	CGI="@comment "
-.endif
+
+LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg
+
+. if ${PORT_OPTIONS:MPGSQL}
+RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+. endif
+
+. if ${PORT_OPTIONS:MMYSQL}
+RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+. endif
+.endif # CGI
 
 pre-patch:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	@${REINPLACE_CMD} -e 's|.*sh configure.sh|& -nodebug|' \
 		${WRKSRC}/Makefile
 .endif
-.if ! ${PORT_OPTIONS:MPOSTGRESQL}
+
+.if ! ${PORT_OPTIONS:MPGSQL}
 	@${REINPLACE_CMD} -e 's|locate_file "libpq\.so".*|v1="" \&\& v2=""|' \
 		${WRKSRC}/configure.sh
 .endif
-.if ${PORT_OPTIONS:MWITH_MYSQL}
-	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!/usr/local/bin/perl|' ${WRKSRC}/addon/mysql_rotate.pl
-.else
+
+.if ! ${PORT_OPTIONS:MMYSQL}
 	@${REINPLACE_CMD} -e 's|locate_file "libmysqlclient\.so".*|v1="" \&\& v2=""|' \
-		${WRKSRC}/configure.sh
-	@${REINPLACE_CMD} -e 's|locate_file "libmysqlclient\.a".*|v1="" \&\& v2=""|' \
+		-e 's|locate_file "libmysqlclient\.a".*|v1="" \&\& v2=""|' \
 		${WRKSRC}/configure.sh
 .endif
-	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!/usr/local/bin/perl|' ${WRKSRC}/addon/snmp2netams.pl
 	@${REINPLACE_CMD} -e 's|locate_file "libglib-2\.0\.so".*|v1="" \&\& v2="" \&\& v3=""|' \
-		${WRKSRC}/configure.sh
-	@${REINPLACE_CMD} -e 's|locate_file "openssl/md5\.h".*|v1=""|' \
-		${WRKSRC}/configure.sh
+		-e 's|locate_file "openssl/md5\.h".*|v1=""|' ${WRKSRC}/configure.sh
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/netams ${PREFIX}/libexec/netams
-	${INSTALL_PROGRAM} ${WRKSRC}/src/flowprobe ${PREFIX}/sbin/flowprobe
-	${INSTALL_PROGRAM} ${WRKSRC}/src/ipfw2netflow ${PREFIX}/sbin/ipfw2netflow
-	${INSTALL_PROGRAM} ${WRKSRC}/src/ascii2netflow ${PREFIX}/sbin/ascii2netflow
-	${INSTALL_PROGRAM} ${WRKSRC}/src/netamsctl ${PREFIX}/bin/netamsctl
-	${MKDIR} ${DATADIR} ${DATADIR}/tools ${DATADIR}/tools/oracle
-	${INSTALL_DATA} ${WRKSRC}/addon/netams.conf ${PREFIX}/etc/netams.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/addon/ru-networks.txt ${DATADIR}/ru-networks.txt.sample
-	${INSTALL_DATA} ${WRKSRC}/addon/ua-networks.txt ${DATADIR}/ua-networks.txt.sample
-	${INSTALL_DATA} ${WRKSRC}/addon/.netamsctl.rc ${DATADIR}/.netamsctl.rc
+	@${MKDIR} ${STAGEDIR}${DATADIR}/tools/oracle
+	${INSTALL_DATA} ${WRKSRC}/addon/netams.conf ${STAGEDIR}${PREFIX}/etc/netams.conf.sample
+	${INSTALL_PROGRAM} ${SBIN_FILES:S|^|${WRKSRC}/src/|} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/netams ${STAGEDIR}${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/src/netamsctl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${ADDONS:S|^|${WRKSRC}/addon/|} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/addon/ru-networks.txt ${STAGEDIR}${DATADIR}/ru-networks.txt.sample
+	${INSTALL_DATA} ${WRKSRC}/addon/ua-networks.txt ${STAGEDIR}${DATADIR}/ua-networks.txt.sample
+	${INSTALL_DATA} ${ORA_FILES:S|^|${WRKSRC}/addon/oracle/|} ${STAGEDIR}${DATADIR}/tools/oracle
+	${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/billing_users_table.sql ${STAGEDIR}${DATADIR}/tools
+
 .if ${PORT_OPTIONS:MMYSQL}
-	${INSTALL_DATA} ${WRKSRC}/addon/mysql_rotate.pl ${DATADIR}/mysql_rotate.pl
-	${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema.sql ${DATADIR}/tools/cardtool_schema.sql
+	${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema.sql ${STAGEDIR}${DATADIR}/tools
+	${INSTALL_DATA} ${WRKSRC}/addon/mysql_rotate.pl ${STAGEDIR}${DATADIR}
 .endif
-.if ${PORT_OPTIONS:MPOSTGRESQL}
-	${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema-Pg.sql ${DATADIR}/tools/cardtool_schema-Pg.sql
-	${INSTALL_DATA} ${WRKSRC}/addon/postgresql_schema.sql ${DATADIR}/tools/postgresql_schema.sql
+
+.if ${PORT_OPTIONS:MPGSQL}
+	${INSTALL_DATA} ${PGSQL_FILES:S|^|${WRKSRC}/addon/|} ${STAGEDIR}${DATADIR}/tools
 .endif
-	${INSTALL_DATA} ${WRKSRC}/addon/snmp2netams.pl ${DATADIR}/snmp2netams.pl
-	${INSTALL_DATA} ${WRKSRC}/addon/ua-networks-get.sh ${DATADIR}/ua-networks-get.sh
-	${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/billing_users_table.sql ${DATADIR}/tools/billing_users_table.sql
-	${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams.sh ${DATADIR}/tools/oracle/netams.sh
-	${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_drop.sql ${DATADIR}/tools/oracle/netams_drop.sql
-	${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_tb.sql ${DATADIR}/tools/oracle/netams_tb.sql
-	${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_tg.sql ${DATADIR}/tools/oracle/netams_tg.sql
-	${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_ts.sql ${DATADIR}/tools/oracle/netams_ts.sql
-	${INSTALL_DATA} ${WRKSRC}/addon/netams-apache-freebsd.conf ${DATADIR}/netams-apache-freebsd.conf
+
 .if ${PORT_OPTIONS:MCGI}
-	${MKDIR} ${WWWDIR} ${WWWDIR}/cgi-bin ${WWWDIR}/cgi-bin/admin ${WWWDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/addon/index.html ${WWWDIR}/index.html
-	${INSTALL_DATA} ${WRKSRC}/addon/netams.js ${WWWDIR}/netams.js
-.for f in ${IMAGES}
-	${INSTALL_DATA} ${WRKSRC}/cgi-bin/images/${f} ${WWWDIR}/images/
-.endfor
-.for f in ${USERCGI}
-	${INSTALL_PROGRAM} ${WRKSRC}/cgi-bin/${f} ${WWWDIR}/cgi-bin/
-.endfor
-.for f in ${ADMINCGI}
-	${INSTALL_PROGRAM} ${WRKSRC}/cgi-bin/admin/${f} ${WWWDIR}/cgi-bin/admin/
-.endfor
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin/admin ${STAGEDIR}${WWWDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/addon/index.html ${WRKSRC}/addon/netams.js ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${IMAGES:S|^|${WRKSRC}/cgi-bin/images/|} ${STAGEDIR}${WWWDIR}/images
+	${INSTALL_PROGRAM} ${USERCGI:S|^|${WRKSRC}/cgi-bin/|} ${STAGEDIR}${WWWDIR}/cgi-bin
+	${INSTALL_PROGRAM} ${ADMINCGI:S|^|${WRKSRC}/cgi-bin/admin/|} ${STAGEDIR}${WWWDIR}/cgi-bin/admin
 .endif
-.for f in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/doc/${f} ${PREFIX}/man/man8/
-.endfor
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_MAN} ${MAN_8:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${PREFIX}/man/man8
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/netams/pkg-plist b/net-mgmt/netams/pkg-plist
index f41cf10ea9d4..d2dcbe0138b1 100644
--- a/net-mgmt/netams/pkg-plist
+++ b/net-mgmt/netams/pkg-plist
@@ -1,65 +1,68 @@
+bin/netamsctl
+etc/netams.conf.sample
 libexec/netams
+man/man8/flowprobe.8.gz
+man/man8/netams.8.gz
+man/man8/netamsctl.8.gz
+sbin/ascii2netflow
 sbin/flowprobe
 sbin/ipfw2netflow
-sbin/ascii2netflow
-bin/netamsctl
-etc/netams.conf.sample
-%%DATADIR%%/ru-networks.txt.sample
-%%DATADIR%%/ua-networks.txt.sample
 %%DATADIR%%/.netamsctl.rc
-%%DATADIR%%/netams-apache-freebsd.conf
 %%MYSQL%%%%DATADIR%%/mysql_rotate.pl
+%%DATADIR%%/netams-apache-freebsd.conf
+%%DATADIR%%/ru-networks.txt.sample
 %%DATADIR%%/snmp2netams.pl
-%%DATADIR%%/ua-networks-get.sh
-%%POSTGRESQL%%%%DATADIR%%/tools/cardtool_schema-Pg.sql
-%%POSTGRESQL%%%%DATADIR%%/tools/postgresql_schema.sql
-%%MYSQL%%%%DATADIR%%/tools/cardtool_schema.sql
 %%DATADIR%%/tools/billing_users_table.sql
+%%PGSQL%%%%DATADIR%%/tools/cardtool_schema-Pg.sql
+%%MYSQL%%%%DATADIR%%/tools/cardtool_schema.sql
 %%DATADIR%%/tools/oracle/netams.sh
 %%DATADIR%%/tools/oracle/netams_drop.sql
 %%DATADIR%%/tools/oracle/netams_tb.sql
 %%DATADIR%%/tools/oracle/netams_tg.sql
 %%DATADIR%%/tools/oracle/netams_ts.sql
+%%PGSQL%%%%DATADIR%%/tools/postgresql_schema.sql
+%%DATADIR%%/ua-networks-get.sh
+%%DATADIR%%/ua-networks.txt.sample
 %%CGI%%%%WWWDIR%%/cgi-bin/.htaccess
-%%CGI%%%%WWWDIR%%/cgi-bin/config.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/netams_api.pl
-%%CGI%%%%WWWDIR%%/cgi-bin/russian.res
-%%CGI%%%%WWWDIR%%/cgi-bin/netams_example.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/usertool.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admintool.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/login.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/netams_graph.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/activate.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/activate.tmpl
-%%CGI%%%%WWWDIR%%/cgi-bin/netams_html.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/statistic.pl
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/.htaccess
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/index.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/policy.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/showusercard.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/user.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/access.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/login.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/quota.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/showusercard.tmpl
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/view.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/account.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/netams.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/radius.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/subplan.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/config.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/plan.cgi
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/russian.res
-%%CGI%%%%WWWDIR%%/cgi-bin/admin/unit.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/cardtool.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/config.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/graph.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/index.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/login.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/monitor.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/netams.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/plan.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/policy.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/quota.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/radius.cgi
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/rrdgraph.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/russian.res
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/showusercard.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/showusercard.tmpl
 %%CGI%%%%WWWDIR%%/cgi-bin/admin/statistic.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/subplan.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/unit.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/user.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admin/view.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/admintool.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/config.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/login.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/netams_api.pl
+%%CGI%%%%WWWDIR%%/cgi-bin/netams_example.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/netams_graph.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/netams_html.cgi
+%%CGI%%%%WWWDIR%%/cgi-bin/russian.res
+%%CGI%%%%WWWDIR%%/cgi-bin/statistic.pl
+%%CGI%%%%WWWDIR%%/cgi-bin/usertool.cgi
 %%CGI%%%%WWWDIR%%/images/admintool-logo.gif
 %%CGI%%%%WWWDIR%%/images/logo_sm.jpg
-%%CGI%%%%WWWDIR%%/images/showtable-logo.gif
 %%CGI%%%%WWWDIR%%/images/rrdgraph-logo.gif
+%%CGI%%%%WWWDIR%%/images/showtable-logo.gif
 %%CGI%%%%WWWDIR%%/index.html
 %%CGI%%%%WWWDIR%%/netams.js
 %%CGI%%@dirrm %%WWWDIR%%/images
@@ -68,4 +71,4 @@ etc/netams.conf.sample
 %%CGI%%@dirrm %%WWWDIR%%
 @dirrm %%DATADIR%%/tools/oracle
 @dirrm %%DATADIR%%/tools
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%