 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.38 2018/06/21 11:31:33 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/10/12 13:57:46 adam Exp $
-DISTNAME=	tinyproxy-1.8.4
+DISTNAME=	tinyproxy-1.10.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tinyproxy/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://tinyproxy.github.io/
 COMMENT=	Lightweight HTTP/SSL proxy
 LICENSE=	gnu-gpl-v2
 BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
 BUILD_DEFS+=		VARBASE
 @@ -36,27 +36,27 @@ FILES_SUBST+=		TINYPROXY_GROUP=${TINYPRO
 EGDIR=		${PREFIX}/share/examples/tinyproxy
 CONF_FILES=	${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf
 SUBST_CLASSES+=		docs
 SUBST_STAGE.docs=	pre-configure
 SUBST_FILES.docs=	docs/man5/tinyproxy.conf.txt.in docs/man8/tinyproxy.txt.in etc/tinyproxy.conf.in
 SUBST_SED.docs+=	-e 's,@TINYPROXY_USER@,${TINYPROXY_USER},g'
 SUBST_SED.docs+=	-e 's,@TINYPROXY_GROUP@,${TINYPROXY_GROUP},g'
 SUBST_SED.docs+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.docs+=	-e 's,@VARBASE@,${VARBASE},g'
 INSTALLATION_DIRS=	${EGDIR} share/doc/tinyproxy
-PLIST_SUBST+=		VARBASE=${VARBASE:Q}
+PLIST_SUBST+=		VARBASE=${VARBASE}
 PLIST_SUBST+=		TINYPROXY_USER=${TINYPROXY_USER:Q}
 PLIST_SUBST+=		TINYPROXY_GROUP=${TINYPROXY_GROUP:Q}
 PLIST_SUBST+=		MKDIR=${MKDIR:Q} RMDIR=${RMDIR:Q} TRUE=${TRUE:Q}
 PLIST_SUBST+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf \
 		${DESTDIR}${EGDIR}/tinyproxy.conf.default
 	${INSTALL_DATA} ${WRKSRC}/docs/filter-howto.txt \
 		${DESTDIR}${PREFIX}/share/doc/tinyproxy/
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,17 +1,21 @@
-@comment $NetBSD: PLIST,v 1.7 2017/02/18 05:59:23 nonaka Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/10/12 13:57:46 adam Exp $
 bin/tinyproxy
 man/man5/tinyproxy.conf.5
 man/man8/tinyproxy.8
-sbin/tinyproxy
+share/doc/tinyproxy/AUTHORS
 share/doc/tinyproxy/NEWS
 share/doc/tinyproxy/README
 share/doc/tinyproxy/README.md
 share/doc/tinyproxy/filter-howto.txt
 share/examples/tinyproxy/tinyproxy.conf.default
 share/tinyproxy/debug.html
 share/tinyproxy/default.html
 share/tinyproxy/stats.html
 @exec ${MKDIR} ${VARBASE}/log/tinyproxy || ${TRUE}
 @exec ${CHOWN} ${TINYPROXY_USER}:${TINYPROXY_GROUP} ${VARBASE}/log/tinyproxy || ${TRUE}
 @exec ${CHMOD} 755 ${VARBASE}/log/tinyproxy || ${TRUE}
 @exec ${MKDIR} ${VARBASE}/run/tinyproxy || ${TRUE}
 @exec ${CHOWN} ${TINYPROXY_USER}:${TINYPROXY_GROUP} ${VARBASE}/run/tinyproxy || ${TRUE}
 @exec ${CHMOD} 755 ${VARBASE}/run/tinyproxy || ${TRUE}
 @unexec ${RMDIR} ${VARBASE}/log/tinyproxy 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} ${VARBASE}/run/tinyproxy 2>/dev/null || ${TRUE}

 @@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.12 2018/06/21 11:31:33 adam Exp $
+$NetBSD: distinfo,v 1.13 2018/10/12 13:57:46 adam Exp $
-SHA1 (tinyproxy-1.8.4.tar.xz) = 2ecc31268b386c282f4c9f4ed53dd9b76f3c3aee
+SHA1 (tinyproxy-1.10.0.tar.xz) = c69fccde7aabd89434f94789a156847edde9aa28
-RMD160 (tinyproxy-1.8.4.tar.xz) = 5fd68912b1977badf261756b34a1de7efc183a72
+RMD160 (tinyproxy-1.10.0.tar.xz) = 8c22dadf2b50dbb841fb730395fd33244f5f2d33
-SHA512 (tinyproxy-1.8.4.tar.xz) = 23398a2c8a6d926b371086ba96032d0fd8dd06d114edf24950b868f53bb6b4235cd0f5d6b9a0131879fcc16bbe6b71142a6855de593a937ef7b0c323b50e0aec
+SHA512 (tinyproxy-1.10.0.tar.xz) = 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
-Size (tinyproxy-1.8.4.tar.xz) = 192300 bytes
+Size (tinyproxy-1.10.0.tar.xz) = 176060 bytes
 SHA1 (patch-configure) = c0d7af647d06eac76835506823a8df4f1bd7bd49
 SHA1 (patch-docs_man5_tinyproxy.conf.txt.in) = 1641f7c44ce84f2ebac6e945760af3ba77976f31
 SHA1 (patch-docs_man8_tinyproxy.txt.in) = 12c43d0f874a8794cbe8da7c702e406e8b10a99b
-SHA1 (patch-etc_Makefile.in) = 34ab3402bf11be5d2c1521f8ca0254ecbf19fc3c
+SHA1 (patch-etc_Makefile.in) = 05586bae07900c24dd418bddcbf0157ba2b302ef
-SHA1 (patch-etc_tinyproxy.conf.in) = 2694a3f4cd1c2481eb765c8c9a26a58ac94f2574
+SHA1 (patch-etc_tinyproxy.conf.in) = 19481a177119b266034280d8923ea855021d8663

 @@ -1,18 +1,18 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: tinyproxy.sh,v 1.3 2017/02/18 05:59:23 nonaka Exp $
+# $NetBSD: tinyproxy.sh,v 1.4 2018/10/12 13:57:46 adam Exp $
+#
 # PROVIDE: tinyproxy
 # REQUIRE: DAEMON
 . /etc/rc.subr
 name="tinyproxy"
 rcvar=$name
-command="@PREFIX@/sbin/${name}"
+command="@PREFIX@/bin/${name}"
 pidfile="@VARBASE@/run/tinyproxy/${name}.pid"
 required_files="@PKG_SYSCONFDIR@/${name}.conf"
 load_rc_config $name
 run_rc_command "$1"

 @@ -1,15 +1,15 @@
-$NetBSD: patch-etc_Makefile.in,v 1.1 2012/12/12 13:01:23 wiz Exp $
+$NetBSD: patch-etc_Makefile.in,v 1.2 2018/10/12 13:57:46 adam Exp $
 Use pkgsrc framework for config files.
---- etc/Makefile.in.orig	2012-10-04 23:12:45.697375000 +0000
+--- etc/Makefile.in.orig	2018-10-12 13:51:26.000000000 +0000
 +++ etc/Makefile.in
-@@ -355,7 +355,7 @@ install-dvi: install-dvi-am
+@@ -424,7 +424,7 @@ info: info-am
- install-dvi-am:
+ info-am:
--install-exec-am: install-sysconfDATA
+-install-data-am: install-pkgsysconfDATA
-+install-exec-am:
++install-data-am:
- install-html: install-html-am
+ install-dvi: install-dvi-am

 @@ -1,26 +1,26 @@
-$NetBSD: patch-etc_tinyproxy.conf.in,v 1.2 2018/06/21 11:31:33 adam Exp $
+$NetBSD: patch-etc_tinyproxy.conf.in,v 1.3 2018/10/12 13:57:46 adam Exp $
 Customize settings.
---- etc/tinyproxy.conf.in.orig	2010-03-03 18:37:24.000000000 +0900
+--- etc/tinyproxy.conf.in.orig	2018-08-31 23:03:36.000000000 +0000
-+++ etc/tinyproxy.conf.in	2016-12-15 11:05:42.000000000 +0900
++++ etc/tinyproxy.conf.in
 @@ -12,8 +12,8 @@
  # as the root user. Either the user or group name or the UID or GID
  # number may be used.
+ #
 -User nobody
 -Group nobody
 +User @TINYPROXY_USER@
 +Group @TINYPROXY_GROUP@
+ #
  # Port: Specify the port which tinyproxy will listen on.  Please note
-@@ -122,7 +122,7 @@ LogLevel Info
+@@ -124,7 +124,7 @@ LogLevel Info
  # PidFile: Write the PID of the main tinyproxy thread to this file so it
  # can be used for signalling purposes.
  # If not specified, no pidfile will be written.
+ #
 -#PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"
 +PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"
+ #
  # XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which