From 8f8d2bdf2a2a763a1c3b9cad5adafa8cd1cca7de Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Wed, 28 Apr 2004 19:49:18 +0000 Subject: - Fix plist - Bump PORTREVISION - Clean up pkg-deinstall: + remove an unnecessary variable + replace rmdir -p with two distinct rmdir calls since we do not want to delete $PKG_PREFIX too if it happens to be empty PR: ports/65918 Submitted by: maintainer --- www/squid/Makefile | 4 ++-- www/squid/pkg-deinstall | 8 ++++---- www/squid25/Makefile | 4 ++-- www/squid25/pkg-deinstall | 8 ++++---- www/squid26/Makefile | 4 ++-- www/squid26/pkg-deinstall | 8 ++++---- www/squid27/Makefile | 4 ++-- www/squid27/pkg-deinstall | 8 ++++---- www/squid30/Makefile | 4 ++-- www/squid30/pkg-deinstall | 8 ++++---- www/squid31/Makefile | 4 ++-- www/squid31/pkg-deinstall | 8 ++++---- 12 files changed, 36 insertions(+), 36 deletions(-) (limited to 'www') diff --git a/www/squid/Makefile b/www/squid/Makefile index 76e17f992145..4022a6576c7b 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -29,7 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -314,7 +314,7 @@ post-install: >>${TMPPLIST} @${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${TMPPLIST} .endfor - @${ECHO_CMD} "@unexec rmdir etc/squid/errors 2>/dev/null || true" \ + @${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors 2>/dev/null || true" \ >>${TMPPLIST} changeuser: diff --git a/www/squid/pkg-deinstall b/www/squid/pkg-deinstall index 7de2277d4352..42ccaecce0b6 100644 --- a/www/squid/pkg-deinstall +++ b/www/squid/pkg-deinstall @@ -4,7 +4,6 @@ # PATH=/bin:/usr/bin:/usr/sbin -pkgname=$1 case $2 in DEINSTALL) @@ -16,10 +15,11 @@ DEINSTALL) POST-DEINSTALL) rmdir ${PKG_PREFIX}/etc/squid 2>/dev/null rmdir ${PKG_PREFIX}/squid/cache 2>/dev/null - rmdir -p ${PKG_PREFIX}/squid/logs 2>/dev/null - echo "===> post-deinstallation information for ${pkgname}" + rmdir ${PKG_PREFIX}/squid/logs 2>/dev/null + rmdir ${PKG_PREFIX}/squid 2>/dev/null + echo "===> post-deinstallation information for $1" echo "" - echo " Please note that ${pkgname} was not completely removed" + echo " Please note that $1 was not completely removed" echo " from this system." echo "" echo " The cache and log directories, squid's user account," diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 76e17f992145..4022a6576c7b 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -29,7 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -314,7 +314,7 @@ post-install: >>${TMPPLIST} @${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${TMPPLIST} .endfor - @${ECHO_CMD} "@unexec rmdir etc/squid/errors 2>/dev/null || true" \ + @${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors 2>/dev/null || true" \ >>${TMPPLIST} changeuser: diff --git a/www/squid25/pkg-deinstall b/www/squid25/pkg-deinstall index 7de2277d4352..42ccaecce0b6 100644 --- a/www/squid25/pkg-deinstall +++ b/www/squid25/pkg-deinstall @@ -4,7 +4,6 @@ # PATH=/bin:/usr/bin:/usr/sbin -pkgname=$1 case $2 in DEINSTALL) @@ -16,10 +15,11 @@ DEINSTALL) POST-DEINSTALL) rmdir ${PKG_PREFIX}/etc/squid 2>/dev/null rmdir ${PKG_PREFIX}/squid/cache 2>/dev/null - rmdir -p ${PKG_PREFIX}/squid/logs 2>/dev/null - echo "===> post-deinstallation information for ${pkgname}" + rmdir ${PKG_PREFIX}/squid/logs 2>/dev/null + rmdir ${PKG_PREFIX}/squid 2>/dev/null + echo "===> post-deinstallation information for $1" echo "" - echo " Please note that ${pkgname} was not completely removed" + echo " Please note that $1 was not completely removed" echo " from this system." echo "" echo " The cache and log directories, squid's user account," diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 76e17f992145..4022a6576c7b 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -29,7 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -314,7 +314,7 @@ post-install: >>${TMPPLIST} @${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${TMPPLIST} .endfor - @${ECHO_CMD} "@unexec rmdir etc/squid/errors 2>/dev/null || true" \ + @${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors 2>/dev/null || true" \ >>${TMPPLIST} changeuser: diff --git a/www/squid26/pkg-deinstall b/www/squid26/pkg-deinstall index 7de2277d4352..42ccaecce0b6 100644 --- a/www/squid26/pkg-deinstall +++ b/www/squid26/pkg-deinstall @@ -4,7 +4,6 @@ # PATH=/bin:/usr/bin:/usr/sbin -pkgname=$1 case $2 in DEINSTALL) @@ -16,10 +15,11 @@ DEINSTALL) POST-DEINSTALL) rmdir ${PKG_PREFIX}/etc/squid 2>/dev/null rmdir ${PKG_PREFIX}/squid/cache 2>/dev/null - rmdir -p ${PKG_PREFIX}/squid/logs 2>/dev/null - echo "===> post-deinstallation information for ${pkgname}" + rmdir ${PKG_PREFIX}/squid/logs 2>/dev/null + rmdir ${PKG_PREFIX}/squid 2>/dev/null + echo "===> post-deinstallation information for $1" echo "" - echo " Please note that ${pkgname} was not completely removed" + echo " Please note that $1 was not completely removed" echo " from this system." echo "" echo " The cache and log directories, squid's user account," diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 76e17f992145..4022a6576c7b 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -29,7 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -314,7 +314,7 @@ post-install: >>${TMPPLIST} @${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${TMPPLIST} .endfor - @${ECHO_CMD} "@unexec rmdir etc/squid/errors 2>/dev/null || true" \ + @${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors 2>/dev/null || true" \ >>${TMPPLIST} changeuser: diff --git a/www/squid27/pkg-deinstall b/www/squid27/pkg-deinstall index 7de2277d4352..42ccaecce0b6 100644 --- a/www/squid27/pkg-deinstall +++ b/www/squid27/pkg-deinstall @@ -4,7 +4,6 @@ # PATH=/bin:/usr/bin:/usr/sbin -pkgname=$1 case $2 in DEINSTALL) @@ -16,10 +15,11 @@ DEINSTALL) POST-DEINSTALL) rmdir ${PKG_PREFIX}/etc/squid 2>/dev/null rmdir ${PKG_PREFIX}/squid/cache 2>/dev/null - rmdir -p ${PKG_PREFIX}/squid/logs 2>/dev/null - echo "===> post-deinstallation information for ${pkgname}" + rmdir ${PKG_PREFIX}/squid/logs 2>/dev/null + rmdir ${PKG_PREFIX}/squid 2>/dev/null + echo "===> post-deinstallation information for $1" echo "" - echo " Please note that ${pkgname} was not completely removed" + echo " Please note that $1 was not completely removed" echo " from this system." echo "" echo " The cache and log directories, squid's user account," diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 76e17f992145..4022a6576c7b 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -29,7 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -314,7 +314,7 @@ post-install: >>${TMPPLIST} @${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${TMPPLIST} .endfor - @${ECHO_CMD} "@unexec rmdir etc/squid/errors 2>/dev/null || true" \ + @${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors 2>/dev/null || true" \ >>${TMPPLIST} changeuser: diff --git a/www/squid30/pkg-deinstall b/www/squid30/pkg-deinstall index 7de2277d4352..42ccaecce0b6 100644 --- a/www/squid30/pkg-deinstall +++ b/www/squid30/pkg-deinstall @@ -4,7 +4,6 @@ # PATH=/bin:/usr/bin:/usr/sbin -pkgname=$1 case $2 in DEINSTALL) @@ -16,10 +15,11 @@ DEINSTALL) POST-DEINSTALL) rmdir ${PKG_PREFIX}/etc/squid 2>/dev/null rmdir ${PKG_PREFIX}/squid/cache 2>/dev/null - rmdir -p ${PKG_PREFIX}/squid/logs 2>/dev/null - echo "===> post-deinstallation information for ${pkgname}" + rmdir ${PKG_PREFIX}/squid/logs 2>/dev/null + rmdir ${PKG_PREFIX}/squid 2>/dev/null + echo "===> post-deinstallation information for $1" echo "" - echo " Please note that ${pkgname} was not completely removed" + echo " Please note that $1 was not completely removed" echo " from this system." echo "" echo " The cache and log directories, squid's user account," diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 76e17f992145..4022a6576c7b 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -29,7 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -314,7 +314,7 @@ post-install: >>${TMPPLIST} @${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${TMPPLIST} .endfor - @${ECHO_CMD} "@unexec rmdir etc/squid/errors 2>/dev/null || true" \ + @${ECHO_CMD} "@unexec rmdir %D/etc/squid/errors 2>/dev/null || true" \ >>${TMPPLIST} changeuser: diff --git a/www/squid31/pkg-deinstall b/www/squid31/pkg-deinstall index 7de2277d4352..42ccaecce0b6 100644 --- a/www/squid31/pkg-deinstall +++ b/www/squid31/pkg-deinstall @@ -4,7 +4,6 @@ # PATH=/bin:/usr/bin:/usr/sbin -pkgname=$1 case $2 in DEINSTALL) @@ -16,10 +15,11 @@ DEINSTALL) POST-DEINSTALL) rmdir ${PKG_PREFIX}/etc/squid 2>/dev/null rmdir ${PKG_PREFIX}/squid/cache 2>/dev/null - rmdir -p ${PKG_PREFIX}/squid/logs 2>/dev/null - echo "===> post-deinstallation information for ${pkgname}" + rmdir ${PKG_PREFIX}/squid/logs 2>/dev/null + rmdir ${PKG_PREFIX}/squid 2>/dev/null + echo "===> post-deinstallation information for $1" echo "" - echo " Please note that ${pkgname} was not completely removed" + echo " Please note that $1 was not completely removed" echo " from this system." echo "" echo " The cache and log directories, squid's user account," -- cgit v1.2.3