Index: head/sysutils/pfstat/Makefile =================================================================== --- head/sysutils/pfstat/Makefile (revision 358808) +++ head/sysutils/pfstat/Makefile (revision 358809) @@ -1,46 +1,41 @@ # Created by: Max Laier # $FreeBSD$ PORTNAME= pfstat PORTVERSION= 2.5 PORTREVISION= 1 CATEGORIES= sysutils net MASTER_SITES= http://www.benzedrine.cx/ MAINTAINER= araujo@FreeBSD.org COMMENT= Utility to render graphical statistics for pf LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd MAKE_ARGS= "LD_GD=gd" MAKE_ENV+= __MAKE_CONF=/dev/null USES= iconv USE_RC_SUBR= pfstatd MAN8= pfstat.8 \ pfstatd.8 MANCOMPRESSED= no PLIST_FILES= bin/pfstat \ bin/pfstatd -NO_STAGE= yes .include -.if ${OSVERSION} < 700048 -EXTRA_PATCHES= ${PATCHDIR}/pre41-patch-pf.c -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lgd|-l$${LD_GD}|; s| -lttf||' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ ${WRKSRC}/pfstat.[c8] do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/pfstatd/pfstatd ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/pfstatd/pfstatd.8 ${PREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${STAGEDIR}/${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/pfstatd/pfstatd ${STAGEDIR}/${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${STAGEDIR}/${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/pfstatd/pfstatd.8 ${STAGEDIR}/${PREFIX}/man/man8 .include Index: head/sysutils/pfstat/files/pre41-patch-pf.c =================================================================== --- head/sysutils/pfstat/files/pre41-patch-pf.c (revision 358808) +++ head/sysutils/pfstat/files/pre41-patch-pf.c (nonexistent) @@ -1,31 +0,0 @@ ---- pf.c.orig Thu May 11 23:41:07 2006 -+++ pf.c Mon Dec 11 21:08:31 2006 -@@ -144,23 +142,24 @@ - query_ifaces(int fd, void (*cb)(int, const char *, int, double)) - { - struct pfioc_iface io; -- struct pfi_kif ifs[256]; -+ struct pfi_if ifs[256]; - int i, j; - - memset(&io, 0, sizeof(io)); - io.pfiio_buffer = ifs; - io.pfiio_esize = sizeof(ifs[0]); - io.pfiio_size = sizeof(ifs) / sizeof(ifs[0]); -+ io.pfiio_flags = PFI_FLAG_ALLMASK; - if (ioctl(fd, DIOCIGETIFACES, &io)) { - fprintf(stderr, "ioctl: DIOCIGETIFACES: %s\n", strerror(errno)); - return (1); - } - for (i = 0; i < io.pfiio_size; ++i) - for (j = 0; j < 16; ++j) -- (*cb)(COL_TYPE_IFACE, ifs[i].pfik_name, -+ (*cb)(COL_TYPE_IFACE, ifs[i].pfif_name, - j, j & 4 ? -- ifs[i].pfik_packets[j&1?0:1][j&2?0:1][j&8?0:1] : -- ifs[i].pfik_bytes[j&1?0:1][j&2?0:1][j&8?0:1]); -+ ifs[i].pfif_packets[j&1?0:1][j&2?0:1][j&8?0:1] : -+ ifs[i].pfif_bytes[j&1?0:1][j&2?0:1][j&8?0:1]); - /* bytes/packets[af][dir][op] */ - return (0); - } Property changes on: head/sysutils/pfstat/files/pre41-patch-pf.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property