Date: Mon, 16 Jan 2017 18:14:26 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431685 - in head/sysutils/pftop: . files Message-ID: <201701161814.v0GIEQEn083557@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Jan 16 18:14:26 2017 New Revision: 431685 URL: https://svnweb.freebsd.org/changeset/ports/431685 Log: sysutils/pftop: add ALTQ option, disable by default - ALTQ is not in GENERIC and thus browsing through pftop modes the queue view gives an error. - While there, modernise the ATLQ disable patch, it is not a unified diff. - Add LICENSE PR: 215313 Submitted by: Franco Fichtner <franco@opnsense.org> Approved by: araujo (maintainer) Modified: head/sysutils/pftop/Makefile head/sysutils/pftop/files/patch-config.h Modified: head/sysutils/pftop/Makefile ============================================================================== --- head/sysutils/pftop/Makefile Mon Jan 16 17:24:39 2017 (r431684) +++ head/sysutils/pftop/Makefile Mon Jan 16 18:14:26 2017 (r431685) @@ -3,13 +3,19 @@ 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 <bsd.port.pre.mk> .if ${OSVERSION} >= 1100080 @@ -18,7 +24,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- .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 \ Modified: head/sysutils/pftop/files/patch-config.h ============================================================================== --- head/sysutils/pftop/files/patch-config.h Mon Jan 16 17:24:39 2017 (r431684) +++ head/sysutils/pftop/files/patch-config.h Mon Jan 16 18:14:26 2017 (r431685) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701161814.v0GIEQEn083557>