2 files changed, 38 insertions, 58 deletions

diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 78ca876ea9e8..afb43940a28f 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -6,75 +6,53 @@ PORTVERSION=	1.8.3
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	https://banu.com/pub/tinyproxy/1.8/
+MASTER_SITES=	https://banu.com/pub/tinyproxy/${PORTVERSION:R}/ \
+		LOCAL/sunpoet
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A small, efficient HTTP proxy server
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Small, efficient HTTP proxy server
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 
-#BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc\
-#		xsltproc:${PORTSDIR}/textproc/libxslt\
-#		xmllint:${PORTSDIR}/textproc/libxml2 \
-#		${LOCALBASE}/share/xsl/docbook/lib/lib.xsl:${PORTSDIR}/textproc/docbook-xsl
-
-USE_RC_SUBR=	tinyproxy
-GNU_CONFIGURE=	yes
-USES=		gmake
-CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
-		--program-transform-name="" \
-		--disable-silent-rules \
-		--localstatedir=/var
-
-MAN8=		tinyproxy.8
-MAN5=		tinyproxy.conf.5
-
-OPTIONS_DEFINE=	XHEADER REVERSE TRANSPARENT
-XHEADER_DESC=		X-Tinyproxy header
+OPTIONS_DEFINE=	REVERSE TRANSPARENT XHEADER
 REVERSE_DESC=		Reverse proxy support
 TRANSPARENT_DESC=	Transparent proxy support
+XHEADER_DESC=		X-Tinyproxy header
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MREVERSE}
-CONFIGURE_ARGS+=	--enable-reverse
-.endif
-
-.if ${PORT_OPTIONS:MTRANSPARENT}
-CONFIGURE_ARGS+=	--enable-transparent
-.endif
+CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
+		--disable-silent-rules \
+		--localstatedir=/var \
+		--program-transform-name=""
+GNU_CONFIGURE=	yes
+USE_RC_SUBR=	${PORTNAME}
+USES=		gmake
 
-.if !${PORT_OPTIONS:MXHEADER}
-CONFIGURE_ARGS+=	--disable-xtinyproxy
-.endif
+REVERSE_CONFIGURE_ENABLE=	reverse
+TRANSPARENT_CONFIGURE_ENABLE=	transparent
+XHEADER_CONFIGURE_ENABLE=	xtinyproxy
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/etc/tinyproxy/tinyproxy.conf|${PREFIX}/etc/tinyproxy.conf|' \
-	  ${WRKSRC}/docs/man8/tinyproxy.txt.in
-	@${REINPLACE_CMD} -e 's|/var/run/tinyproxy/tinyproxy.pid|/var/run/tinyproxy.pid|' \
-	  ${WRKSRC}/docs/man8/tinyproxy.txt.in
-	@${REINPLACE_CMD} -e 's|/var/log/tinyproxy/tinyproxy.log|/var/log/tinyproxy.log|' \
-	  ${WRKSRC}/docs/man8/tinyproxy.txt.in
-	@${REINPLACE_CMD} -e 's|/etc/tinyproxy/tinyproxy.conf|${PREFIX}/etc/tinyproxy.conf|' \
-	  ${WRKSRC}/docs/man5/tinyproxy.conf.txt.in
-	@${REINPLACE_CMD} -e 's|/usr/share/tinyproxy|${DATADIR}|' \
-	  ${WRKSRC}/etc/tinyproxy.conf.in
-	@${REINPLACE_CMD} -e 's|/run/tinyproxy/|/run/|' \
-	  ${WRKSRC}/etc/tinyproxy.conf.in
-	@${REINPLACE_CMD} -e 's|/log/tinyproxy/|/log/|' \
-	  ${WRKSRC}/etc/tinyproxy.conf.in
+	@${REINPLACE_CMD} -e 's|tinyproxy/tinyproxy|tinyproxy|g; s|/etc/tinyproxy|${PREFIX}&|' \
+		${WRKSRC}/docs/man5/tinyproxy.conf.txt.in \
+		${WRKSRC}/docs/man8/tinyproxy.txt.in \
+		${WRKSRC}/etc/tinyproxy.conf.in
+	@${REINPLACE_CMD} -e '/\/usr\/share\/tinyproxy/d' ${WRKSRC}/etc/tinyproxy.conf.in
+#	@${REINPLACE_CMD} \
+#		-e 's|/etc/tinyproxy/tinyproxy.conf|${PREFIX}/etc/tinyproxy.conf|' \
+#		-e 's|/var/log/tinyproxy/tinyproxy.log|/var/log/tinyproxy.log|' \
+#		's|/var/run/tinyproxy/tinyproxy.pid|/var/run/tinyproxy.pid|' \
+#			${WRKSRC}/docs/man5/tinyproxy.conf.txt.in ${WRKSRC}/docs/man8/tinyproxy.txt.in
+#	@${REINPLACE_CMD} \
+#		-e 's|/log/tinyproxy/|/log/|' \
+#		-e 's|/run/tinyproxy/|/run/|' \
+#		-e 's|/usr/share/tinyproxy|${DATADIR}|' \
+#			${WRKSRC}/etc/tinyproxy.conf.in
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/tinyproxy.conf ]; then \
-		${CP} -p ${PREFIX}/etc/tinyproxy.conf.sample \
-		${PREFIX}/etc/tinyproxy.conf ; \
-	fi
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${FILESDIR}/${MAN5} ${MAN1PREFIX}/man/man5
-	${INSTALL_MAN} ${FILESDIR}/${MAN8} ${MAN1PREFIX}/man/man8
-.endif
+	${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf ${STAGEDIR}${PREFIX}/etc/tinyproxy.conf.sample
+	${INSTALL_MAN} ${FILESDIR}/tinyproxy.conf.5 ${STAGEDIR}${PREFIX}/man/man5/
+	${INSTALL_MAN} ${FILESDIR}/tinyproxy.8 ${STAGEDIR}${PREFIX}/man/man8/
 
 .include <bsd.port.mk>
diff --git a/www/tinyproxy/pkg-plist b/www/tinyproxy/pkg-plist
index 5b619888edc2..3a10ec792d07 100644
--- a/www/tinyproxy/pkg-plist
+++ b/www/tinyproxy/pkg-plist
@@ -1,6 +1,8 @@
 @unexec if cmp -s %D/etc/tinyproxy.conf.sample %D/etc/tinyproxy.conf; then rm -f %D/etc/tinyproxy.conf; fi
 etc/tinyproxy.conf.sample
 @exec if [ ! -f %D/etc/tinyproxy.conf ] ; then cp -p %D/%F %B/tinyproxy.conf; fi
+man/man5/tinyproxy.conf.5.gz
+man/man8/tinyproxy.8.gz
 sbin/tinyproxy
 %%DATADIR%%/debug.html
 %%DATADIR%%/default.html