summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-16 22:25:44 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-16 22:25:44 +0800
commitda3fe2576da4996791c0e613f2b7fdd1c9321c13 (patch)
tree1cc3d47e92e756552986863d44ae75ed96b585f2
parent6dc64fc7759e4a8c5a90ae6b7b5278f102cc46de (diff)
downloadmarcuscom-ports-da3fe2576da4996791c0e613f2b7fdd1c9321c13.tar
marcuscom-ports-da3fe2576da4996791c0e613f2b7fdd1c9321c13.tar.gz
marcuscom-ports-da3fe2576da4996791c0e613f2b7fdd1c9321c13.tar.bz2
marcuscom-ports-da3fe2576da4996791c0e613f2b7fdd1c9321c13.tar.lz
marcuscom-ports-da3fe2576da4996791c0e613f2b7fdd1c9321c13.tar.xz
marcuscom-ports-da3fe2576da4996791c0e613f2b7fdd1c9321c13.tar.zst
marcuscom-ports-da3fe2576da4996791c0e613f2b7fdd1c9321c13.zip
Don't remove /var files automaticly, add a message on deinstall which files
the user should remove if he choices so. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17035 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gdm/pkg-deinstall15
-rw-r--r--x11/gdm/pkg-plist5
-rw-r--r--x11/gdm3/pkg-deinstall15
-rw-r--r--x11/gdm3/pkg-plist8
5 files changed, 32 insertions, 15 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 7a99c74c1..76aa4d176 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.189 2011/06/10 23:04:42 mezz Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.190 2011/06/25 14:53:53 mezz Exp $
#
PORTNAME= gdm
PORTVERSION= 2.30.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gdm/pkg-deinstall b/x11/gdm/pkg-deinstall
new file mode 100644
index 000000000..6cb043cae
--- /dev/null
+++ b/x11/gdm/pkg-deinstall
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+case $2 in
+DEINSTALL)
+ echo ""
+ echo "To really remove the gdm port, please remove the following"
+ echo "directories manualy:"
+ echo ""
+ echo "/var/cache/gdm /var/gdm /var/log/gdm and /var/run/gdm"
+ echo ""
+ ;;
+esac
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index cf7cd362e..80a3d947d 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -235,11 +235,6 @@ share/pixmaps/nohost.png
@dirrmtry etc/dm
@dirrmtry share/log/gdm
@dirrmtry share/log
-@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
-@unexec rmdir /var/cache/gdm 2>/dev/null || /usr/bin/true
-@unexec rmdir /var/cache 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/x11/gdm3/pkg-deinstall b/x11/gdm3/pkg-deinstall
new file mode 100644
index 000000000..6cb043cae
--- /dev/null
+++ b/x11/gdm3/pkg-deinstall
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+case $2 in
+DEINSTALL)
+ echo ""
+ echo "To really remove the gdm port, please remove the following"
+ echo "directories manualy:"
+ echo ""
+ echo "/var/cache/gdm /var/gdm /var/log/gdm and /var/run/gdm"
+ echo ""
+ ;;
+esac
diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist
index 5697fffc0..b049933e1 100644
--- a/x11/gdm3/pkg-plist
+++ b/x11/gdm3/pkg-plist
@@ -276,14 +276,6 @@ share/pixmaps/nohost.png
@dirrmtry etc/dm
@dirrm etc/dconf/db/gdm.d/locks
@dirrm etc/dconf/db/gdm.d
-@dirrm etc/dconf/db/gdm
-@dirrmtry share/log/gdm
-@dirrmtry share/log
-@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
-@unexec rmdir /var/cache/gdm 2>/dev/null || /usr/bin/true
-@unexec rmdir /var/cache 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES