svn commit: r365686 - in head/www/squidguard: . files

[Guido Falsi]

Author: madpilot
Date: Fri Aug 22 18:51:46 2014
New Revision: 365686
URL: http://svnweb.freebsd.org/changeset/ports/365686
QAT: https://qat.redports.org/buildarchive/r365686/

Log:
  Fix staging when port is alredy installed on system.
  
  Reported by:	Jeff Molofee <jeff.molofee at pro-westernplastics.com>

Modified:
  head/www/squidguard/Makefile
  head/www/squidguard/files/patch-Makefile.in

Modified: head/www/squidguard/Makefile
==============================================================================
--- head/www/squidguard/Makefile	Fri Aug 22 18:46:57 2014	(r365685)
+++ head/www/squidguard/Makefile	Fri Aug 22 18:51:46 2014	(r365686)
@@ -2,7 +2,7 @@
 
 PORTNAME=	squidGuard
 PORTVERSION=	1.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/:a \
 		http://www.squidguard.org/Downloads/Contrib/:b

Modified: head/www/squidguard/files/patch-Makefile.in
==============================================================================
--- head/www/squidguard/files/patch-Makefile.in	Fri Aug 22 18:46:57 2014	(r365685)
+++ head/www/squidguard/files/patch-Makefile.in	Fri Aug 22 18:51:46 2014	(r365686)
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	2008-05-17 20:36:44.000000000 +0200
-+++ Makefile.in	2014-08-21 00:04:09.188333006 +0200
++++ Makefile.in	2014-08-22 19:47:56.566781181 +0200
 @@ -47,48 +47,31 @@
  
  install-conf:
@@ -9,26 +9,27 @@
 -		echo Created directory $(prefix)/squidGuard ; \
 -		chown -R $(SQUIDUSER) $(prefix)/squidGuard || exit 1  ; \
 -		echo Assigned $(prefix)/squidGuard to user $(SQUIDUSER) ; \
--	fi ; 
++	@if [ ! -d $(DESTDIR)$(dbhomedir) ]; then \
++		$(MKINSTALLDIRS) $(DESTDIR)$(dbhomedir) ; \
++		echo Created directory $(DESTDIR)$(dbhomedir) ; \
++		echo Assigned $(DESTDIR)$(dbhomedir) to user $(SQUIDUSER) ; \
+ 	fi ; 
 -	@if [ ! -d $(dbhomedir) ]; then \
 -		$(MKINSTALLDIRS) $(dbhomedir) ; \
 -		echo Created directory $(dbhomedir) ; \
 -		chown -R $(SQUIDUSER) $(dbhomedir) || exit 1 ; \
 -		echo Assigned $(dbhomedir) to user $(SQUIDUSER) ; \
-+	@if [ ! -d $(DESTDIR)$(dbhomedir) ]; then \
-+		$(MKINSTALLDIRS) $(DESTDIR)$(dbhomedir) ; \
-+		echo Created directory $(DESTDIR)$(dbhomedir) ; \
-+		echo Assigned $(DESTDIR)$(dbhomedir) to user $(SQUIDUSER) ; \
++	@if [ ! -d $(DESTDIR)$(logdir) ]; then \
++		$(MKINSTALLDIRS) $(DESTDIR)$(logdir) ; \
++		echo Created directory $(DESTDIR)$(logdir) ; \
++		echo Assigned $(DESTDIR)$(logdir) to user $(SQUIDUSER) ; \
  	fi ; 
- 	@if [ ! -d $(logdir) ]; then \
+-	@if [ ! -d $(logdir) ]; then \
 -		$(MKINSTALLDIRS) $(logdir) ; \
 -		echo Created directory $(logdir) ; \
 -		chown -R $(SQUIDUSER) $(logdir) || exit 1 ; \
 -		echo Assigned $(logdir) to user $(SQUIDUSER) ; \
-+		$(MKINSTALLDIRS) $(DESTDIR)$(logdir) ; \
-+		echo Created directory $(DESTDIR)$(logdir) ; \
-+		echo Assigned $(DESTDIR)$(logdir) to user $(SQUIDUSER) ; \
- 	fi ; 
+-	fi ; 
 -	@if [ ! -d `dirname $(configfile)` ]; then \
 +	@if [ ! -d `dirname $(DESTDIR)$(configfile)` ]; then \
  		umask 022 ; \