mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-03 11:12:13 +00:00
- 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
This commit is contained in:
parent
ed99d80837
commit
8f8d2bdf2a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=107856
@ -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:
|
||||
|
@ -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,"
|
||||
|
@ -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:
|
||||
|
@ -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,"
|
||||
|
@ -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:
|
||||
|
@ -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,"
|
||||
|
@ -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:
|
||||
|
@ -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,"
|
||||
|
@ -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:
|
||||
|
@ -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,"
|
||||
|
@ -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:
|
||||
|
@ -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,"
|
||||
|
Loading…
x
Reference in New Issue
Block a user