mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

- Update to 0.14.1

Browse Source 
- Convert to OptionsNG
This commit is contained in:
Ryan Steinmetz 2012-08-04 03:34:36 +00:00
parent 0ae8c3aae8
commit bb3d0d3c86
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=301983
5 changed files with 59 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
net-mgmt/pmacct/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= pmacct
DISTVERSION= 0.14.0
DISTVERSION= 0.14.1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.pmacct.net/ \
http://mirrors.rit.edu/zi/
@ -22,15 +22,15 @@ GNU_CONFIGURE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
LDFLAGS+= "-L${LOCALBASE}/lib"
OPTIONS= MYSQL "Enable MySQL support" off \
PGSQL "Enable PostgreSQL support" off \
SQLITE "Enable SQLite support" off \
THREADS "Enable multi-threading" off \
MMAP "Enable mmap(2) support" on \
LAYER2 "Enable Layer-2 support: MAC Adresses and VLANs" on \
IPV6 "Enable IPv6 support" on \
SHARED "Enable shared objects" on \
DEBUG "Enable debugging" off
OPTIONS_DEFINE= MYSQL PGSQL SQLITE THREADS MMAP LAYER2 IPV6 SHARED DEBUG
OPTIONS_DEFAULT=MMAP LAYER2 IPV6 SHARED
SQLITE_DESC= Enable SQLite support
MMAP_DESC= Enable mmap(2) support
LAYER2_DESC= Enable Layer-2 support: MAC addresses and VLANs
SHARED_DESC= Enable shared objects
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
@ -38,7 +38,7 @@ OPTIONS= MYSQL "Enable MySQL support" off \
CONFIGURE_ARGS+=--enable-64bit
.endif
.if defined(WITH_MYSQL)
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+=--enable-mysql
PLIST_SUB+= WITH_MYSQL=""
@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--disable-mysql
PLIST_SUB+= WITH_MYSQL="@comment "
.endif
.if defined(WITH_PGSQL)
.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+=--enable-pgsql
PLIST_SUB+= WITH_PGSQL=""
@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--disable-pgsql
PLIST_SUB+= WITH_PGSQL="@comment "
.endif
.if defined(WITH_SQLITE)
.if ${PORT_OPTIONS:MSQLITE}
USE_SQLITE= yes
CONFIGURE_ARGS+=--enable-sqlite3 \
--with-sqlite3-includes=${LOCALBASE}/include
@ -64,35 +64,35 @@ CONFIGURE_ARGS+=--enable-sqlite3 \
CONFIGURE_ARGS+=--disable-sqlite3
.endif
.if defined(WITHOUT_MMAP)
CONFIGURE_ARGS+=--disable-mmap
.else
.if ${PORT_OPTIONS:MMMAP}
CONFIGURE_ARGS+=--enable-mmap
.else
CONFIGURE_ARGS+=--disable-mmap
.endif
.if defined(WITHOUT_LAYER2)
CONFIGURE_ARGS+=--disable-l2
.else
.if ${PORT_OPTIONS:MLAYER2}
CONFIGURE_ARGS+=--enable-l2
.endif
.if defined(WITHOUT_IPV6)
CONFIGURE_ARGS+=--disable-ipv6
.else
CONFIGURE_ARGS+=--enable-ipv6
CONFIGURE_ARGS+=--disable-l2
.endif
.if defined(WITH_THREADS)
.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+=--enable-ipv6
.else
CONFIGURE_ARGS+=--disable-ipv6
.endif
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+=--enable-threads
.else
CONFIGURE_ARGS+=--disable-threads
.endif
.if defined(WITHOUT_SHARED)
.if empty(PORT_OPTIONS:MSHARED)
CONFIGURE_ARGS+=--disable-so
.endif
.if defined(WITH_DEBUG)
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif
@ -107,7 +107,7 @@ post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
.for i in ChangeLog EXAMPLES FAQS README TOOLS CONFIG-KEYS KNOWN-BUGS
.for i in ChangeLog FAQS README TOOLS CONFIG-KEYS KNOWN-BUGS
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif

4
net-mgmt/pmacct/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (pmacct-0.14.0.tar.gz) = c4b4ed5608c600910bd580f92faefd8d3af0f6d5c4aabddb5ce31c6d192e0336
SIZE (pmacct-0.14.0.tar.gz) = 700794
SHA256 (pmacct-0.14.1.tar.gz) = 048f5747c2caa1085f1cd9442668b9edc98a40688b7696d1ad6f1e16c5a6d206
SIZE (pmacct-0.14.1.tar.gz) = 704707

11
net-mgmt/pmacct/files/patch-src__isis__sockunion.c
View File

@ -1,11 +0,0 @@
--- ./src/isis/sockunion.c.orig 2012-04-26 16:51:31.000000000 -0400
+++ ./src/isis/sockunion.c 2012-04-26 16:51:56.000000000 -0400
@@ -625,7 +625,7 @@
struct sockaddr_dl *sdl;
sdl = (struct sockaddr_dl *)&(su->sa);
- printf ("link#%d\n", sdl->sdl_index);
+ //printf ("link#%d\n", sdl->sdl_index);
}
break;
#endif /* AF_LINK */

29
net-mgmt/pmacct/files/patch-src__pretag_handlers.c Normal file
View File

@ -0,0 +1,29 @@
--- ./src/pretag_handlers.c.orig 2012-08-03 23:29:51.000000000 -0400
+++ ./src/pretag_handlers.c 2012-08-03 23:30:23.000000000 -0400
@@ -1067,7 +1067,7 @@
if (entry->last_matched == PRETAG_BGP_NEXTHOP) return FALSE;
/* check network-related primitives against fallback scenarios */
- if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return;
+ if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return 0;
switch(hdr->version) {
case 9:
@@ -1100,7 +1100,7 @@
int ret = -1;
/* check network-related primitives against fallback scenarios */
- if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_BGP)) return;
+ if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_BGP)) return 0;
if (dst_ret) {
if (pptrs->bgp_nexthop_info)
@@ -1660,7 +1660,7 @@
SFSample *sample = (SFSample *) pptrs->f_data;
/* check network-related primitives against fallback scenarios */
- if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return;
+ if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return 0;
if (entry->bgp_nexthop.a.family == AF_INET) {
if (!memcmp(&entry->bgp_nexthop.a.address.ipv4, &sample->bgp_nextHop.address.ip_v4, 4)) return (FALSE | entry->bgp_nexthop.neg);

1
net-mgmt/pmacct/pkg-plist
View File

@ -46,7 +46,6 @@ sbin/uacctd
%%DATADIR%%/pmacct-grant-db.mysql
@dirrmtry %%DATADIR%%
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/EXAMPLES
%%PORTDOCS%%%%DOCSDIR%%/FAQS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TOOLS