diff options
| -rw-r--r-- | net-mgmt/pmacct/Makefile | 52 | ||||
| -rw-r--r-- | net-mgmt/pmacct/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/pmacct/files/patch-src__isis__sockunion.c | 11 | ||||
| -rw-r--r-- | net-mgmt/pmacct/files/patch-src__pretag_handlers.c | 29 | ||||
| -rw-r--r-- | net-mgmt/pmacct/pkg-plist | 1 |
5 files changed, 57 insertions, 40 deletions
diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile index bc5f725764b0..c0f63fdfdb27 100644 --- a/net-mgmt/pmacct/Makefile +++ b/net-mgmt/pmacct/Makefile @@ -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 +.else +CONFIGURE_ARGS+=--disable-l2 .endif -.if defined(WITHOUT_IPV6) -CONFIGURE_ARGS+=--disable-ipv6 -.else +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 .endif -.if defined(WITH_THREADS) +.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 diff --git a/net-mgmt/pmacct/distinfo b/net-mgmt/pmacct/distinfo index a43fb2620472..cd6a950801a9 100644 --- a/net-mgmt/pmacct/distinfo +++ b/net-mgmt/pmacct/distinfo @@ -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 diff --git a/net-mgmt/pmacct/files/patch-src__isis__sockunion.c b/net-mgmt/pmacct/files/patch-src__isis__sockunion.c deleted file mode 100644 index 9ecc400eff6c..000000000000 --- a/net-mgmt/pmacct/files/patch-src__isis__sockunion.c +++ /dev/null @@ -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 */ diff --git a/net-mgmt/pmacct/files/patch-src__pretag_handlers.c b/net-mgmt/pmacct/files/patch-src__pretag_handlers.c new file mode 100644 index 000000000000..e7ee036bca96 --- /dev/null +++ b/net-mgmt/pmacct/files/patch-src__pretag_handlers.c @@ -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); diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist index 617008259913..9846f1fd578a 100644 --- a/net-mgmt/pmacct/pkg-plist +++ b/net-mgmt/pmacct/pkg-plist @@ -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 |