Index: head/sysutils/pftop/Makefile =================================================================== --- head/sysutils/pftop/Makefile (revision 431684) +++ head/sysutils/pftop/Makefile (revision 431685) @@ -1,58 +1,67 @@ # Created by: Max Laier # $FreeBSD$ PORTNAME= pftop PORTVERSION= 0.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils net MASTER_SITES= http://www.eee.metu.edu.tr/~canacar/ MAINTAINER= araujo@FreeBSD.org COMMENT= Utility for real-time display of statistics for pf +LICENSE= BSD2CLAUSE + +OPTIONS_DEFINE= ALTQ + +ALTQ_DESC= ALTQ support for queue statistics + .include .if ${OSVERSION} >= 1100080 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bpf_dump.c \ ${FILESDIR}/extra-patch-sf-gencode.h .endif MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=45 -CFLAGS+= -DHAVE_ALTQ=1 -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 +CFLAGS+= -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 +.if ${PORT_OPTIONS:MALTQ} +CFLAGS+= -DHAVE_ALTQ=1 +.endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cache.c \ ${FILESDIR}/extra-patch-cache.h \ ${FILESDIR}/extra-patch-config.h \ ${FILESDIR}/extra-patch-pftop.c \ ${FILESDIR}/extra-patch-sf-gencode.c .if ${OSVERSION} > 1000017 CFLAGS+= -DHAVE_FINE_GRAINED_LOCKING=1 .endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-engine.c MAKE_ARGS+= CSTD=gnu89 MAKE_ENV+= __MAKE_CONF=/dev/null PLIST_FILES= sbin/pftop man/man8/pftop.8.gz post-patch: .if ${OSVERSION} >= 1100000 @${ECHO_MSG} "===> Applying FairQ/Codel patches to ${PORTNAME}." @${CAT} ${FILESDIR}/extra-patch-fairq_codel.diff | \ ${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} .endif @${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 .if ${OPSYS} == DragonFly || ${OSVERSION} >= 1100070 @${REINPLACE_CMD} -e 's|altq/|net/&|' ${WRKSRC}/pftop.c .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pftop ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/pftop.8 ${STAGEDIR}${MANPREFIX}/man/man8 .include Index: head/sysutils/pftop/files/patch-config.h =================================================================== --- head/sysutils/pftop/files/patch-config.h (revision 431684) +++ head/sysutils/pftop/files/patch-config.h (revision 431685) @@ -1,23 +1,11 @@ -*** config.h.orig Sat Jan 21 04:39:55 2006 ---- config.h Sat Jan 21 04:40:15 2006 -*************** -*** 23,31 **** - - #if OS_LEVEL > 32 - #define HAVE_ADDR_MASK - #define HAVE_ADDR_TYPE -! #define HAVE_ALTQ - #define HAVE_RULE_TOS - #define HAVE_OP_RRG - #endif - ---- 23,31 ---- - - #if OS_LEVEL > 32 - #define HAVE_ADDR_MASK - #define HAVE_ADDR_TYPE -! /* #define HAVE_ALTQ */ - #define HAVE_RULE_TOS - #define HAVE_OP_RRG - #endif - +--- config.h.orig 2016-11-02 12:16:30 UTC ++++ config.h +@@ -42,7 +42,7 @@ + #if OS_LEVEL > 32 + #define HAVE_ADDR_MASK + #define HAVE_ADDR_TYPE +-#define HAVE_ALTQ ++/* #define HAVE_ALTQ */ + #define HAVE_RULE_TOS + #define HAVE_OP_RRG + #endif