- Update to 3.2.1

PR:		ports/76581
Submitted by:	Yuriy N. Shkandybin <jura@netams.com> (maintainer)

8 files changed, 87 insertions, 311 deletions

diff --git a/net-mgmt/netams/Makefile b/net-mgmt/netams/Makefile
index d465c98aaee9..7e4fed6b09bb 100644
--- a/net-mgmt/netams/Makefile
+++ b/net-mgmt/netams/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	netams
-PORTVERSION=	3.1
-PORTREVISION=	3
+PORTVERSION=	3.2.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netams.com/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.1830
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jura@netams.com
 COMMENT=	Network Traffic Accounting and Monitoring Software
 
 USE_SUBMAKE=	yes
-MAN8=		netams.8 flowprobe.8
+MAN8=		netams.8 flowprobe.8 netamsctl.8
 MANCOMPRESSED=	no
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
@@ -24,57 +23,44 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
 		REALCURDIR="${.CURDIR}" \
-		WITH_MYSQL="${WITH_MYSQL}" \
-		WITH_MYSQL40="${WITH_MYSQL40}" \
-		WITH_MYSQL41="${WITH_MYSQL41}" \
-		WITH_POSTGRESQL="${WITH_POSTGRESQL}" \
-		WITH_DEBUG="${WITH_DEBUG}"
 
 .include <bsd.port.pre.mk>
 
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.netams
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
 FLAGS += ${PTHREAD_CFLAGS}
 LIB += ${PTHREAD_LIBS}
 
-MAKE_ENV+=	DEFINE="${DEFINE}" FLAGS="${FLAGS}" LIB="${LIB}"
+#MAKE_ENV+=	DEFINE="${DEFINE}" FLAGS="${FLAGS}" LIB="${LIB}"
 
 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/netamsctl ${PREFIX}/bin/netamsctl
-	@ ${INSTALL_DATA} ${WRKSRC}/addon/netams.cfg ${PREFIX}/etc/netams.conf.sample
-	@ ${INSTALL_SCRIPT} ${FILESDIR}/netams.sh ${PREFIX}/etc/rc.d/netams.sh.sample
+	@ ${INSTALL_DATA} ${WRKSRC}/addon/netams.cfg ${PREFIX}/etc/netams.cfg.sample
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/addon/netams-startup.sh ${PREFIX}/etc/rc.d/netams-startup.sh.sample
 	@ ${INSTALL_MAN} ${WRKSRC}/doc/netams.8 ${PREFIX}/man/man8
 	@ ${INSTALL_MAN} ${WRKSRC}/doc/flowprobe.8 ${PREFIX}/man/man8
