Index: sysutils/syslog-ng320/Makefile
===================================================================
--- sysutils/syslog-ng320/Makefile	(revision 496949)
+++ sysutils/syslog-ng320/Makefile	(working copy)
@@ -3,20 +3,26 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.20.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
-DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	320
 .endif
+DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
+BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
+
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
+USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
+		gettext-runtime
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	syslog-ng
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
@@ -35,17 +41,12 @@
 REDIS_DESC=		Build with Redis support
 JAVA_DESC=		Build with Java support (no modules)
 JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
-PYTHON_DESC=		Build with Python 3.6 support
+PYTHON_DESC=		Build with Python ${PYTHON_VER} support
 CURL_DESC=		Build with Curl HTTP support
 AMQP_DESC=		Build with AMQP support
 RIEMANN_DESC=		Build with Riemann support
 
-USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
-		gettext-runtime python:3.6,build shebangfix
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	syslog-ng
 SHEBANG_FILES=	lib/merge-grammar.py
-SHEBANG_LANG=	python3
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
@@ -74,7 +75,7 @@
 AMQP_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
 
 GEOIP2_CONFIGURE_ENABLE=	geoip2
-GEOIP2_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb                                
+GEOIP2_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 GEOIP2_LDFLAGS=			-L${LOCALBASE}/lib
 GEOIP2_PLIST_FILES=		lib/syslog-ng/libgeoip2-plugin.so
 
@@ -135,49 +136,50 @@
 				lib/syslog-ng/java-modules/http.jar \
 				lib/syslog-ng/java-modules/syslog-ng-common.jar
 
-PYTHON_CONFIGURE_ON=		--enable-python
-PYTHON_CONFIGURE_OFF=		--disable-python --with-python=3.6
-PYTHON_CONFIGURE_WITH=		python=3.6
+PYTHON_CONFIGURE_ON=		--enable-python --with-python=${PYTHON_VER}
+PYTHON_CONFIGURE_OFF=		--disable-python
+PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
 PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
-                   %%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
-                   %%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/__pycache__/__init__.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__init__.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/__init__.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/choicecompleter.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/choicecompleter.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/commandlinelexer.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completer.py  \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completer.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completerlang.py  \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completerlang.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuggercli.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuggercli.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuglang.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuglang.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/getoptlexer.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/getoptlexer.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/langcompleter.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/langcompleter.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexer.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexer.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexertoken.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexertoken.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/macrocompleter.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/macrocompleter.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/readline.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/readline.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/syslognginternals.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/syslognginternals.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tablexer.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tablexer.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelang.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelang.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelexer.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelexer.cpython-36.pyc \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tflang.py \
-                   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tflang.cpython-36.pyc
+		   %%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
+		   %%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__init__.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/choicecompleter.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/choicecompleter.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/commandlinelexer.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completer.py  \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completer.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completerlang.py  \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completerlang.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuggercli.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuggercli.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuglang.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuglang.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/getoptlexer.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/getoptlexer.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/langcompleter.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/langcompleter.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexer.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexer.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexertoken.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexertoken.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/macrocompleter.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/macrocompleter.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/readline.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/readline.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/syslognginternals.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/syslognginternals.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tablexer.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tablexer.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelang.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelang.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelexer.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelexer.cpython-${PYTHON_SUFFIX}.pyc \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tflang.py \
+		   %%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
+PYTHON_USES=		bison:build python:3.5+,build shebangfix
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
@@ -191,7 +193,7 @@
 .include <bsd.port.pre.mk>
 
 .if !${PORT_OPTIONS:MJSON}
-BROKEN=           Default configuration does not currently support non-JSON builds
+BROKEN=		Default configuration does not currently support non-JSON builds
 .endif
 
 post-patch:
@@ -200,7 +202,7 @@
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR}