Index: head/sysutils/pftop/Makefile =================================================================== --- head/sysutils/pftop/Makefile (revision 210332) +++ head/sysutils/pftop/Makefile (revision 210333) @@ -1,53 +1,57 @@ # New ports collection makefile for: pfflowd # Date created: 23 June 2003 # Whom: Max Laier # # $FreeBSD$ # PORTNAME= pftop -PORTVERSION= 0.6 +PORTVERSION= 0.7 CATEGORIES= sysutils net MASTER_SITES= http://www.eee.metu.edu.tr/~canacar/ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= mlaier@freebsd.org COMMENT= Utility for real-time display of statistics for pf MAN8= pftop.8 MANCOMPRESSED= no .include .if ${OSVERSION} < 502106 IGNORE= only for 5.3 and above .endif .if ${OSVERSION} < 502116 MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=34 .if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes") CFLAGS+= -DHAVE_ALTQ=1 .endif .elif ${OSVERSION} < 600025 MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=35 CFLAGS+= -DHAVE_ALTQ=1 -DHAVE_RULE_ANCHOR=1 .elif ${OSVERSION} < 700049 MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=37 CFLAGS+= -DHAVE_ALTQ=1 .else MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=41 CFLAGS+= -DHAVE_ALTQ=1 .endif PLIST_FILES= sbin/pftop post-patch: @${REINPLACE_CMD} -e 's||"${FILESDIR}/queue.h"|g' \ ${WRKSRC}/engine.c + @${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.h + @${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.c + @${REINPLACE_CMD} -e 's|#include ||g' \ + ${WRKSRC}/sf-gencode.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pftop ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/pftop.8 ${PREFIX}/man/man8 .include Property changes on: head/sysutils/pftop/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/sysutils/pftop/distinfo =================================================================== --- head/sysutils/pftop/distinfo (revision 210332) +++ head/sysutils/pftop/distinfo (revision 210333) @@ -1,3 +1,3 @@ -MD5 (pftop-0.6.tar.gz) = c84fb960d36e9a9271c211c98efae062 -SHA256 (pftop-0.6.tar.gz) = bc6e9f93405b6a941074e4e5454adb56c63e24b3def4660d32c826237a8faaba -SIZE (pftop-0.6.tar.gz) = 26236 +MD5 (pftop-0.7.tar.gz) = 2fdef1e3fffc38ae40f27aa2dfdcf6fc +SHA256 (pftop-0.7.tar.gz) = afde859fab77597e4aae1ef6b87f1bb26a5ad8cb2b1d7316a12e5098153492af +SIZE (pftop-0.7.tar.gz) = 59765 Property changes on: head/sysutils/pftop/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/sysutils/pftop/files/patch-ab =================================================================== --- head/sysutils/pftop/files/patch-ab (revision 210332) +++ head/sysutils/pftop/files/patch-ab (nonexistent) @@ -1,29 +0,0 @@ -*** pftop.c.orig Tue Jan 10 21:06:14 2006 ---- pftop.c Sat Jan 21 04:47:06 2006 -*************** -*** 2215,2226 **** - tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto); - #ifdef HAVE_RULE_UGID - if (pr->uid.op) - tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1], -! "user", UID_MAX); - if (pr->gid.op) - tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1], -! "group", GID_MAX); - #endif - - if (pr->flags || pr->flagset) { - tbprintf(" flags "); ---- 2215,2226 ---- - tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto); - #ifdef HAVE_RULE_UGID - if (pr->uid.op) - tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1], -! "user", UINT_MAX); - if (pr->gid.op) - tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1], -! "group", UINT_MAX); - #endif - - if (pr->flags || pr->flagset) { - tbprintf(" flags "); Property changes on: head/sysutils/pftop/files/patch-ab ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/pftop/files/patch-pftop.c =================================================================== --- head/sysutils/pftop/files/patch-pftop.c (nonexistent) +++ head/sysutils/pftop/files/patch-pftop.c (revision 210333) @@ -0,0 +1,28 @@ +--- pftop.c.orig 2007-11-07 07:36:46.000000000 +0100 ++++ pftop.c 2008-04-01 17:03:25.847268996 +0200 +@@ -1570,10 +1570,10 @@ + #ifdef HAVE_RULE_UGID + if (pr->uid.op) + tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1], +- "user", UID_MAX); ++ "user", UINT_MAX); + if (pr->gid.op) + tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1], +- "group", GID_MAX); ++ "group", UINT_MAX); + #endif + + if (pr->flags || pr->flagset) { +@@ -1765,7 +1765,12 @@ + strerror(errno)); + return (-1); + } ++#ifdef PFALTQ_FLAG_IF_REMOVED ++ if (pa.altq.qid > 0 && ++ !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) { ++#else + if (pa.altq.qid > 0) { ++#endif + pq.nr = nr; + pq.ticket = pa.ticket; + pq.buf = &qstats; Property changes on: head/sysutils/pftop/files/patch-pftop.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/sysutils/pftop/files/patch-sf-scanner.l =================================================================== --- head/sysutils/pftop/files/patch-sf-scanner.l (nonexistent) +++ head/sysutils/pftop/files/patch-sf-scanner.l (revision 210333) @@ -0,0 +1,11 @@ +--- sf-scanner.l.orig 2007-11-07 07:34:18.000000000 +0100 ++++ sf-scanner.l 2008-04-01 17:03:25.853268641 +0200 +@@ -233,7 +233,7 @@ + size_t len = strlen(yytext) * 4 + 1; + char *v = malloc(len); + if (v != NULL) +- strnvis(v, yytext, len, 0); ++ strvis(v, yytext, 0); + sf_error("illegal token: %s", v); + free(v); + } Property changes on: head/sysutils/pftop/files/patch-sf-scanner.l ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property