-	@ ${MKDIR} ${EXAMPLESDIR}/cgi-bin
-	@ ${MKDIR} ${EXAMPLESDIR}/cgi-bin/images
-	@ ${INSTALL_DATA} ${WRKSRC}/addon/.netamsctl.rc ${EXAMPLESDIR}/
-.for example in netams-nat-network.cfg netams-netflow.cfg netams.cfg netams-simple.cfg netams-quotactl.cfg
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/${example} ${EXAMPLESDIR}/
-.endfor
-.for image in logo.gif logo-small.gif admintool-logo.gif
-	@ ${INSTALL_DATA} ${WRKSRC}/cgi-bin/images/${image} ${EXAMPLESDIR}/cgi-bin/images/
+	@ ${INSTALL_MAN} ${WRKSRC}/doc/netamsctl.8 ${PREFIX}/man/man8
+	@ ${MKDIR} ${DATADIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/addon/ru-networks.txt ${DATADIR}/ru-networks.txt.sample
+	@ ${INSTALL_DATA} ${WRKSRC}/addon/.netamsctl.rc ${DATADIR}
+	@ ${MKDIR} ${DATADIR}/cgi-bin
+	@ ${MKDIR} ${DATADIR}/cgi-bin/admin
+	@ ${MKDIR} ${DATADIR}/cgi-bin/images
+.for image in logo.gif logo-small.gif admintool-logo.gif showtable-logo.gif
+	@ ${INSTALL_DATA} ${WRKSRC}/cgi-bin/images/${image} ${DATADIR}/cgi-bin/images/
 .endfor
-.for cgi in netams_api.pl netams_graph.cgi weblogin.tem netams_example.cgi weblogin.cgi admintool.cgi login.cgi
-	 @ ${INSTALL_DATA} ${WRKSRC}/cgi-bin/${cgi} ${EXAMPLESDIR}/cgi-bin/
+.for cgi in .htaccess config.cgi netams_api.pl russian.res weblogin.tem netams_example.cgi \
+	usertool.cgi admintool.cgi login.cgi netams_graph.cgi weblogin.cgi
+	 @ ${INSTALL_DATA} ${WRKSRC}/cgi-bin/${cgi} ${DATADIR}/cgi-bin/
 .endfor
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-.for doc in documentation-en.html diagram-1.gif net-1-1a.gif net-1-2a.gif net-1-3a.gif logo.gif
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR}/
+.for cgi in .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
+	@ ${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/${cgi} ${DATADIR}/cgi-bin/admin/
 .endfor
-.endif
 
 post-install:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message|${SED} 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g'
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message|${SED} 's|%%DATADIR%%|${DATADIR}|g'
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/netams/distinfo b/net-mgmt/netams/distinfo
index 95fe5e4e0933..e9892ea450e3 100644
--- a/net-mgmt/netams/distinfo
+++ b/net-mgmt/netams/distinfo
@@ -1,2 +1,2 @@
-MD5 (netams-3.1.1830.tar.gz) = 77b2c1ff9b955e591da2928588dcdb77
-SIZE (netams-3.1.1830.tar.gz) = 316191
+MD5 (netams-3.2.1.tar.gz) = 2c559534077270fbd4892a789275f074
+SIZE (netams-3.2.1.tar.gz) = 202100
diff --git a/net-mgmt/netams/files/netams.sh b/net-mgmt/netams/files/netams.sh
deleted file mode 100644
index 1df303d575ff..000000000000
--- a/net-mgmt/netams/files/netams.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-
-start)
-	sleep 3;
-        /bin/mkdir -p /var/run/netams
-        if [ -x /usr/local/libexec/netams ]; then
-		if [ -f /usr/local/etc/netams.conf ]; then
-                	/usr/local/libexec/netams -lf /usr/local/etc/netams.conf >/dev/null && echo -n ' NetAMS'
-        	fi
-	fi
-        ;;
-
-stop)
-        killall netams
-	rmdir /var/run/netams
-        ;;
-*)
-        echo "$0 start | stop"
-        ;;
-
-esac
-
-
-
diff --git a/net-mgmt/netams/files/patch-Makefile b/net-mgmt/netams/files/patch-Makefile
deleted file mode 100644
index 2e55703a667e..000000000000
--- a/net-mgmt/netams/files/patch-Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
---- Makefile.orig	Thu May  6 14:37:08 2004
-+++ Makefile	Tue Aug 17 11:35:46 2004
-@@ -10,11 +10,11 @@
- # $Id: Makefile,v 1.25.2.7 2004/05/06 10:37:08 jura Exp $
- ##########################################################################
- # for FreeBSD, uncomment this
--DEFINE = -DFREEBSD -D_THREAD_SAFE
-+DEFINE += -DFREEBSD
--LIB = -lpcap -lcrypt -lz
-+LIB += -lpcap -lcrypt -lz
- #
- # For FreeBSD-4.x uncomment this
--LIB += -pthread
-+# LIB += -pthread
- # For FreeBSD-5.x uncomment this
- # LIB += -lc_r
- #
-@@ -22,8 +22,8 @@
- # DEFINE+= -DUSE_HASH
- #
- # MySQL storage support
--DEFINE += -DUSE_MYSQL
--LIB += -lmysqlclient -L/usr/local/lib/mysql
-+# DEFINE += -DUSE_MYSQL
-+# LIB += -lmysqlclient -L/usr/local/lib/mysql
- #
- # PostgreSQL storage support
- # DEFINE += -DUSE_POSTGRES
-@@ -53,14 +53,14 @@
- # DEFINE += -DIPTBL_NONE
- ##########################################################################
- # Define here a PATH variables
--PATH_TO_CONFIG="/usr/local/etc/netams.cfg"
-+PATH_TO_CONFIG="${PREFIX}/etc/netams.conf"
- PATH_TO_LOG="/var/log/netams.log"
- # 
- # Uncomment this if you want to log dropped packets
- # DEFINE += -DLOG_DROP
- # Uncomment this if you want to enable debug features 
--DEFINE += -DDEBUG
--FLAGS += -g -Wall
-+# DEFINE += -DDEBUG
-+# FLAGS += -g -Wall
- # Uncomment this if you want to enable profiler support
- # LIB += -lm -pg
- # FLAGS += -pg
-@@ -81,7 +81,7 @@
-  flowmodule.h versions.sh versions_build.dat
- 
- CC	= g++
--INCLUDE=/usr/local/include
-+INCLUDE = ${LOCALBASE}/include
- OBJ	= $(SRC:.c=.o)
- CFLAGS	= $(FLAGS) -I$(INCLUDE) $(DEFINE)
diff --git a/net-mgmt/netams/pkg-descr b/net-mgmt/netams/pkg-descr
index 0c3ccce4d17e..8b2238d66d2f 100644
--- a/net-mgmt/netams/pkg-descr
+++ b/net-mgmt/netams/pkg-descr
@@ -1,9 +1,10 @@
-NeTAMS is a Network Traffic Accounting and Monitoring Software. 
-It runs as a daemon under FreeBSD and Linux operating systems. 
-Collects an IP traffic information flowing via your PC/UNIX or Cisco router, 
-filters it, aggregates, stores onto HASH/SQL database, 
-and makes SMTP/HTML reports to site administrator.
-Anoter features are flexible policy targets, firewalling, access control,  
-quotas, scheduler and much much more.
+NeTAMS stands for Network Traffic Accounting and Monitoring Software. 
+It is built for UNIX and works for networks with Cisco routers or PC Unix 
+routers (Linux/FreeBSD/Solaris). Several methods of traffic gathering are 
+supported (tee/divert/ip_queue/libpcap/netflow v5), database storage 
+(BerkleyDB/MySQL/PostgresSQL), aggregation, visualization, notification etc. 
+It is possible to block traffic based on quotas, authorization ID, empty 
+balance (billing); manage bandwidth, create a flexible accounting and 
+filtration policies.
 
 WWW: http://www.netams.com/
