diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/tinyproxy/Makefile | 6 | ||||
| -rw-r--r-- | www/tinyproxy/PLIST | 8 | ||||
| -rw-r--r-- | www/tinyproxy/distinfo | 15 | ||||
| -rwxr-xr-x | www/tinyproxy/files/tinyproxy.sh | 4 | ||||
| -rw-r--r-- | www/tinyproxy/patches/patch-configure | 14 | ||||
| -rw-r--r-- | www/tinyproxy/patches/patch-etc_Makefile.in | 14 | ||||
| -rw-r--r-- | www/tinyproxy/patches/patch-etc_tinyproxy.conf.in | 10 |
7 files changed, 30 insertions, 41 deletions
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index cc10bfc3af8..1b97c3c0f79 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -1,6 +1,6 @@ -# $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} @@ -46,7 +46,7 @@ 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} diff --git a/www/tinyproxy/PLIST b/www/tinyproxy/PLIST index de638dab098..f16a21f7e13 100644 --- a/www/tinyproxy/PLIST +++ b/www/tinyproxy/PLIST @@ -1,7 +1,11 @@ -@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 diff --git a/www/tinyproxy/distinfo b/www/tinyproxy/distinfo index 449abba0f76..6e13b63b091 100644 --- a/www/tinyproxy/distinfo +++ b/www/tinyproxy/distinfo @@ -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 -RMD160 (tinyproxy-1.8.4.tar.xz) = 5fd68912b1977badf261756b34a1de7efc183a72 -SHA512 (tinyproxy-1.8.4.tar.xz) = 23398a2c8a6d926b371086ba96032d0fd8dd06d114edf24950b868f53bb6b4235cd0f5d6b9a0131879fcc16bbe6b71142a6855de593a937ef7b0c323b50e0aec -Size (tinyproxy-1.8.4.tar.xz) = 192300 bytes -SHA1 (patch-configure) = c0d7af647d06eac76835506823a8df4f1bd7bd49 +SHA1 (tinyproxy-1.10.0.tar.xz) = c69fccde7aabd89434f94789a156847edde9aa28 +RMD160 (tinyproxy-1.10.0.tar.xz) = 8c22dadf2b50dbb841fb730395fd33244f5f2d33 +SHA512 (tinyproxy-1.10.0.tar.xz) = 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5 +Size (tinyproxy-1.10.0.tar.xz) = 176060 bytes 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_tinyproxy.conf.in) = 2694a3f4cd1c2481eb765c8c9a26a58ac94f2574 +SHA1 (patch-etc_Makefile.in) = 05586bae07900c24dd418bddcbf0157ba2b302ef +SHA1 (patch-etc_tinyproxy.conf.in) = 19481a177119b266034280d8923ea855021d8663 diff --git a/www/tinyproxy/files/tinyproxy.sh b/www/tinyproxy/files/tinyproxy.sh index d9b28aa846d..a4b8e96ed67 100755 --- a/www/tinyproxy/files/tinyproxy.sh +++ b/www/tinyproxy/files/tinyproxy.sh @@ -1,6 +1,6 @@ #!@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 @@ -10,7 +10,7 @@ name="tinyproxy" rcvar=$name -command="@PREFIX@/sbin/${name}" +command="@PREFIX@/bin/${name}" pidfile="@VARBASE@/run/tinyproxy/${name}.pid" required_files="@PKG_SYSCONFDIR@/${name}.conf" diff --git a/www/tinyproxy/patches/patch-configure b/www/tinyproxy/patches/patch-configure deleted file mode 100644 index 34c4027c129..00000000000 --- a/www/tinyproxy/patches/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2018/06/21 11:31:33 adam Exp $ - -Remove non-portable ld argument. - ---- configure.orig 2018-06-21 11:03:35.000000000 +0000 -+++ configure -@@ -7036,7 +7036,6 @@ if test x"$debug_enabled" != x"yes" ; th - CFLAGS="-DNDEBUG $CFLAGS" - fi - --LDFLAGS="-Wl,-z,defs $LDFLAGS" - - - if test x"$ac_cv_func_regexec" != x"yes"; then diff --git a/www/tinyproxy/patches/patch-etc_Makefile.in b/www/tinyproxy/patches/patch-etc_Makefile.in index 6fb5fde072f..47486f0622d 100644 --- a/www/tinyproxy/patches/patch-etc_Makefile.in +++ b/www/tinyproxy/patches/patch-etc_Makefile.in @@ -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-exec-am: +-install-data-am: install-pkgsysconfDATA ++install-data-am: - install-html: install-html-am + install-dvi: install-dvi-am diff --git a/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in b/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in index cbfc311cb1f..b9e15828729 100644 --- a/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in +++ b/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in @@ -1,9 +1,9 @@ -$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 2016-12-15 11:05:42.000000000 +0900 +--- etc/tinyproxy.conf.in.orig 2018-08-31 23:03:36.000000000 +0000 ++++ 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. @@ -15,9 +15,9 @@ Customize settings. # # Port: Specify the port which tinyproxy will listen on. Please note -@@ -122,7 +122,7 @@ LogLevel Info - # PidFile: Write the PID of the main tinyproxy thread to this file so it +@@ -124,7 +124,7 @@ LogLevel Info # 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" |