Index: Makefile
===================================================================
--- Makefile	(revision 512709)
+++ Makefile	(working copy)
@@ -2,25 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	hnb
-PORTVERSION=	1.9.17
-PORTREVISION=	1
+PORTVERSION=	1.9.18
 CATEGORIES=	editors
-MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Hierarchical NoteBook a data organizer
 
 LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/../COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS=	i386
+USES=		gmake
 
-USES=		gmake
-ALL_TARGET=	# empty
+USE_GITHUB=	yes
+GH_ACCOUNT=	fraggerfox
+GH_TAGNAME=	v${PORTVERSION}
+
 MAKE_JOBS_UNSAFE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	*
@@ -28,16 +26,17 @@
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|make|$${MAKE}|'	${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|; s|make|$${MAKE}|' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/libcli/Makefile
+		${WRKSRC}/src/Makefile
+	@${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/src/libcli/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hnb ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN}	${WRKSRC}/../doc/hnb.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN}	${WRKSRC}/doc/hnb.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in Documentation.hnb Documentation.html hnbrc
-	${INSTALL_DATA} ${WRKSRC}/../doc/${FILE} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 512709)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (hnb-1.9.17.tar.gz) = c233c00aaef5b7fb93759d7888c885f99f40aec689a7f3e0d5d8b5797bf80cd4
-SIZE (hnb-1.9.17.tar.gz) = 143700
+TIMESTAMP = 1569423315
+SHA256 (fraggerfox-hnb-1.9.18-v1.9.18_GH0.tar.gz) = 6bc2f91db35483d0c4e54999fdae4d22e5778fa68bf333cdb8459da443f6b09e
+SIZE (fraggerfox-hnb-1.9.18-v1.9.18_GH0.tar.gz) = 141438