diff --git a/net-mgmt/netams/pkg-message b/net-mgmt/netams/pkg-message
index 145c670c4467..84c7fd02453f 100644
--- a/net-mgmt/netams/pkg-message
+++ b/net-mgmt/netams/pkg-message
@@ -1,15 +1,22 @@
 --------------------------------------------------------------------------
 
-The NetAMS package has been successfully installed.
+The NeTAMS package has been successfully installed.
 
 To use the programm, make a copy of %%PREFIX%%/etc/rc.d/netams.sh.sample under
-%%PREFIX%%/etc/rc.d/netams.sh and do: chmod +x %%PREFIX%%/etc/rc.d/netams.sh.
-Check %%EXAMPLESDIR%% for examples.
+%%PREFIX%%/etc/rc.d/netams.sh and do: 
+chmod +x %%PREFIX%%/etc/rc.d/netams.sh
+Check %%DATADIR%% and http://www.netams.com for examples.
 
 A sample configuration file has been installed to %%PREFIX%%/etc as
-"netams.conf.sample". This may be renamed to "netams.conf" and edited.
+"netams.cfg.sample". This may be renamed to "netams.cfg" and edited.
 
-In order to use the netamsctl programs, a user must copy 
-%%EXAMPLESDIR%%/.netamsctl.rc to home directory and edit.
+In order to use the netamsctl programs, you may copy 
+%%DATADIR%%/.netamsctl.rc to your home directory and edit it.
+
+By default, CGI scripts are NOT installed, as well as web server is NOT configured.
+You should do it yourself, and then copy entire %%DATADIR%%/cgi/ directory to appropriate place.
+
+And PLEASE READ THE DOCUMENTATION FIRST!
+http://www.netams.com
 
 --------------------------------------------------------------------------
diff --git a/net-mgmt/netams/pkg-plist b/net-mgmt/netams/pkg-plist
index 2b3e1357583d..cfacf16c535c 100644
--- a/net-mgmt/netams/pkg-plist
+++ b/net-mgmt/netams/pkg-plist
@@ -1,33 +1,45 @@
-@unexec if cmp -s %D/etc/netams.conf.sample %D/etc/netams.conf; then rm -f %D/etc/netams.conf; fi
-etc/netams.conf.sample
-etc/rc.d/netams.sh.sample
+etc/netams.cfg.sample
+etc/rc.d/netams-startup.sh.sample
 libexec/netams
 sbin/flowprobe
 sbin/ipfw2netflow
 bin/netamsctl
