summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2013-06-04 15:16:42 +0000
committertron <tron@pkgsrc.org>2013-06-04 15:16:42 +0000
commit5b23f8ceacaea5a5b6ee80a2fd801467fc29743f (patch)
tree3ba1cb38b8478f42fbf2a0ee54e365a552249a72
parentca3283e9d18581bce47569e8cfa8dcb4ac909109 (diff)
downloadpkgsrc-5b23f8ceacaea5a5b6ee80a2fd801467fc29743f.tar.gz
Override broken "configure" test that doesn't work with Perl 5.18.0
to fix the build of one of the helper scripts. Bump the package revision because the binary package would have been incomplete previously.
-rw-r--r--www/squid3/Makefile4
-rw-r--r--www/squid3/distinfo3
-rw-r--r--www/squid3/patches/patch-helpers_log_daemon_DB_config.test15
3 files changed, 19 insertions, 3 deletions
diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index ec3614f870c..c76b6142a3b 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/05/31 12:42:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/04 15:16:42 tron Exp $
DISTNAME= squid-3.3.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
${SQUID_MASTER_SITES}
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index 427ff8d6274..1a91aa0db75 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2013/05/23 20:21:28 adam Exp $
+$NetBSD: distinfo,v 1.8 2013/06/04 15:16:42 tron Exp $
SHA1 (squid-3.3.5.tar.xz) = 60b1b46683cccd3d845f324dbedb9f289d375115
RMD160 (squid-3.3.5.tar.xz) = 400fe3a362a127e90ea0ece556e48ac414644f31
@@ -6,6 +6,7 @@ Size (squid-3.3.5.tar.xz) = 2180668 bytes
SHA1 (patch-configure) = 86400fd701a84eb174395755eec7b13cbfce55ec
SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
+SHA1 (patch-helpers_log_daemon_DB_config.test) = 2716abf507d8d9f8f31dc6a873afc0f224d1c00b
SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc
diff --git a/www/squid3/patches/patch-helpers_log_daemon_DB_config.test b/www/squid3/patches/patch-helpers_log_daemon_DB_config.test
new file mode 100644
index 00000000000..782cd26b906
--- /dev/null
+++ b/www/squid3/patches/patch-helpers_log_daemon_DB_config.test
@@ -0,0 +1,15 @@
+$NetBSD: patch-helpers_log_daemon_DB_config.test,v 1.1 2013/06/04 15:16:42 tron Exp $
+
+Overright broken Perl config test that fails with Perl 5.18.0 and newer.
+
+--- helpers/log_daemon/DB/config.test.orig 2013-05-20 12:48:55.000000000 +0100
++++ helpers/log_daemon/DB/config.test 2013-06-04 15:48:25.000000000 +0100
+@@ -2,6 +2,7 @@
+
+ ## Test: do we have perl to build the helper scripts?
+ ## Test: do we have pod2man to build the manual?
+-perl --version >/dev/null && echo | pod2man >/dev/null
++#perl --version >/dev/null && echo | pod2man >/dev/null
++true
+
+ exit $?