From owner-svn-ports-head@FreeBSD.ORG Fri Aug 22 18:51:47 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD221797; Fri, 22 Aug 2014 18:51:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D48836D5; Fri, 22 Aug 2014 18:51:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7MIplnn099011; Fri, 22 Aug 2014 18:51:47 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7MIpljZ099009; Fri, 22 Aug 2014 18:51:47 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201408221851.s7MIpljZ099009@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 22 Aug 2014 18:51:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365686 - in head/www/squidguard: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Aug 2014 18:51:47 -0000 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 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 ; \