-%%PORTDOCS%%%%DOCSDIR%%/documentation-en.html
-%%PORTDOCS%%%%DOCSDIR%%/diagram-1.gif
-%%PORTDOCS%%%%DOCSDIR%%/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/net-1-1a.gif
-%%PORTDOCS%%%%DOCSDIR%%/net-1-2a.gif
-%%PORTDOCS%%%%DOCSDIR%%/net-1-3a.gif
-%%EXAMPLESDIR%%/netams-nat-network.cfg
-%%EXAMPLESDIR%%/netams-netflow.cfg
-%%EXAMPLESDIR%%/netams-simple.cfg
-%%EXAMPLESDIR%%/netams.cfg
-%%EXAMPLESDIR%%/netams-quotactl.cfg
-%%EXAMPLESDIR%%/.netamsctl.rc
-%%EXAMPLESDIR%%/cgi-bin/images/admintool-logo.gif
-%%EXAMPLESDIR%%/cgi-bin/images/logo-small.gif
-%%EXAMPLESDIR%%/cgi-bin/images/logo.gif
-%%EXAMPLESDIR%%/cgi-bin/netams_api.pl
-%%EXAMPLESDIR%%/cgi-bin/netams_example.cgi
-%%EXAMPLESDIR%%/cgi-bin/netams_graph.cgi
-%%EXAMPLESDIR%%/cgi-bin/weblogin.cgi
-%%EXAMPLESDIR%%/cgi-bin/weblogin.tem
-%%EXAMPLESDIR%%/cgi-bin/admintool.cgi
-%%EXAMPLESDIR%%/cgi-bin/login.cgi
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%/cgi-bin/images
-@dirrm %%EXAMPLESDIR%%/cgi-bin
-@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/ru-networks.txt.sample
+%%DATADIR%%/.netamsctl.rc
+%%DATADIR%%/cgi-bin/.htaccess
+%%DATADIR%%/cgi-bin/config.cgi
+%%DATADIR%%/cgi-bin/netams_api.pl
+%%DATADIR%%/cgi-bin/russian.res
+%%DATADIR%%/cgi-bin/weblogin.tem
+%%DATADIR%%/cgi-bin/netams_example.cgi
+%%DATADIR%%/cgi-bin/usertool.cgi
+%%DATADIR%%/cgi-bin/admintool.cgi
+%%DATADIR%%/cgi-bin/login.cgi
+%%DATADIR%%/cgi-bin/netams_graph.cgi
+%%DATADIR%%/cgi-bin/weblogin.cgi
+%%DATADIR%%/cgi-bin/admin/.htaccess
+%%DATADIR%%/cgi-bin/admin/index.cgi
+%%DATADIR%%/cgi-bin/admin/policy.cgi
+%%DATADIR%%/cgi-bin/admin/showusercard.cgi
+%%DATADIR%%/cgi-bin/admin/user.cgi
+%%DATADIR%%/cgi-bin/admin/access.cgi
+%%DATADIR%%/cgi-bin/admin/login.cgi
+%%DATADIR%%/cgi-bin/admin/quota.cgi
+%%DATADIR%%/cgi-bin/admin/showusercard.tmpl
+%%DATADIR%%/cgi-bin/admin/view.cgi
+%%DATADIR%%/cgi-bin/admin/account.cgi
+%%DATADIR%%/cgi-bin/admin/netams.cgi
+%%DATADIR%%/cgi-bin/admin/radius.cgi
+%%DATADIR%%/cgi-bin/admin/subplan.cgi
+%%DATADIR%%/cgi-bin/admin/config.cgi
+%%DATADIR%%/cgi-bin/admin/plan.cgi
+%%DATADIR%%/cgi-bin/admin/russian.res
+%%DATADIR%%/cgi-bin/admin/unit.cgi
+%%DATADIR%%/cgi-bin/images/admintool-logo.gif
+%%DATADIR%%/cgi-bin/images/logo-small.gif
+%%DATADIR%%/cgi-bin/images/logo.gif
+%%DATADIR%%/cgi-bin/images/showtable-logo.gif
+@dirrm %%DATADIR%%/cgi-bin/images
+@dirrm %%DATADIR%%/cgi-bin/admin
+@dirrm %%DATADIR%%/cgi-bin
+@dirrm %%DATADIR%%
diff --git a/net-mgmt/netams/scripts/configure.netams b/net-mgmt/netams/scripts/configure.netams
deleted file mode 100644
index f1d9c264d459..000000000000
--- a/net-mgmt/netams/scripts/configure.netams
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-
-if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
-        exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${BATCH}" ]; then
-	if [ "${WITH_MYSQL41}" ]; then
-		OPTIONS="${OPTIONS} \"MySQL41\""
-	elif [ "${WITH_MYSQL40}" ]; then
-		OPTIONS="${OPTIONS} \"MySQL40\""
-	elif [ "${WITH_MYSQL}" ]; then
-		OPTIONS="${OPTIONS} \"MySQL\""
-	fi
-	if [ "${WITH_POSTGRESQL}" ]; then
-		OPTIONS="${OPTIONS} \"PgSQL\""
-	fi
-	if [ "${WITH_HASH}" ]; then
-		OPTIONS="$OPTIONS} \"HASH\""
-	fi
-	if [ "${WITH_OPT}" ]; then
-		OPTIONS="${OPTIONS} \"OPTIMIZED\""
-	fi
-
-else
-	SET_MYSQL41="OFF"
-	SET_MYSQL40="OFF"
-	SET_MYSQL="OFF"
-	if [ "${WITH_MYSQL41}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so.14 ] ; then
-		SET_MYSQL41="ON"
-	elif [ "${WITH_MYSQL40}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so.12 ] ; then
-		SET_MYSQL40="ON"
-	elif [ "${WITH_MYSQL}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so ] ; then
-		SET_MYSQL="ON"
-	fi
-	SET_POSTGRES="OFF"
-	if [ "${WITH_POSTGRESQL}" -o -f ${PREFIX}/lib/pq.3 ] ; then
-		SET_POSTGRES="ON"
-	fi
-	SET_HASH="OFF"
-	if [ "${WITH_HASH}" ] ; then
-		SET_HASH="ON"
-	fi
-	SET_DEBUG="ON"
-	if [ "${WITH_DEBUG}" ] ; then
-        	SET_DEBUG="ON"
-        fi
-	SET_OPT="OFF"
-	if [ "${WITH_OPT}" ] ; then
-		SET_OPT="ON"
-	fi
-
-	/usr/bin/dialog --title "NetAMS options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 7 \
-MySQL		"MySQL 3.23 support" ${SET_MYSQL} \
-MySQL40		"MySQL 4.0 support" ${SET_MYSQL40} \
-MySQL41		"MySQL 4.1 support" ${SET_MYSQL41} \
-PgSQL		"PostgreSQL support" ${SET_POSTGRES} \
-HASH		"Unix HASH support" ${SET_HASH} \
-DEBUG		"Debugging support" ${SET_DEBUG} \
-OPTIMIZED       "Enable optimization" ${SET_OPT} \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-
-${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
-exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-while [ "$1" ]; do
-	case $1 in
-		\"MySQL41\")
-			if [ "${DEFMYSQL}" ]; then
-				echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	mysqlclient.14:\${PORTSDIR}/databases/mysql41-client"
-			DEFMYSQL=1
-			;;
-		\"MySQL40\")
-			if [ "${DEFMYSQL}" ]; then
-				echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	mysqlclient.12:\${PORTSDIR}/databases/mysql40-client"
-			DEFMYSQL=1
-			;;
-		\"MySQL\")
-			if [ "${DEFMYSQL}" ]; then
-				echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
-			DEFMYSQL=1
-			;;
-		\"PgSQL\")
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/databases/postgresql7"
-			echo "DEFINE+= -DUSE_POSTGRES"
-			echo "LIB += -lpq -L${LOCALBASE}/lib"
-			;;
-		\"HASH\")
-			echo "DEFINE+= -DUSE_HASH"
-			;;
-		\"DEBUG\")
-			if [ "${DEFOPT}" ]; then
-				echo "DEBUG and OPTIMIZED are mutually exclusive." > /dev/stderr
-				exit 1
-			fi
-			echo "DEFINE += -DDEBUG"
-			echo "FLAGS += -g -Wall"
-			DEFDEBUG=1
-                        ;;
-		\"OPTIMIZED\")
-			if [ "${DEFDEBUG}" ]; then
-				echo "DEBUG and OPTIMIZED are mutually exclusive." > /dev/stderr
-                        	exit 1
-			fi
-			echo "FLAGS += -O"
-			DEFOPT=1
-			;;
-	esac
-	shift
-done
-
-if [ "${DEFMYSQL}" ]; then
-echo "LIB += -lmysqlclient -L${LOCALBASE}/lib/mysql"
-echo "DEFINE+= -DUSE_MYSQL"
-else
-fi