Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-mgmt/pmacct/Makefile,v retrieving revision 1.80 diff -u -r1.80 Makefile --- Makefile 23 Mar 2012 14:27:50 -0000 1.80 +++ Makefile 26 Apr 2012 21:17:08 -0000 @@ -6,8 +6,7 @@ # PORTNAME= pmacct -DISTVERSION= 0.12.5 -PORTREVISION= 1 +DISTVERSION= 0.14.0 CATEGORIES= net-mgmt MASTER_SITES= http://www.pmacct.net/ \ http://mirrors.rit.edu/zi/ @@ -23,13 +22,15 @@ 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 +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 .include @@ -87,6 +88,18 @@ CONFIGURE_ARGS+=--disable-threads .endif +.if defined(WITHOUT_SHARED) +CONFIGURE_ARGS+=--disable-so +.endif + +.if defined(WITH_ULOG) +CONFIGURE_ARGS+=--enable-ulog +.endif + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +.endif + post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net-mgmt/pmacct/distinfo,v retrieving revision 1.61 diff -u -r1.61 distinfo --- distinfo 10 Jan 2011 03:01:04 -0000 1.61 +++ distinfo 26 Apr 2012 20:25:16 -0000 @@ -1,2 +1,2 @@ -SHA256 (pmacct-0.12.5.tar.gz) = 5252d7df24e9baefcc5a36ed66e9cac5ae505c9d502c8cffb96e6808acbb2fe8 -SIZE (pmacct-0.12.5.tar.gz) = 552007 +SHA256 (pmacct-0.14.0.tar.gz) = c4b4ed5608c600910bd580f92faefd8d3af0f6d5c4aabddb5ce31c6d192e0336 +SIZE (pmacct-0.14.0.tar.gz) = 700794 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net-mgmt/pmacct/pkg-plist,v retrieving revision 1.18 diff -u -r1.18 pkg-plist --- pkg-plist 15 May 2011 14:08:00 -0000 1.18 +++ pkg-plist 26 Apr 2012 21:12:19 -0000 @@ -9,9 +9,10 @@ %%DATADIR%%/README.IPv6 %%DATADIR%%/README.agent_id2 %%DATADIR%%/README.cos +%%DATADIR%%/README.etype %%DATADIR%%/README.iface -%%DATADIR%%/README.is_symmetric %%DATADIR%%/README.mask +%%DATADIR%%/README.mpls_vpn_rd %%DATADIR%%/README.mysql %%DATADIR%%/README.pgsql %%DATADIR%%/README.sqlite3 @@ -51,7 +52,7 @@ %%EXAMPLESDIR%%/agent_to_peer.map.example %%EXAMPLESDIR%%/bgp_md5.lst.example %%EXAMPLESDIR%%/allow-list.example -%%EXAMPLESDIR%%/is_symmetric.map.example +%%EXAMPLESDIR%%/iface_to_rd.map.example %%EXAMPLESDIR%%/gnuplot-example.sh %%EXAMPLESDIR%%/gnuplot.script.example %%EXAMPLESDIR%%/lpref.map.example @@ -73,5 +74,6 @@ %%EXAMPLESDIR%%/probe_netflow.conf.example %%EXAMPLESDIR%%/probe_sflow.conf.example %%EXAMPLESDIR%%/rrdtool-example.sh +%%EXAMPLESDIR%%/sampling.map.example @dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-src__isis__sockunion.c =================================================================== RCS file: files/patch-src__isis__sockunion.c diff -N files/patch-src__isis__sockunion.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src__isis__sockunion.c 26 Apr 2012 20:59:33 -0000 @@ -0,0 +1,11 @@ +--- ./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 */ Index: files/patch-src__ll.c =================================================================== RCS file: files/patch-src__ll.c diff -N files/patch-src__ll.c --- files/patch-src__ll.c 17 Jul 2011 17:10:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- ./src/ll.c.orig 2011-06-30 20:43:06.000000000 -0400 -+++ ./src/ll.c 2011-06-30 20:43:45.000000000 -0400 -@@ -118,7 +118,7 @@ - - if (*caplen < 4) { - pptrs->iph_ptr = NULL; -- return; -+ return 0; - } - - do { Index: files/pkg-message.in =================================================================== RCS file: /home/ncvs/ports/net-mgmt/pmacct/files/pkg-message.in,v retrieving revision 1.1 diff -u -r1.1 pkg-message.in --- files/pkg-message.in 15 May 2011 14:08:00 -0000 1.1 +++ files/pkg-message.in 26 Apr 2012 20:29:36 -0000 @@ -5,7 +5,7 @@ pmacctd_enable="YES" pmacctd_flags="-DF %%PREFIX%%/etc/pmacctd.conf -i " -Configuration examples are located in %%EXAMPLESDIR%%. You must copy +Configuration examples are located in %%EXAMPLESDIR%%. You must copy one of these to %%PREFIX%%/etc/pmacctd.conf and make any required edits for your environment.