diff options
| author | madpilot <madpilot@FreeBSD.org> | 2014-08-23 02:51:46 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2014-08-23 02:51:46 +0800 |
| commit | 7f2be3d9460093d062ff79b6bbf63656905252cc (patch) | |
| tree | a9d76430d68aaa1597a37dbca1f290e0262d5a00 /www | |
| parent | f9acc12962d648d4db6ecbe538b17d33f995f620 (diff) | |
| download | freebsd-ports-gnome-7f2be3d9460093d062ff79b6bbf63656905252cc.tar.gz freebsd-ports-gnome-7f2be3d9460093d062ff79b6bbf63656905252cc.tar.zst freebsd-ports-gnome-7f2be3d9460093d062ff79b6bbf63656905252cc.zip | |
Fix staging when port is alredy installed on system.
Reported by: Jeff Molofee <jeff.molofee at pro-westernplastics.com>
Diffstat (limited to 'www')
| -rw-r--r-- | www/squidguard/Makefile | 2 | ||||
| -rw-r--r-- | www/squidguard/files/patch-Makefile.in | 23 |
2 files changed, 13 insertions, 12 deletions
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile index ecae3a5f2273..d404f4b7d3e6 100644 --- a/www/squidguard/Makefile +++ b/www/squidguard/Makefile @@ -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 diff --git a/www/squidguard/files/patch-Makefile.in b/www/squidguard/files/patch-Makefile.in index b2ba416cb439..90b88a1dd498 100644 --- a/www/squidguard/files/patch-Makefile.in +++ b/www/squidguard/files/patch-Makefile.in @@ -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 ; \ |