svn commit: r371313 - in head/sysutils/pftop: . files

[Marcelo Araujo]

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" <herbert at oslo.ath.cx>
  Tested by:	"Herbert J. Skuhra" <herbert at oslo.ath.cx>

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 <bsd.port.pre.mk>
 
+.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 <stdio.h>
+ 
+ 
+-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;