diff options
author | miwi <miwi@FreeBSD.org> | 2007-09-20 09:01:27 +0800 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2007-09-20 09:01:27 +0800 |
commit | 49fcebc26638409d3fe98c5690ca71f24faecd5d (patch) | |
tree | cec7180a68058d330735511ee40809ef566d355f /www/ziproxy | |
parent | 3e57033fe8419183d500b950e15eb49f59f7cb38 (diff) | |
download | freebsd-ports-gnome-49fcebc26638409d3fe98c5690ca71f24faecd5d.tar.gz freebsd-ports-gnome-49fcebc26638409d3fe98c5690ca71f24faecd5d.tar.zst freebsd-ports-gnome-49fcebc26638409d3fe98c5690ca71f24faecd5d.zip |
- Update to 2.3.0
- Fix stop command in rc(8) script
- Catch up upstream config file changes
PR: 116371
Submitted by: Pankov Pavel <pankov_p@mail.ru> (maintainer)
Diffstat (limited to 'www/ziproxy')
-rw-r--r-- | www/ziproxy/Makefile | 11 | ||||
-rw-r--r-- | www/ziproxy/distinfo | 6 | ||||
-rw-r--r-- | www/ziproxy/files/patch-ziproxy.conf | 29 | ||||
-rw-r--r-- | www/ziproxy/files/ziproxy.in | 2 |
4 files changed, 30 insertions, 18 deletions
diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile index 3b3614ad0814..292e314a2452 100644 --- a/www/ziproxy/Makefile +++ b/www/ziproxy/Makefile @@ -5,10 +5,9 @@ # $FreeBSD$ PORTNAME= ziproxy -PORTVERSION= 2.2.2 +PORTVERSION= 2.3.0 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= pankov_p@mail.ru COMMENT= A forwarding, non-caching, compressing proxy server @@ -20,7 +19,6 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ USE_BZIP2= yes USE_GCC= 3.2+ -USE_GETOPT_LONG= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -29,7 +27,7 @@ ERRORFILES= 400.html 404.html 408.html 500.html 503.html CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-shared-confuse --with-cfgfile=${PREFIX}/etc/ziproxy.conf +CONFIGURE_ARGS+= --enable-shared-confuse --with-cfgfile="${PREFIX}/etc/ziproxy.conf" .if !defined(NOPORTDOCS) PORTDOCS= README @@ -43,8 +41,7 @@ OPTIONS+= JPEG2000 "Build with JPEG2000 support" on post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/etc/ziproxy.conf - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \ + -e 's|%%DATADIR%%|${DATADIR}|g' \ ${WRKSRC}/etc/ziproxy.conf @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/www/ziproxy/distinfo b/www/ziproxy/distinfo index 7b13398f39f3..6c20c4f5bf3c 100644 --- a/www/ziproxy/distinfo +++ b/www/ziproxy/distinfo @@ -1,3 +1,3 @@ -MD5 (ziproxy-2.2.2.tar.bz2) = b2c1e1b7efa4db50b97d69b126815bba -SHA256 (ziproxy-2.2.2.tar.bz2) = 6fbf4134e84311d4590f907b37b5ae2ee0af5dc5d8fc6457edf4129635dc7bb9 -SIZE (ziproxy-2.2.2.tar.bz2) = 145733 +MD5 (ziproxy-2.3.0.tar.bz2) = 2733c117e819c5000d898456388922ba +SHA256 (ziproxy-2.3.0.tar.bz2) = e69e179304498e0c4dcaf19dd2b4dd3be76ad9a09c68fe58c4004780a8598894 +SIZE (ziproxy-2.3.0.tar.bz2) = 152058 diff --git a/www/ziproxy/files/patch-ziproxy.conf b/www/ziproxy/files/patch-ziproxy.conf index 4f4fdfa67eef..45e03311bae8 100644 --- a/www/ziproxy/files/patch-ziproxy.conf +++ b/www/ziproxy/files/patch-ziproxy.conf @@ -1,15 +1,30 @@ ---- etc/ziproxy.conf.orig Wed Jul 26 09:01:36 2006 -+++ etc/ziproxy.conf Mon Jul 31 01:07:02 2006 -@@ -36,7 +36,7 @@ +--- etc/ziproxy.conf.orig 2007-09-06 07:51:42.000000000 +0400 ++++ etc/ziproxy.conf 2007-09-15 13:31:16.000000000 +0400 +@@ -11,12 +11,12 @@ + ## If you have more than one network interface, + ## it's useful for restricting to which interface you want to bind to. + ## By default Ziproxy binds to all interfaces. +-# Address = "127.0.0.1" ++Address = "127.0.0.1" + + ## Accepts conections only from that address. + ## WARNING: Remember to restrict the access to Ziproxy + ## if your machine is directly connected to the Internet. +-# OnlyFrom = "127.0.0.1" ++OnlyFrom = "127.0.0.1" + + # Inactivity timeout before closing the daemon (0 = no timeout) + NetdTimeout = 0 +@@ -50,7 +50,7 @@ ## HTTP auth file ## Should contain user:pass pairs, lines no longer than 128 chars ## Password is unencrypted -# PasswdFile="/usr/local/ziproxy/ziproxy.passwd" -+# PasswdFile="/usr/local/etc/ziproxy.passwd" - ++# PasswdFile="%%PREFIX%%/etc/ziproxy.passwd" + ## Forward everything to another proxy server. ## Modifications/compression is still applied. -@@ -151,13 +151,12 @@ +@@ -263,13 +263,13 @@ ## Note: The internal defaults give more precise error messages. ## ## 400 - Bad request (malformed URL, or unknown URL type) @@ -26,5 +41,5 @@ +# CustomError500="%%DATADIR%%/error/500.html" ## 503 - Connection refused (or service unavailable) -# CustomError503="/var/ziproxy/error/503.html" -- +# CustomError503="%%DATADIR%%/error/503.html" + diff --git a/www/ziproxy/files/ziproxy.in b/www/ziproxy/files/ziproxy.in index 0ff86a4a3fba..f2d766fd1df8 100644 --- a/www/ziproxy/files/ziproxy.in +++ b/www/ziproxy/files/ziproxy.in @@ -25,6 +25,6 @@ load_rc_config $name : ${ziproxy_enable="NO"} : ${ziproxy_config="%%PREFIX%%/etc/ziproxy.conf"} -command_args="-d -c ${ziproxy_config}" +command_args="-d -c ${ziproxy_config} > ${pidfile}" run_rc_command "$1" |