diff options
| author | agc <agc@pkgsrc.org> | 2004-10-25 18:55:59 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2004-10-25 18:55:59 +0000 |
| commit | 584cac5e99e24f583ffc8edc6677a531f1c90588 (patch) | |
| tree | 20012694df37dcde6c5cf5e10a820228f8aa1386 /www | |
| parent | 21e6bc3f6a2a6e9df0f52a552a223f345264d2cb (diff) | |
| download | pkgsrc-584cac5e99e24f583ffc8edc6677a531f1c90588.tar.gz | |
Pull-up patch-aa from the HEAD, and re-generate its checksum.
Fixes build on pkgsrc-2004Q3 branch.
Thanks to Soren Jacobsen for pointing this one out.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/distinfo | 4 | ||||
| -rw-r--r-- | www/squid/patches/patch-aa | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/www/squid/distinfo b/www/squid/distinfo index 83abcebf4c2..f9635268343 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.63.2.1 2004/10/20 16:33:44 agc Exp $ +$NetBSD: distinfo,v 1.63.2.2 2004/10/25 18:55:59 agc Exp $ SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7.tar.bz2) = 24f29e28ec62d7ab5888cd594ac7a1975ee6aa36 Size (squid-2.5.7-2004101300/squid-2.5.STABLE7.tar.bz2) = 1051830 bytes -SHA1 (patch-aa) = 1bb64a2d302c206466d62596d1fefb83a060f9b7 +SHA1 (patch-aa) = 8d760f58175cdb62af453fd1b07783859fa0bcf9 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa index 3f86e1ebbed..ff6021722d6 100644 --- a/www/squid/patches/patch-aa +++ b/www/squid/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.13 2004/08/22 15:11:09 taca Exp $ +$NetBSD: patch-aa,v 1.13.2.1 2004/10/25 18:55:59 agc Exp $ ---- src/Makefile.in.orig 2004-06-08 20:37:22.000000000 +0900 +--- src/Makefile.in.orig 2004-10-01 18:30:32.000000000 +0900 +++ src/Makefile.in @@ -380,14 +380,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log @@ -9,9 +9,9 @@ $NetBSD: patch-aa,v 1.13 2004/08/22 15:11:09 taca Exp $ -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid +DEFAULT_PID_FILE = /var/run/squid.pid DEFAULT_SWAP_DIR = $(localstatedir)/cache - DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT) - DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT) - DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT) + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` -DEFAULT_ICON_DIR = $(datadir)/icons -DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ -DEFAULT_MIB_PATH = $(datadir)/mib.txt |