As reported by sthen, said ports are currently broken.
Here's a diff to repair them.

ok?

Index: sysutils/pftop/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/pftop/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- sysutils/pftop/Makefile     12 Oct 2013 13:12:43 -0000      1.27
+++ sysutils/pftop/Makefile     22 Apr 2014 02:59:48 -0000
@@ -4,7 +4,7 @@
 COMMENT=       curses-based real time state and rule display for pf
 
 DISTNAME=      pftop-0.7
-REVISION=      12
+REVISION=      13
 CATEGORIES=    sysutils
 
 HOMEPAGE=      http://www.eee.metu.edu.tr/~canacar/pftop/
Index: sysutils/pftop/patches/patch-config_h
===================================================================
RCS file: /cvs/ports/sysutils/pftop/patches/patch-config_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-config_h
--- sysutils/pftop/patches/patch-config_h       30 Nov 2009 09:56:39 -0000      
1.5
+++ sysutils/pftop/patches/patch-config_h       22 Apr 2014 10:18:06 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-config_h,v 1.5 2009/11/30 09:56:39 sthen Exp $
---- config.h.orig      Wed Nov  7 06:34:18 2007
-+++ config.h   Sun Nov 29 22:27:09 2009
-@@ -74,11 +74,24 @@
+XXX remove HAVE_ALTQ hack after bump to 5.6-current
+--- config.h.orig      Wed Nov  7 07:34:18 2007
++++ config.h   Tue Apr 22 05:05:05 2014
+@@ -74,11 +74,28 @@
  #define HAVE_PFSYNC_STATE
  #endif
  
@@ -13,6 +14,10 @@ $OpenBSD: patch-config_h,v 1.5 2009/11/3
 +/* #if OS_LEVEL > 46 */
 +#undef HAVE_RULE_NATPASS
 +/* #endif */
++
++#if OS_LEVEL > 55 || 1
++#undef HAVE_ALTQ
++#endif
 +
  #ifdef HAVE_PFSYNC_STATE
  typedef struct pfsync_state pf_state_t;
Index: net/pfstat/Makefile
===================================================================
RCS file: /cvs/ports/net/pfstat/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- net/pfstat/Makefile 17 Mar 2014 23:22:02 -0000      1.31
+++ net/pfstat/Makefile 22 Apr 2014 10:14:08 -0000
@@ -7,7 +7,7 @@ DISTNAME=       pfstat-2.3
 
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-daemon=        ${DISTNAME:S/-/d-/}
-REVISION=      6
+REVISION=      7
 CATEGORIES=    net
 MASTER_SITES=  http://www.benzedrine.cx/
 
Index: net/pfstat/patches/patch-parse_y
===================================================================
RCS file: /cvs/ports/net/pfstat/patches/patch-parse_y,v
retrieving revision 1.1
diff -u -p -r1.1 patch-parse_y
--- net/pfstat/patches/patch-parse_y    11 Mar 2013 19:50:04 -0000      1.1
+++ net/pfstat/patches/patch-parse_y    22 Apr 2014 10:13:56 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-parse_y,v 1.1 2013/03/11 19:50:04 sthen Exp $
---- parse.y.orig       Sun Feb 24 22:12:50 2013
-+++ parse.y    Sun Feb 24 22:13:05 2013
+--- parse.y.orig       Thu Jan 11 17:01:58 2007
++++ parse.y    Tue Apr 22 12:13:49 2014
 @@ -133,7 +133,7 @@ coldef             : GLOBAL STRING STRING
                            "short", "normalize", "memory", "bad-timestamp",
                            "congestion", "ip-option", "proto-cksum",
@@ -10,3 +10,12 @@ $OpenBSD: patch-parse_y,v 1.1 2013/03/11
                        int i;
  
                        $$.type = 0;
+@@ -181,6 +181,8 @@ coldef             : GLOBAL STRING STRING
+               /*      NAME   pass/drop packet/bytes */
+               | QUEUE STRING STRING STRING
+               {
++                      yyerror("ALTQ-style queues not supported anymore");
++                      YYERROR;
+                       $$.type = 2;
+                       $$.arg = strdup($2);
+                       if (!strcmp($3, "other"))
Index: net/pfstat/patches/patch-pf_c
===================================================================
RCS file: /cvs/ports/net/pfstat/patches/patch-pf_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pf_c
--- net/pfstat/patches/patch-pf_c       12 Oct 2013 13:11:34 -0000      1.1
+++ net/pfstat/patches/patch-pf_c       22 Apr 2014 03:10:06 -0000
@@ -1,12 +1,44 @@
 $OpenBSD: patch-pf_c,v 1.1 2013/10/12 13:11:34 sthen Exp $
---- pf.c.orig  Sat Oct 12 14:10:22 2013
-+++ pf.c       Sat Oct 12 14:10:25 2013
-@@ -74,7 +74,7 @@ query_queues(int fd, void (*cb)(int, const char *, int
+--- pf.c.orig  Tue Apr 22 05:08:25 2014
++++ pf.c       Tue Apr 22 05:10:01 2014
+@@ -38,10 +38,12 @@ static const char rcsid[] = "$Id: pf.c,v 1.1.1.1 2007/
+ #include <netinet/in.h>
+ #include <net/if.h>
+ #include <net/pfvar.h>
++#if 0
+ #include <altq/altq.h>
+ #include <altq/altq_cbq.h>
+ #include <altq/altq_priq.h>
+ #include <altq/altq_hfsc.h>
++#endif
+ #include <arpa/inet.h>
+ #include <err.h>
+ #include <errno.h>
+@@ -53,6 +55,7 @@ static const char rcsid[] = "$Id: pf.c,v 1.1.1.1 2007/
  
-       /* fetch each of those queues */
-       for (nr = 0; nr < mnr; ++nr) {
--              struct pfioc_qstats pq;
-+              struct pfioc_altqstats pq;
-               union altq_stats s;
-               u_int64_t c[8];
-               int i;
+ #include "pf.h"
+ 
++#if 0
+ union altq_stats {
+       class_stats_t            cbq;
+       struct priq_classstats   priq;
+@@ -138,6 +141,7 @@ query_queues(int fd, void (*cb)(int, const char *, int
+       }
+       return (0);
+ }
++#endif
+ 
+ static int
+ query_ifaces(int fd, void (*cb)(int, const char *, int, double))
+@@ -195,9 +199,11 @@ pf_query(int fd, void (*cb)(int, const char *, int, do
+               fprintf(stderr, "pf_query: query_ifaces() failed\n");
+               return (1);
+       }
++#if 0
+       if (query_queues(fd, cb)) {
+               fprintf(stderr, "pf_query: query_queues() failed\n");
+               return (1);
+       }
++#endif
+       return (0);
+ }


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to