Give some love to gdm:

	- Try to fix the rc script. Now it seems to stop it properly
	- Fix the pkg-plist. Remove a lot of dirrm[try] entries that
	  are not needed. Also switch to @dir for directories
	  outside ${LOCALBASE}
	- Remove -p with ${MKDIR}. It is used by default
	- Tweak options to a more compact form. I don't see how to
          switch SUB_PLIST to a more compact form though
	- Convert some {RUN|BUILD}_DEPENDS entries to a new,
	  more compact form


git-svn-id: svn://creme-brulee.marcuscom.com/ports/branches/GNOME_3_12@19934 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 27 insertions, 136 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 17cce56fc..2b4449aba 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gdm
 PORTVERSION=	3.12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,7 +14,7 @@ COMMENT=	GNOME 3 version of xdm display manager
 
 BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
 		itstool:${PORTSDIR}/textproc/itstool \
-    		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+    		iso-codes>=0:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	libck-connector.so:${PORTSDIR}/sysutils/consolekit \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libupower-glib.so:${PORTSDIR}/sysutils/upower \
@@ -28,8 +28,8 @@ RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
 		gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
 		gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
 		polkit-gnome>=0.105:${PORTSDIR}/sysutils/polkit-gnome \
-		${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
-		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+		at-spi2-core>=0:${PORTSDIR}/accessibility/at-spi2-core \
+		iso-codes>=0:${PORTSDIR}/misc/iso-codes
 # used in scripts
 RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
 		setxkbmap:${PORTSDIR}/x11/setxkbmap \
@@ -39,13 +39,13 @@ RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
 USERS=		gdm
 GROUPS=		gdm
 
+USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	dconf gnomehier gnomeprefix intlhack introspection librsvg2
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
-USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	dconf gnomehier gnomeprefix intlhack introspection librsvg2
 GNU_CONFIGURE=	yes
 GLIB_SCHEMAS=	org.gnome.login-screen.gschema.xml
 CONFIGURE_ARGS=	--disable-static \
@@ -86,6 +86,9 @@ GNOME_LOCALSTATEDIR=	/var
 OPTIONS_DEFINE=	IPV6 KEYRING
 OPTIONS_DEFAULT=KEYRING
 KEYRING_DESC=	Gnomekeyring/PAM integration
+KEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+DEBUG_CONFIGURE_ENABLE=	debug	
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 .include <bsd.port.options.mk>
 
@@ -94,18 +97,11 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 SUB_LIST+=	PAM_KEYRING=
 .else
 SUB_LIST+=	PAM_KEYRING=\#
 .endif
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
 		${WRKSRC}/data/Makefile.in
@@ -133,12 +129,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
 		${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.default
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
-	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
-	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/dm/Sessions
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/dm/Sessions
 
-	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/home
-	${CHMOD} 1770 ${STAGEDIR}${PREFIX}/etc/gdm/home
-	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
 
 	${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
 	${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
@@ -150,7 +145,6 @@ post-install:
 
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
-#	@${RMDIR} ${STAGEDIR}/var/run/gdm
 
 # logwtmp lives here.
 .if ${OSVERSION} < 900000
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index d2886f2f7..e0b13582b 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -25,7 +25,7 @@ command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/sbin/gdm-binary"
 start_cmd="gdm_start"
-stop_postcmd="gdm_poststop"
+stop_cmd="gdm_stop"
 
 gdm_start()
 {
@@ -63,9 +63,13 @@ gdm_start()
     LANG=${gdm_lang} ${command} ${gdm_flags} ) &
 }
 
-gdm_poststop()
+gdm_stop()
 {
-	pkill gdm-session-worker
+	/bin/kill -9 $(/bin/cat "${pidfile}")
+	pkill -9 -u gdm
+	pkill -9 X
+	pkill -9 gdm-session-worker
+
 }
 
 load_rc_config ${name}
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 0f000cc75..e3ebfefb7 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -195,118 +195,11 @@ share/pixmaps/nohost.png
 @exec mkdir -p %D/share/xsessions
 @exec dconf update
 @unexec dconf update
-@unexec rmdir /var/cache/gdm
-@dirrmtry share/xsessions
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/gv/LC_MESSAGES
-@dirrmtry share/locale/gv
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
-@dirrmtry share/help/zh_CN/gdm
-@dirrmtry share/help/uk/gdm
-@dirrmtry share/help/te/gdm
-@dirrmtry share/help/te
-@dirrmtry share/help/sv/gdm
-@dirrmtry share/help/sl/gdm
-@dirrmtry share/help/ru/gdm
-@dirrmtry share/help/pt_BR/gdm
-@dirrmtry share/help/oc/gdm
-@dirrmtry share/help/ko/gdm
-@dirrmtry share/help/it/gdm
-@dirrmtry share/help/it
-@dirrmtry share/help/id/gdm
-@dirrmtry share/help/id
-@dirrmtry share/help/gl/gdm
-@dirrmtry share/help/fr/gdm
-@dirrmtry share/help/es/gdm
-@dirrmtry share/help/en_GB/gdm
-@dirrmtry share/help/el/gdm
-@dirrmtry share/help/de/gdm
-@dirrmtry share/help/ca/gdm
-@dirrmtry share/help/C/gdm
-@dirrmtry share/gnome-session/sessions
-@dirrmtry share/gnome-session
-@dirrm %%DATADIR%%/greeter/applications
-@dirrm %%DATADIR%%/greeter/autostart
-@dirrm %%DATADIR%%/greeter
-@dirrm %%DATADIR%%
-@dirrmtry share/dconf/profile
-@dirrmtry share/dconf
-@dirrm include/gdm
+@mode 1775
+@dir etc/gdm/home
+@mode
 @unexec rm -rf %D/etc/gdm/home/.gconf*
-@dirrmtry etc/gdm/Sessions
-@dirrmtry etc/gdm/PreSession
-@dirrmtry etc/gdm/PostSession
-@dirrmtry etc/gdm/PostLogin
-@dirrmtry etc/gdm/Init
-@dirrmtry etc/gdm/home/.pulse
-@dirrmtry etc/gdm/home/.local/share/applications
-@dirrmtry etc/gdm/home/.local/share
-@dirrmtry etc/gdm/home/.local
-@dirrmtry etc/gdm/home
-@dirrmtry etc/gdm
-@dirrmtry etc/dm/Sessions
-@dirrmtry etc/dm
-@unexec rmdir /var/run/gdm/greeter/ 2> /dev/null || true
-@unexec rmdir /var/log/gdm/ 2> /dev/null || true
+@dir /var/cache/gdm/
+@dir /var/run/gdm/greeter
+@dir /var/run/gdm/
+@dir /var/log/gdm/