kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

In the logic to maybe install a config file, or to install it as

Browse source 
config.new, check within $(DESTDIR) rather than the host system.

Resolves DESTDIR-mode build when privoxy is also installed, common in
make replace.

(No revbump because this change only affects a case where the package
failed to build.)
This commit is contained in:
gdt 2011-05-05 16:54:55 +00:00
parent d2febbc1b2
commit 6514cfc9d3
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/privoxy/distinfo
View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.16 2011/04/26 21:23:26 mjl Exp $
$NetBSD: distinfo,v 1.17 2011/05/05 16:54:55 gdt Exp $
SHA1 (privoxy-3.0.17-stable-src.tar.gz) = cadef2eb8ec182278e092322d3d56f225cb69c93
RMD160 (privoxy-3.0.17-stable-src.tar.gz) = 8e4acc60ca7e7be20a92e1aece92eecedd4d1997
Size (privoxy-3.0.17-stable-src.tar.gz) = 1670102 bytes
SHA1 (patch-aa) = c263d2a4b9522a33613f82ab2bc18d5c2b554b21
SHA1 (patch-ab) = aa54264ea32954be4cba3fcf5ed4d08919179fb9
SHA1 (patch-ab) = ad56c9dfee23fc29c1422292c30b386e742befe4
SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f
SHA1 (patch-ag) = 631b73e17d2f825ae6c2fa2d832db98e166030ba

37
www/privoxy/patches/patch-ab
View file

@ -1,8 +1,23 @@
$NetBSD: patch-ab,v 1.6 2010/02/24 23:22:45 mjl Exp $
$NetBSD: patch-ab,v 1.7 2011/05/05 16:54:55 gdt Exp $
--- GNUmakefile.in.orig 2009-12-16 09:15:42.000000000 +0100
+++ GNUmakefile.in 2010-02-24 20:15:48.000000000 +0100
@@ -85,7 +85,7 @@
Multiple changes.
1) Remove checks for valid user.
XXX EXPLAIN WHY. XXX EXPLAIN UPSTREAM STATUS.
2) Remove apparent Linuxy startup work.
XXX EXPLAIN WHY. XXX EXPLAIN UPSTREAM STATUS.
3) When not isntalling a new config file, check in DESTDIR, not the
real filesystem. Avoids failing to install the config in DESTDIR
because it's installed on the host system.
Not pushed upstream; it's not clear that upstream supports DESTDIR
at all.
--- GNUmakefile.in.orig 2010-02-20 12:53:30.000000000 +0000
+++ GNUmakefile.in
@@ -85,7 +85,7 @@ INSTALL = @INSTALL@
# Binaries
BIN_MODE = 0755
# Support files, docs, etc.
@ -11,7 +26,7 @@ $NetBSD: patch-ab,v 1.6 2010/02/24 23:22:45 mjl Exp $
# Directory
DIR_MODE = 0755
# Files daemon writes to.
@@ -787,16 +787,6 @@
@@ -788,16 +788,6 @@ install-strip:
# Perhaps the whole user/group validation should be done here, and simplified.
PROGRAM_V = Privoxy $(VERSION) $(CODE_STATUS)
install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
@ -28,7 +43,7 @@ $NetBSD: patch-ab,v 1.6 2010/02/24 23:22:45 mjl Exp $
@$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
$(CHMOD) $(DIR_MODE) $(MKDIR)
@$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
@@ -864,41 +854,6 @@
@@ -865,48 +855,13 @@ install: CONF_DEST LOG_DEST PID_DEST che
$(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
done
@ -70,7 +85,15 @@ $NetBSD: patch-ab,v 1.6 2010/02/24 23:22:45 mjl Exp $
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
for i in $(CONFIGS); do \
if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
@@ -917,36 +872,6 @@
$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
$(ECHO) Installing fresh $$i;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- elif [ -s "$(CONF_DEST)/$$i" ]; then \
+ elif [ -s "$(DESTDIR)/$(CONF_DEST)/$$i" ]; then \
$(ECHO) Installing $$i as $$i.new ;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
NEW=1;\
@@ -918,36 +873,6 @@ install: CONF_DEST LOG_DEST PID_DEST che
$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
fi ;\