diff options
author | krion <krion@FreeBSD.org> | 2003-12-27 01:12:31 +0800 |
---|---|---|
committer | krion <krion@FreeBSD.org> | 2003-12-27 01:12:31 +0800 |
commit | 827add58753b0f60d77d35a9493f27ea5c465246 (patch) | |
tree | 0d7a5924489d9dd0a0dd2ba02faa3edb1aa71b7f /net | |
parent | aeec0117b959c349f77f2c3fa20aaf53bc69e8cd (diff) | |
download | freebsd-ports-gnome-827add58753b0f60d77d35a9493f27ea5c465246.tar.gz freebsd-ports-gnome-827add58753b0f60d77d35a9493f27ea5c465246.tar.zst freebsd-ports-gnome-827add58753b0f60d77d35a9493f27ea5c465246.zip |
- Update to version netams-3.1(1770)
- Unbreak build on 5.x
- Pet portlint
PR: 60543
Submitted by: maintainer
Diffstat (limited to 'net')
-rw-r--r-- | net/netams/Makefile | 31 | ||||
-rw-r--r-- | net/netams/distinfo | 2 | ||||
-rw-r--r-- | net/netams/files/patch-Makefile | 22 | ||||
-rw-r--r-- | net/netams/pkg-plist | 48 | ||||
-rw-r--r-- | net/netams/scripts/configure.netams | 13 |
5 files changed, 60 insertions, 56 deletions
diff --git a/net/netams/Makefile b/net/netams/Makefile index a60e0b592ada..92640f61c996 100644 --- a/net/netams/Makefile +++ b/net/netams/Makefile @@ -1,23 +1,22 @@ # New ports collection makefile for: NetAMS -# Date created: 9 December 2002 -# Whom: jura@happychance.com +# Date created: 24 December 2003 +# Whom: jura@netams.com # # $FreeBSD$ # PORTNAME= netams PORTVERSION= 3.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.netams.com/files/ -DISTNAME= ${PORTNAME}-${PORTVERSION}.1563 +DISTNAME= ${PORTNAME}-${PORTVERSION}.1770 -MAINTAINER= jura@happychance.com +MAINTAINER= jura@netams.com COMMENT= Network Traffic Accounting and Monitoring Software USE_SUBMAKE= yes - -MAN8= netams.8 +MAN8= netams.8 flowprobe.8 MANCOMPRESSED= no SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ @@ -34,10 +33,6 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile on FreeBSD ${OSVERSION}" -.endif - pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.netams @@ -45,20 +40,30 @@ pre-fetch: .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +FLAGS += ${PTHREAD_CFLAGS} +LIB += ${PTHREAD_LIBS} + MAKE_ENV+= DEFINE="${DEFINE}" FLAGS="${FLAGS}" LIB="${LIB}" do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/src/netams ${PREFIX}/libexec/netams + @ ${INSTALL_PROGRAM} ${WRKSRC}/src/netams ${PREFIX}/sbin/flowprobe + @ ${INSTALL_PROGRAM} ${WRKSRC}/src/netams ${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_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 +.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 cgi in logo.gif netams_api.pl netams_graph.cgi weblogin.tem netams_example.cgi weblogin.cgi +.for image in logo.gif logo-small.gif admintool-logo.gif + @ ${INSTALL_DATA} ${WRKSRC}/cgi-bin/images/${image} ${EXAMPLESDIR}/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/ .endfor .if !defined(NOPORTDOCS) diff --git a/net/netams/distinfo b/net/netams/distinfo index cf626493f2ab..ad407f3073b1 100644 --- a/net/netams/distinfo +++ b/net/netams/distinfo @@ -1 +1 @@ -MD5 (netams-3.1.1563.tar.gz) = 75c402d5a883efc577c0c9c760fbd627 +MD5 (netams-3.1.1770.tar.gz) = 7ae62ea14be8d979f296284e0b48def3 diff --git a/net/netams/files/patch-Makefile b/net/netams/files/patch-Makefile index 73ca3202e10a..d2c7bad4aa91 100644 --- a/net/netams/files/patch-Makefile +++ b/net/netams/files/patch-Makefile @@ -1,12 +1,13 @@ ---- Makefile Mon May 19 20:41:16 2003 -+++ Makefile.orig Fri May 23 12:27:25 2003 -@@ -11,14 +11,14 @@ +--- Makefile.orig Thu Dec 25 07:51:58 2003 ++++ Makefile Fri Dec 26 18:07:45 2003 +@@ -10,15 +10,15 @@ + # $NetAMS: netams/Makefile,v 1.25.2.2 2003/11/21 18:48:15 jura Exp $ ########################################################################## # for FreeBSD, uncomment this -DEFINE = -DFREEBSD -D_THREAD_SAFE --LIB = -pthread -lpcap -+DEFINE += -DFREEBSD -D_THREAD_SAFE -+LIB += -pthread -lpcap -lcrypt +-LIB = -pthread -lpcap -lcrypt ++DEFINE += -DFREEBSD ++LIB += -lpcap -lcrypt # # DB1 support # DEFINE+= -DUSE_HASH @@ -19,8 +20,8 @@ # # PostgreSQL storage support # DEFINE += -DUSE_POSTGRES -@@ -45,14 +45,14 @@ - # DEFINE += -DIPTBL_PFSET +@@ -48,14 +48,14 @@ + # DEFINE += -DIPTBL_NONE ########################################################################## # Define here a PATH variables -PATH_TO_CONFIG="/usr/local/etc/netams.cfg" @@ -37,10 +38,11 @@ # Uncomment this if you want to enable profiler support # LIB += -lm -pg # FLAGS += -pg -@@ -74,7 +74,7 @@ +@@ -76,8 +76,7 @@ + flowmodule.h versions.sh versions_build.dat CC = g++ - FLAGS += -pthread +-FLAGS += -pthread -INCLUDE=/usr/local/include +INCLUDE = ${LOCALBASE}/include OBJ = $(SRC:.c=.o) diff --git a/net/netams/pkg-plist b/net/netams/pkg-plist index 597e0366c84d..2b3e1357583d 100644 --- a/net/netams/pkg-plist +++ b/net/netams/pkg-plist @@ -2,24 +2,32 @@ etc/netams.conf.sample etc/rc.d/netams.sh.sample libexec/netams +sbin/flowprobe +sbin/ipfw2netflow bin/netamsctl -%%PORTDOCS%%share/doc/netams/documentation-en.html -%%PORTDOCS%%share/doc/netams/diagram-1.gif -%%PORTDOCS%%share/doc/netams/logo.gif -%%PORTDOCS%%share/doc/netams/net-1-1a.gif -%%PORTDOCS%%share/doc/netams/net-1-2a.gif -%%PORTDOCS%%share/doc/netams/net-1-3a.gif -share/examples/netams/netams-nat-network.cfg -share/examples/netams/netams-netflow.cfg -share/examples/netams/netams-simple.cfg -share/examples/netams/netams.cfg -share/examples/netams/.netamsctl.rc -share/examples/netams/cgi-bin/logo.gif -share/examples/netams/cgi-bin/netams_api.pl -share/examples/netams/cgi-bin/netams_example.cgi -share/examples/netams/cgi-bin/netams_graph.cgi -share/examples/netams/cgi-bin/weblogin.cgi -share/examples/netams/cgi-bin/weblogin.tem -%%PORTDOCS%%@dirrm share/doc/netams -@dirrm share/examples/netams/cgi-bin -@dirrm share/examples/netams +%%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%% diff --git a/net/netams/scripts/configure.netams b/net/netams/scripts/configure.netams index d3013b9af407..86c58468cf6f 100644 --- a/net/netams/scripts/configure.netams +++ b/net/netams/scripts/configure.netams @@ -23,9 +23,6 @@ if [ "${BATCH}" ]; then if [ "${WITH_OPT}" ]; then OPTIONS="${OPTIONS} \"OPTIMIZED\"" fi - if [ "${LOG_DROP}" ]; then - OPTIONS="$OPTIONS} \"LOG_DROP\"" - fi else SET_MYSQL41="OFF" @@ -54,14 +51,10 @@ else if [ "${WITH_OPT}" ] ; then SET_OPT="ON" fi - SET_LOG_DROP="OFF" - if [ "${LOG_DROP}" ] ; then - SET_LOG_DROP="ON" - fi /usr/bin/dialog --title "NetAMS options" --clear \ --checklist "\n\ -Please select desired options:" -1 -1 8 \ +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} \ @@ -69,7 +62,6 @@ PgSQL "PostgreSQL support" ${SET_POSTGRES} \ HASH "Unix HASH support" ${SET_HASH} \ DEBUG "Debugging support" ${SET_DEBUG} \ OPTIMIZED "Enable optimization" ${SET_OPT} \ -LOG_DROP "Log dropped packets" ${SET_LOG_DROP} \ 2> $tempfile retval=$? @@ -147,9 +139,6 @@ while [ "$1" ]; do echo "FLAGS += -O" DEFOPT=1 ;; - \"LOG_DROP\") - echo "DEFINE += -DLOG_DROP" - ;; esac shift done |