diff --git a/www/apt-cacher-ng/Makefile b/www/apt-cacher-ng/Makefile
index d1f3ba749d8a..fb916f273e0b 100644
--- a/www/apt-cacher-ng/Makefile
+++ b/www/apt-cacher-ng/Makefile
@@ -1,61 +1,55 @@
 PORTNAME=	apt-cacher-ng
 PORTVERSION=	3.2.1
 CATEGORIES=	www
 MASTER_SITES=	DEBIAN_POOL/apt-cacher-ng
-DISTFILES=	${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	keve@keve.hu
 COMMENT=	Specialized http/s proxy for caching software distribution sites
 WWW=		https://www.unix-ag.uni-kl.de/~bloch/acng/
 
 LICENSE=	EduardBloch
 LICENSE_NAME=	Eduard Bloch license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		compiler:c++11-lang cmake cpe tar:xz
 CPE_VENDOR=	${PORTNAME}_project
 
 USE_RC_SUBR=	apt_cacher_ng
 
 CMAKE_ARGS=	-DLIBDIR:PATH=${DATADIR} \
 		-DMANDIR:PATH=${PREFIX}/man
 
 SUB_FILES=	backends_debian backends_freebsd backends_ubuntu \
 		freebsd_mirrors pkg-message
 
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 OPTIONS_DEFINE=	DOCS SSL FUSE
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=	yes
 
+FUSE_DESC=	FUSE support for interfacing with the proxy via acngfs
 SSL_DESC=	SSL support to allow proxying https sites
 
-SSL_CMAKE_BOOL=	USE_SSL
+FUSE_USES=		fuse pkgconfig
+FUSE_CMAKE_BOOL=	USE_FUSE
 SSL_USES=	ssl
+SSL_CMAKE_BOOL=	USE_SSL
 SSL_CMAKE_ON=	-Dopenssl_FOUND=1 \
 		-Dopenssl_CFLAGS="-I ${OPENSSLINC}" \
 		-Dopenssl_LDFLAGS="-L ${OPENSSLLIB} -lssl -lcrypto"
 
-FUSE_DESC=	FUSE support for interfacing with the proxy via acngfs
-
-FUSE_CMAKE_BOOL=	USE_FUSE
-FUSE_USES=		fuse pkgconfig
-
-.include <bsd.port.pre.mk>
-
-#.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
-#CXXFLAGS+=	-DOPENSSL_API_COMPAT=0x10100000L
-#.endif
-
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/acng.conf ${STAGEDIR}${ETCDIR}/acng.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/security.conf ${STAGEDIR}${ETCDIR}/security.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 .for f in backends_debian backends_freebsd backends_ubuntu
 	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/freebsd_mirrors ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}/var/cache/apt-cacher-ng \
 		${STAGEDIR}/var/log/apt-cacher-ng
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>