cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- links to libmysqlclient/libpq but doesn't register dependencies

Browse Source 
- OPTIONS was removed,
- option for PostgreSQL was removed, but netams links to libpq library (if found),
- port unconditionally depends on mysql50-client, regardless of installed versions of MySQL,
- netams supports other databases but port always installs MySQL 5.0,
- option WITHOUT_DEBUG was removed and netams logs huge amounts of data without it,
- port has a lot of dependencies required only for web part of application (support for WITHOUT_CGI was removed),
- port unconditionally depends on apache22, which is not required, there are plenty of web servers in ports tree,
- port unconditionally depends on mysql50-server, which is not required (database servers are often installed on different
machines),
- port specifies weird DATADIR (${PREFIX}/etc),
- port unnecessarily specifies WWWDIR,
- sample config file is installed to ${PREFIX}/etc/netams instead of default ${PREFIX}/etc.

PR:		151930
Submitted by:	am@raisa.eu.org
Approved by:	maintainer (timeout), gabor (mentor)
Feature safe:	yes
This commit is contained in:
Michael Scheidell 2011-11-28 19:55:34 +00:00
parent ae402186c5
commit f12d875fb0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=286589
3 changed files with 163 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
net-mgmt/netams/Makefile
View File

@ -7,48 +7,37 @@
PORTNAME= netams
PORTVERSION= 3.4.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://www.netams.com/files/
MAINTAINER= jura@netams.com
COMMENT= Network Traffic Accounting and Monitoring Software
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil \
${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \
${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${SITE_PERL}/Crypt/GeneratePassword.pm:${PORTSDIR}/security/p5-Crypt-GeneratePassword
RUN_DEPENDS= httpd:${PORTSDIR}/www/apache22 \
mysql-server>=5.0.86:${PORTSDIR}/databases/mysql50-server
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
jpeg.11:${PORTSDIR}/graphics/jpeg \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
pcap.1:${PORTSDIR}/net/libpcap
LIB_DEPENDS= pcap.1:${PORTSDIR}/net/libpcap
USE_SUBMAKE= yes
SUB_FILES= pkg-message
USE_RC_SUBR= netams
MANCOMPRESSED= no
OPTIONS= DEBUG "Build with debug symbols" off \
MYSQL "Build with MySQL storage support" on \
POSTGRESQL "Build with PostgreSQL storage support" off \
CGI "Install admin/user CGI scripts" off
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
PREFIX="${PREFIX}" \
TOUCH="${TOUCH}" \
MKDIR="${MKDIR}" \
REALCURDIR="${.CURDIR}"
DATADIR= ${PREFIX}/etc
WWWDIR= ${PREFIX}/www/netams
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
CGI= .htaccess config.cgi netams_api.pl russian.res \
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
@ -57,42 +46,112 @@ MAN8= netams.8 flowprobe.8 netamsctl.8
.include <bsd.port.pre.mk>
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
IGNORE=requires at least one database backend selected. Run 'make config'
.endif
.if defined(WITH_POSTGRESQL)
USE_PGSQL= yes
PLIST_SUB+= POSTGRESQL=""
.else
PLIST_SUB+= POSTGRESQL="@comment "
.endif
.if defined(WITH_MYSQL)
USE_MYSQL= yes
BROKEN_WITH_MYSQL= 323
PLIST_SUB+= MYSQL=""
.else
PLIST_SUB+= MYSQL="@comment "
.endif
.if defined(WITH_POSTGRESQL) && defined(WITH_CGI)
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
.endif
.if defined(WITH_MYSQL) && defined(WITH_CGI)
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
.endif
.if defined(WITH_CGI)
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil \
${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${SITE_PERL}/Crypt/GeneratePassword.pm:${PORTSDIR}/security/p5-Crypt-GeneratePassword
LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd \
jpeg.11:${PORTSDIR}/graphics/jpeg
PLIST_SUB+= CGI=""
.else
PLIST_SUB+= CGI="@comment "
.endif
pre-patch:
.if !defined(WITH_DEBUG)
@${REINPLACE_CMD} -e 's|.*sh configure.sh|& -nodebug|' \
${WRKSRC}/Makefile
.endif
.if !defined(WITH_POSTGRESQL)
@${REINPLACE_CMD} -e 's|locate_file "libpq\.so".*|v1="" \&\& v2=""|' \
${WRKSRC}/configure.sh
.endif
.if defined(WITH_MYSQL)
@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!/usr/local/bin/perl|' ${WRKSRC}/addon/mysql_rotate.pl
.else
@${REINPLACE_CMD} -e 's|locate_file "libmysqlclient\.so".*|v1="" \&\& v2=""|' \
${WRKSRC}/configure.sh
@${REINPLACE_CMD} -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
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} ${WWWDIR} ${WWWDIR}/cgi-bin ${WWWDIR}/cgi-bin/admin ${WWWDIR}/images \
${DATADIR}/netams ${DATADIR}/netams/tools ${DATADIR}/netams/tools/oracle \
${DATADIR}/apache22 ${DATADIR}/apache22/Includes
${INSTALL_DATA} ${WRKSRC}/addon/netams.conf ${DATADIR}/netams/netams.conf.sample
${INSTALL_DATA} ${WRKSRC}/addon/ru-networks.txt ${DATADIR}/netams/ru-networks.txt.sample
${INSTALL_DATA} ${WRKSRC}/addon/ua-networks.txt ${DATADIR}/netams/ua-networks.txt.sample
${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
${INSTALL_DATA} ${WRKSRC}/addon/mysql_rotate.pl ${DATADIR}/netams/mysql_rotate.pl
${INSTALL_DATA} ${WRKSRC}/addon/snmp2netams.pl ${DATADIR}/netams/snmp2netams.pl
${INSTALL_DATA} ${WRKSRC}/addon/ua-networks-get.sh ${DATADIR}/netams/ua-networks-get.sh
${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/billing_users_table.sql ${DATADIR}/netams/tools/billing_users_table.sql
${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema-Pg.sql ${DATADIR}/netams/tools/cardtool_schema-Pg.sql
${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema.sql ${DATADIR}/netams/tools/cardtool_schema.sql
${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams.sh ${DATADIR}/netams/tools/oracle/netams.sh
${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_drop.sql ${DATADIR}/netams/tools/oracle/netams_drop.sql
${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_tb.sql ${DATADIR}/netams/tools/oracle/netams_tb.sql
${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_tg.sql ${DATADIR}/netams/tools/oracle/netams_tg.sql
${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_ts.sql ${DATADIR}/netams/tools/oracle/netams_ts.sql
.if defined(WITH_MYSQL)
${INSTALL_DATA} ${WRKSRC}/addon/mysql_rotate.pl ${DATADIR}/mysql_rotate.pl
${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema.sql ${DATADIR}/tools/cardtool_schema.sql
.endif
.if defined(WITH_POSTGRESQL)
${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
.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 defined(WITH_CGI)
${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
${INSTALL_DATA} ${WRKSRC}/addon/netams-apache-freebsd.conf ${DATADIR}/apache22/Includes/netams-apache-freebsd.conf
.for f in ${IMAGES}
${INSTALL_DATA} ${WRKSRC}/cgi-bin/images/${f} ${WWWDIR}/images/
.endfor
.for f in ${CGI}
.for f in ${USERCGI}
${INSTALL_DATA} ${WRKSRC}/cgi-bin/${f} ${WWWDIR}/cgi-bin/
.endfor
.for f in ${ADMINCGI}
${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/${f} ${WWWDIR}/cgi-bin/admin/
.endfor
.endif
.for f in ${MAN8}
${INSTALL_MAN} ${WRKSRC}/doc/${f} ${PREFIX}/man/man8/
.endfor

2
net-mgmt/netams/files/netams.in
View File

@ -28,7 +28,7 @@ command="%%PREFIX%%/libexec/netams"
load_rc_config $name
netams_enable=${netams_enable:-"NO"}
netams_config=${netams_config:-"%%PREFIX%%/etc/netams/netams.conf"}
netams_config=${netams_config:-"%%PREFIX%%/etc/netams.conf"}
pidfile="${netams_pidfile:-/var/run/netams.pid}"
required_files="$netams_config"

129
net-mgmt/netams/pkg-plist
View File

@ -3,68 +3,69 @@ sbin/flowprobe
sbin/ipfw2netflow
sbin/ascii2netflow
bin/netamsctl
%%DATADIR%%/netams/ru-networks.txt.sample
%%DATADIR%%/netams/ua-networks.txt.sample
%%DATADIR%%/netams/netams.conf.sample
etc/netams.conf.sample
%%DATADIR%%/ru-networks.txt.sample
%%DATADIR%%/ua-networks.txt.sample
%%DATADIR%%/.netamsctl.rc
%%DATADIR%%/apache22/Includes/netams-apache-freebsd.conf
%%DATADIR%%/netams/mysql_rotate.pl
%%DATADIR%%/netams/snmp2netams.pl
%%DATADIR%%/netams/ua-networks-get.sh
%%DATADIR%%/netams/tools/cardtool_schema-Pg.sql
%%DATADIR%%/netams/tools/cardtool_schema.sql
%%DATADIR%%/netams/tools/billing_users_table.sql
%%DATADIR%%/netams/tools/oracle/netams.sh
%%DATADIR%%/netams/tools/oracle/netams_drop.sql
%%DATADIR%%/netams/tools/oracle/netams_tb.sql
%%DATADIR%%/netams/tools/oracle/netams_tg.sql
%%DATADIR%%/netams/tools/oracle/netams_ts.sql
%%WWWDIR%%/cgi-bin/.htaccess
%%WWWDIR%%/cgi-bin/config.cgi
%%WWWDIR%%/cgi-bin/netams_api.pl
%%WWWDIR%%/cgi-bin/russian.res
%%WWWDIR%%/cgi-bin/netams_example.cgi
%%WWWDIR%%/cgi-bin/usertool.cgi
%%WWWDIR%%/cgi-bin/admintool.cgi
%%WWWDIR%%/cgi-bin/login.cgi
%%WWWDIR%%/cgi-bin/netams_graph.cgi
%%WWWDIR%%/cgi-bin/activate.cgi
%%WWWDIR%%/cgi-bin/activate.tmpl
%%WWWDIR%%/cgi-bin/netams_html.cgi
%%WWWDIR%%/cgi-bin/statistic.pl
%%WWWDIR%%/cgi-bin/admin/.htaccess
%%WWWDIR%%/cgi-bin/admin/index.cgi
%%WWWDIR%%/cgi-bin/admin/policy.cgi
%%WWWDIR%%/cgi-bin/admin/showusercard.cgi
%%WWWDIR%%/cgi-bin/admin/user.cgi
%%WWWDIR%%/cgi-bin/admin/access.cgi
%%WWWDIR%%/cgi-bin/admin/login.cgi
%%WWWDIR%%/cgi-bin/admin/quota.cgi
%%WWWDIR%%/cgi-bin/admin/showusercard.tmpl
%%WWWDIR%%/cgi-bin/admin/view.cgi
%%WWWDIR%%/cgi-bin/admin/account.cgi
%%WWWDIR%%/cgi-bin/admin/netams.cgi
%%WWWDIR%%/cgi-bin/admin/radius.cgi
%%WWWDIR%%/cgi-bin/admin/subplan.cgi
%%WWWDIR%%/cgi-bin/admin/config.cgi
%%WWWDIR%%/cgi-bin/admin/plan.cgi
%%WWWDIR%%/cgi-bin/admin/russian.res
%%WWWDIR%%/cgi-bin/admin/unit.cgi
%%WWWDIR%%/cgi-bin/admin/cardtool.cgi
%%WWWDIR%%/cgi-bin/admin/graph.cgi
%%WWWDIR%%/cgi-bin/admin/monitor.cgi
%%WWWDIR%%/cgi-bin/admin/rrdgraph.cgi
%%WWWDIR%%/cgi-bin/admin/statistic.cgi
%%WWWDIR%%/images/admintool-logo.gif
%%WWWDIR%%/images/logo_sm.jpg
%%WWWDIR%%/images/showtable-logo.gif
%%WWWDIR%%/images/rrdgraph-logo.gif
%%WWWDIR%%/index.html
%%WWWDIR%%/netams.js
@dirrm %%WWWDIR%%/images
@dirrm %%WWWDIR%%/cgi-bin/admin
@dirrm %%WWWDIR%%/cgi-bin
@dirrm %%WWWDIR%%
@dirrm %%DATADIR%%/netams/tools/oracle
@dirrm %%DATADIR%%/netams/tools
@dirrm %%DATADIR%%/netams
%%DATADIR%%/netams-apache-freebsd.conf
%%MYSQL%%%%DATADIR%%/mysql_rotate.pl
%%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
%%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
%%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/graph.cgi
%%CGI%%%%WWWDIR%%/cgi-bin/admin/monitor.cgi
%%CGI%%%%WWWDIR%%/cgi-bin/admin/rrdgraph.cgi
%%CGI%%%%WWWDIR%%/cgi-bin/admin/statistic.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%%/index.html
%%CGI%%%%WWWDIR%%/netams.js
%%CGI%%@dirrm %%WWWDIR%%/images
%%CGI%%@dirrm %%WWWDIR%%/cgi-bin/admin
%%CGI%%@dirrm %%WWWDIR%%/cgi-bin
%%CGI%%@dirrm %%WWWDIR%%
@dirrm %%DATADIR%%/tools/oracle
@dirrm %%DATADIR%%/tools
@dirrm %%DATADIR%%