diff options
| author | wiz <wiz> | 2013-10-08 10:40:21 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-10-08 10:40:21 +0000 |
| commit | 89ca3c0cdb28766d9cb86d01b2411be711e4f77d (patch) | |
| tree | 66186b3b7e7764da18a6b8d5a85356da0344c79b /databases | |
| parent | 46189d37587765afdbb1c5f946f4c469c62afb79 (diff) | |
| download | pkgsrc-89ca3c0cdb28766d9cb86d01b2411be711e4f77d.tar.gz | |
Fix logic error in 1.4 by reverting to 1.3.
However, redirect stderr to /dev/null to get rid of unnecessary warning
that triggered 1.4.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/shared-mime-info/DEINSTALL | 14 | ||||
| -rw-r--r-- | databases/shared-mime-info/Makefile | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/databases/shared-mime-info/DEINSTALL b/databases/shared-mime-info/DEINSTALL index 933ebe69e52..bdd7d94f833 100644 --- a/databases/shared-mime-info/DEINSTALL +++ b/databases/shared-mime-info/DEINSTALL @@ -1,4 +1,4 @@ -# $NetBSD: DEINSTALL,v 1.4 2011/10/29 13:20:54 marino Exp $ +# $NetBSD: DEINSTALL,v 1.5 2013/10/08 10:40:21 wiz Exp $ MIMEDB_PATH="@MIMEDB_PATH@" @@ -6,15 +6,7 @@ case ${STAGE} in POST-DEINSTALL) (cd ${MIMEDB_PATH} && \ ${LS} . | ${GREP} -v '^packages$' | ${XARGS} ${RM} -rf) - if [ -d ${MIMEDB_PATH}/packages ]; then - if [ -n `${LS} -A ${MIMEDB_PATH}/packages` ]; then - ${RMDIR} ${MIMEDB_PATH}/packages - fi - fi - if [ -d ${MIMEDB_PATH} ]; then - if [ -n `${LS} -A ${MIMEDB_PATH}` ]; then - ${RMDIR} ${MIMEDB_PATH} - fi - fi + ${RMDIR} ${MIMEDB_PATH}/packages 2>/dev/null || ${TRUE} + ${RMDIR} ${MIMEDB_PATH} 2>/dev/null || ${TRUE} ;; esac diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile index f0694766e65..2dd33627e5d 100644 --- a/databases/shared-mime-info/Makefile +++ b/databases/shared-mime-info/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2013/10/06 16:05:32 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2013/10/08 10:40:21 wiz Exp $ DISTNAME= shared-mime-info-1.2 +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= http://people.freedesktop.org/~hadess/ EXTRACT_SUFX= .tar.xz |