diff options
| author | pav <pav@FreeBSD.org> | 2004-08-18 18:49:07 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-08-18 18:49:07 +0800 |
| commit | 31e68109a03bf2b28c7258dd81553b579d42192c (patch) | |
| tree | 0eefd359280293e21e9dfc7d2deeaa4d2876d2cb | |
| parent | ca8f03babfc33d1a945a3185d68ec49c6d88a67b (diff) | |
| download | freebsd-ports-gnome-31e68109a03bf2b28c7258dd81553b579d42192c.tar.gz freebsd-ports-gnome-31e68109a03bf2b28c7258dd81553b579d42192c.tar.zst freebsd-ports-gnome-31e68109a03bf2b28c7258dd81553b579d42192c.zip | |
- Update to 3.1.1830
PR: ports/70568
Submitted by: Yuriy N. Shkandybin <jura@netams.com> (maintainer)
| -rw-r--r-- | net-mgmt/netams/Makefile | 13 | ||||
| -rw-r--r-- | net-mgmt/netams/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/netams/files/patch-Makefile | 11 | ||||
| -rw-r--r-- | net-mgmt/netams/scripts/configure.netams | 4 |
4 files changed, 15 insertions, 17 deletions
diff --git a/net-mgmt/netams/Makefile b/net-mgmt/netams/Makefile index 7cf4acd28294..d465c98aaee9 100644 --- a/net-mgmt/netams/Makefile +++ b/net-mgmt/netams/Makefile @@ -7,10 +7,10 @@ PORTNAME= netams PORTVERSION= 3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= http://www.netams.com/files/ -DISTNAME= ${PORTNAME}-${PORTVERSION}.1790 +DISTNAME= ${PORTNAME}-${PORTVERSION}.1830 MAINTAINER= jura@netams.com COMMENT= Network Traffic Accounting and Monitoring Software @@ -27,9 +27,8 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ WITH_MYSQL="${WITH_MYSQL}" \ WITH_MYSQL40="${WITH_MYSQL40}" \ WITH_MYSQL41="${WITH_MYSQL41}" \ - WITH_PGSQL="${WITH_PGSQL}" \ - WITH_DEBUG="${WITH_DEBUG}" \ - LOG_DROP="${LOG_DROP}" + WITH_POSTGRESQL="${WITH_POSTGRESQL}" \ + WITH_DEBUG="${WITH_DEBUG}" .include <bsd.port.pre.mk> @@ -47,8 +46,8 @@ 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/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 diff --git a/net-mgmt/netams/distinfo b/net-mgmt/netams/distinfo index 4f03fa7507d9..95fe5e4e0933 100644 --- a/net-mgmt/netams/distinfo +++ b/net-mgmt/netams/distinfo @@ -1,2 +1,2 @@ -MD5 (netams-3.1.1790.tar.gz) = 87710b6d9ecd5897d26d71e70fd118b6 -SIZE (netams-3.1.1790.tar.gz) = 312583 +MD5 (netams-3.1.1830.tar.gz) = 77b2c1ff9b955e591da2928588dcdb77 +SIZE (netams-3.1.1830.tar.gz) = 316191 diff --git a/net-mgmt/netams/files/patch-Makefile b/net-mgmt/netams/files/patch-Makefile index eaf83cd7b7bf..2e55703a667e 100644 --- a/net-mgmt/netams/files/patch-Makefile +++ b/net-mgmt/netams/files/patch-Makefile @@ -1,13 +1,13 @@ ---- Makefile.orig Wed Dec 31 11:43:37 2003 -+++ Makefile Mon Jan 5 17:16:41 2004 +--- Makefile.orig Thu May 6 14:37:08 2004 ++++ Makefile Tue Aug 17 11:35:46 2004 @@ -10,11 +10,11 @@ - # $NetAMS: netams/Makefile,v 1.25.2.4 2003/12/31 08:43:37 jura Exp $ + # $Id: Makefile,v 1.25.2.7 2004/05/06 10:37:08 jura Exp $ ########################################################################## # for FreeBSD, uncomment this -DEFINE = -DFREEBSD -D_THREAD_SAFE --LIB = -lpcap -lcrypt +DEFINE += -DFREEBSD -+LIB += -lpcap -lcrypt +-LIB = -lpcap -lcrypt -lz ++LIB += -lpcap -lcrypt -lz # # For FreeBSD-4.x uncomment this -LIB += -pthread @@ -52,4 +52,3 @@ +INCLUDE = ${LOCALBASE}/include OBJ = $(SRC:.c=.o) CFLAGS = $(FLAGS) -I$(INCLUDE) $(DEFINE) - diff --git a/net-mgmt/netams/scripts/configure.netams b/net-mgmt/netams/scripts/configure.netams index 86c58468cf6f..f1d9c264d459 100644 --- a/net-mgmt/netams/scripts/configure.netams +++ b/net-mgmt/netams/scripts/configure.netams @@ -14,7 +14,7 @@ if [ "${BATCH}" ]; then elif [ "${WITH_MYSQL}" ]; then OPTIONS="${OPTIONS} \"MySQL\"" fi - if [ "${WITH_POSTGRES}" ]; then + if [ "${WITH_POSTGRESQL}" ]; then OPTIONS="${OPTIONS} \"PgSQL\"" fi if [ "${WITH_HASH}" ]; then @@ -36,7 +36,7 @@ else SET_MYSQL="ON" fi SET_POSTGRES="OFF" - if [ "${WITH_POSTGRES}" -o -f ${PREFIX}/lib/pq.3 ] ; then + if [ "${WITH_POSTGRESQL}" -o -f ${PREFIX}/lib/pq.3 ] ; then SET_POSTGRES="ON" fi SET_HASH="OFF" |