- Move the project to github and mark it as fetchable again.

- While here, do some cosmetic changes on ports Makefile.
- Bump PORTREVISION.

Reported by:	many

3 files changed, 27 insertions, 18 deletions

diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index f40c32d451ac..7f38f1a53af1 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -3,17 +3,17 @@
 
 PORTNAME=	pftop
 PORTVERSION=	0.7
-PORTREVISION=	8
+PORTREVISION=	9
 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
 
-BROKEN=		unfetchable
-
 LICENSE=	BSD2CLAUSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	araujobsd
+
 OPTIONS_DEFINE=	ALTQ
 
 ALTQ_DESC=	ALTQ support for queue statistics
@@ -23,14 +23,16 @@ ALTQ_DESC=	ALTQ support for queue statistics
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bpf_dump.c \
 		${FILESDIR}/extra-patch-sf-gencode.h
 
-MAKE_ARGS=	LOCALBASE="${PREFIX}" OSLEVEL=45
+MAKE_ARGS=	LOCALBASE="${PREFIX}" \
+		OSLEVEL=45
 CFLAGS+=	-DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 \
 		-DHAVE_FINE_GRAINED_LOCKING=1
+
 .if ${PORT_OPTIONS:MALTQ}
 CFLAGS+=	-DHAVE_ALTQ=1
 .endif
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cache.c \
-		${FILESDIR}/extra-patch-cache.h \
+
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cache.c ${FILESDIR}/extra-patch-cache.h \
 		${FILESDIR}/extra-patch-config.h \
 		${FILESDIR}/extra-patch-pftop.c \
 		${FILESDIR}/extra-patch-sf-gencode.c
@@ -40,19 +42,23 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-engine.c
 MAKE_ARGS+=	CSTD=gnu89
 MAKE_ENV+=	__MAKE_CONF=/dev/null
 
-PLIST_FILES=	sbin/pftop man/man8/pftop.8.gz
+PLIST_FILES=	sbin/pftop \
+		man/man8/pftop.8.gz
 
 post-patch:
 	@${ECHO_MSG} "===> Applying FairQ/Codel patches to ${PORTNAME}."
 	@${CAT} ${FILESDIR}/extra-patch-fairq_codel.diff | \
 		${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS}
 	@${REINPLACE_CMD} -e 's|<sys/queue.h>|"${FILESDIR}/queue.h"|g' \
-	    ${WRKSRC}/engine.c
-	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.h
-	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.c
+		${WRKSRC}/engine.c
+	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' \
+		${WRKSRC}/sf-gencode.h
+	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' \
+		${WRKSRC}/sf-gencode.c
 	@${REINPLACE_CMD} -e 's|#include <net/if_pflog.h>||g' \
-	    ${WRKSRC}/sf-gencode.c
-	@${REINPLACE_CMD} -e 's|altq/|net/&|' ${WRKSRC}/pftop.c
+		${WRKSRC}/sf-gencode.c
+	@${REINPLACE_CMD} -e 's|altq/|net/&|' \
+		${WRKSRC}/pftop.c
 	@${REINPLACE_CMD} -e 's|#include .pcap-int.h.|#include <pcap/pcap.h>|g' \
 		${WRKSRC}/bpf_image.c \
 		${WRKSRC}/bpf_optimize.c \
@@ -63,7 +69,9 @@ post-patch:
 		${WRKSRC}/sf-scanner.l
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pftop ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/pftop.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/pftop \
+		${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/pftop.8 \
+		${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/pftop/distinfo b/sysutils/pftop/distinfo
index a1b686a8b775..701ce6545727 100644
--- a/sysutils/pftop/distinfo
+++ b/sysutils/pftop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pftop-0.7.tar.gz) = afde859fab77597e4aae1ef6b87f1bb26a5ad8cb2b1d7316a12e5098153492af
-SIZE (pftop-0.7.tar.gz) = 59765
+TIMESTAMP = 1576472707
+SHA256 (araujobsd-pftop-0.7_GH0.tar.gz) = 965cda963082746d7c14bf062f0200baf5b365bebdbc11b0642715f905701e9c
+SIZE (araujobsd-pftop-0.7_GH0.tar.gz) = 59594
diff --git a/sysutils/pftop/pkg-descr b/sysutils/pftop/pkg-descr
index 798b6aa56f19..bac88b50ba67 100644
--- a/sysutils/pftop/pkg-descr
+++ b/sysutils/pftop/pkg-descr
@@ -1,4 +1,4 @@
 Pftop is a small, curses-based utility for real-time display of active
 states and rule statistics for pf, the packet filter (for OpenBSD)
 
-WWW: http://www.eee.metu.edu.tr/~canacar/pftop/
+WWW: https://github.com/araujobsd/pftop/