aboutsummaryrefslogtreecommitdiffstats
path: root/devel/desktop-file-utils
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-02-26 09:03:37 +0800
committermarcus <marcus@FreeBSD.org>2006-02-26 09:03:37 +0800
commit3c70a53e716db3308449065b72bfc670615c1ad9 (patch)
tree8f752dd664b57d1bce009a71a6cbe0cb6bf86598 /devel/desktop-file-utils
parent3219d58df34c20c76e6ab17cd26e23d78f37a7da (diff)
downloadfreebsd-ports-gnome-3c70a53e716db3308449065b72bfc670615c1ad9.tar.gz
freebsd-ports-gnome-3c70a53e716db3308449065b72bfc670615c1ad9.tar.zst
freebsd-ports-gnome-3c70a53e716db3308449065b72bfc670615c1ad9.zip
Be sure to remove ${X11BASE}/share/gnome and ${LOCALBASE}/share/gnome and
not just ${X11BASE}/share/gnome/applications and ${LOCALBASE}/share/gnome/applications. Reported by: pointyhat via kris Approved by: portmgr (implicit)
Diffstat (limited to 'devel/desktop-file-utils')
-rw-r--r--devel/desktop-file-utils/Makefile7
-rw-r--r--devel/desktop-file-utils/files/pkg-deinstall.in2
2 files changed, 7 insertions, 2 deletions
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index 8979183e4ffb..5c7a3137359e 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= desktop-file-utils
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/
@@ -36,11 +36,16 @@ MIMEDIRS= ${PORT_MIMEDIRS} \
/usr/share/applications \
/usr/share/gnome/applications
+RMDIRS= ${PORT_MIMEDIRS} \
+ ${LOCALBASE}/share/gnome \
+ ${X11BASE}/share/gnome
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/src/eggdirfuncs.c
@${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\
+ s|%%RMDIRS%%|${RMDIRS}| ; \
s|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \
< ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
@${SED} -e 's|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \
diff --git a/devel/desktop-file-utils/files/pkg-deinstall.in b/devel/desktop-file-utils/files/pkg-deinstall.in
index e2eccdad388c..dc9fbc71148a 100644
--- a/devel/desktop-file-utils/files/pkg-deinstall.in
+++ b/devel/desktop-file-utils/files/pkg-deinstall.in
@@ -14,7 +14,7 @@ for mdir in %%MIMEDIRS%%; do
fi
done
-for pmdir in %%PORT_MIMEDIRS%%; do
+for pmdir in $(echo %%RMDIRS%% | sort -r); do
rmdir ${pmdir} 2>/dev/null
done