Index: head/sysutils/goaccess/Makefile
===================================================================
--- head/sysutils/goaccess/Makefile
+++ head/sysutils/goaccess/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	goaccess
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://tar.goaccess.io/
 
@@ -10,39 +11,42 @@
 COMMENT=	Real-time Apache web log analyzer
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-USE_GNOME=	glib20
 USES=		pkgconfig
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
-
-CONFIGURE_ARGS=	--enable-utf8
-
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
 
-OPTIONS_DEFINE=	DOCS GEOIP TOKYOCABINET
-OPTIONS_DEFAULT=	GEOIP
+OPTIONS_DEFINE=	DOCS DEBUG GEOIP UTF8
+OPTIONS_DEFAULT=	GEOIP UTF8
+OPTIONS_RADIO=	TOKYOCABINET
+OPTIONS_RADIO_TOKYOCABINET=	TOKYOCABINET_BTREE TOKYOCABINET_MHASH
+
+DEBUG_CONFIGURE_ON=	--enable-debug
+UTF8_CONFIGURE_ON=	--enable-utf8
 
 GEOIP_CONFIGURE_ON=	--enable-geoip
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 TOKYOCABINET_DESC=	Tokyo Cabinet support
-TOKYOCABINET_CONFIGURE_ON=	--enable-tcb=btree
+TOKYOCABINET_BTREE_DESC=	Storage using on-disk B+ Tree
+TOKYOCABINET_MHASH_DESC=	Storage using on-memory hash database
+TOKYOCABINET_BTREE_CONFIGURE_ON=	--enable-tcb=btree
+TOKYOCABINET_MHASH_CONFIGURE_ON=	--enable-tcb=memhash
 TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
-
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+
 .include <bsd.port.mk>
Index: head/sysutils/goaccess/pkg-plist
===================================================================
--- head/sysutils/goaccess/pkg-plist
+++ head/sysutils/goaccess/pkg-plist
@@ -0,0 +1,11 @@
+bin/goaccess
+@sample etc/goaccess.conf.sample
+man/man1/goaccess.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/app.css
+%%PORTDOCS%%%%DOCSDIR%%/app.js
+%%PORTDOCS%%%%DOCSDIR%%/bootstrap.min.css
+%%PORTDOCS%%%%DOCSDIR%%/charts.js
+%%PORTDOCS%%%%DOCSDIR%%/d3.v3.min.js
+%%PORTDOCS%%%%DOCSDIR%%/fa.min.css
+%%PORTDOCS%%%%DOCSDIR%%/hogan.min.js
+%%PORTDOCS%%%%DOCSDIR%%/tpls.html