From owner-svn-ports-all@FreeBSD.ORG Tue Oct 21 08:41:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 047156C6; Tue, 21 Oct 2014 08:41:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAE92966; Tue, 21 Oct 2014 08:41:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9L8ftvd032793; Tue, 21 Oct 2014 08:41:55 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9L8ftLP032782; Tue, 21 Oct 2014 08:41:55 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201410210841.s9L8ftLP032782@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Tue, 21 Oct 2014 08:41:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371313 - in head/sysutils/pftop: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2014 08:41:56 -0000 Author: araujo Date: Tue Oct 21 08:41:54 2014 New Revision: 371313 URL: https://svnweb.freebsd.org/changeset/ports/371313 QAT: https://qat.redports.org/buildarchive/r371313/ Log: - Fix my latest commit, it UNBROKEN on 11, but BREAK it in all other OSVERSION. - Bump PORTREVISION. Reported by: "Herbert J. Skuhra" Tested by: "Herbert J. Skuhra" Added: head/sysutils/pftop/files/extra-patch-bpf_dump.c - copied unchanged from r371311, head/sysutils/pftop/files/patch-bpf_dump.c head/sysutils/pftop/files/extra-patch-sf-gencode.h - copied unchanged from r371311, head/sysutils/pftop/files/patch-sf-gencode.h Deleted: head/sysutils/pftop/files/patch-bpf_dump.c head/sysutils/pftop/files/patch-sf-gencode.h Modified: head/sysutils/pftop/Makefile Modified: head/sysutils/pftop/Makefile ============================================================================== --- head/sysutils/pftop/Makefile Tue Oct 21 08:30:48 2014 (r371312) +++ head/sysutils/pftop/Makefile Tue Oct 21 08:41:54 2014 (r371313) @@ -3,7 +3,7 @@ PORTNAME= pftop PORTVERSION= 0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils net MASTER_SITES= http://www.eee.metu.edu.tr/~canacar/ @@ -12,6 +12,11 @@ COMMENT= Utility for real-time display o .include +.if ${OSVERSION} >= 1100000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bpf_dump.c \ + ${FILESDIR}/extra-patch-sf-gencode.h +.endif + .if ${OSVERSION} < 900039 MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=41 CFLAGS+= -DHAVE_ALTQ=1 Copied: head/sysutils/pftop/files/extra-patch-bpf_dump.c (from r371311, head/sysutils/pftop/files/patch-bpf_dump.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pftop/files/extra-patch-bpf_dump.c Tue Oct 21 08:41:54 2014 (r371313, copy of r371311, head/sysutils/pftop/files/patch-bpf_dump.c) @@ -0,0 +1,15 @@ +--- bpf_dump.c.orig 2007-11-07 07:34:18.000000000 +0100 ++++ bpf_dump.c 2014-10-17 12:39:01.000000000 +0200 +@@ -33,10 +33,10 @@ + #include + + +-extern void bpf_dump(struct bpf_program *, int); ++extern void bpf_dump(const struct bpf_program *, int); + + void +-bpf_dump(struct bpf_program *p, int option) ++bpf_dump(const struct bpf_program *p, int option) + { + struct bpf_insn *insn; + int i; Copied: head/sysutils/pftop/files/extra-patch-sf-gencode.h (from r371311, head/sysutils/pftop/files/patch-sf-gencode.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pftop/files/extra-patch-sf-gencode.h Tue Oct 21 08:41:54 2014 (r371313, copy of r371311, head/sysutils/pftop/files/patch-sf-gencode.h) @@ -0,0 +1,10 @@ +--- sf-gencode.h 2014-10-17 12:39:16.000000000 +0200 ++++ sf-gencode.h.orig 2014-10-17 12:39:01.000000000 +0200 +@@ -188,7 +188,7 @@ + const char *sf_get_error(void); + int sf_compile(struct bpf_program *, char *, int, bpf_u_int32); + void sf_freecode(struct bpf_program *); +-void bpf_dump(struct bpf_program *, int); ++void bpf_dump(const struct bpf_program *, int); + + extern int no_optimize;