Date: 23 Apr 2004 17:03:34 -0000 From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65918: [Maintainer] www/squid: fix plist generation, cleanup pkg-deinstall Message-ID: <20040423170334.14026.qmail@laurel.tmseck.homedns.org> Resent-Message-ID: <200404231710.i3NHAJsZ006440@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65918
>Category: ports
>Synopsis: [Maintainer] www/squid: fix plist generation, cleanup pkg-deinstall
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 23 10:10:19 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 4.9-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports repository as of 23 April 2004.
>Description:
- Add a missing "%D" when generating the package list entry for
etc/squid/errors (spotted by bento's "files and directories not in
plist" check)
- Probably bump PORTREVISION (I leave the final decision to the committer)
- 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
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../branches/freebsd) (revision 42)
+++ Makefile (.../trunk) (revision 42)
@@ -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 @@
>>${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:
Index: pkg-deinstall
===================================================================
--- pkg-deinstall (.../branches/freebsd) (revision 42)
+++ pkg-deinstall (.../trunk) (revision 42)
@@ -4,7 +4,6 @@
#
PATH=/bin:/usr/bin:/usr/sbin
-pkgname=$1
case $2 in
DEINSTALL)
@@ -16,10 +15,11 @@
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,"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040423170334.14026.qmail>