Merge my change with kwm's change.

-Fix the missing dependencies. Will need to check in g-c-c too.
-Fix the plist by add dirrmtry locale stuff.
-Bump the PORTREVISION.


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

2 files changed, 39 insertions, 9 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 1243e5801..dce9c5ffa 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,21 +3,23 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.2 2008/01/15 18:31:52 kwm Exp $
+#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.3 2008/01/15 20:42:02 kwm Exp $
 #
 
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	2.21.5.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 settings daemon
 
+USE_XORG=	xxf86misc
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomevfs2 libglade2
+USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd
+USE_GSTREAMER=	good
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gstreamer=0.10
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 18f804366..c7dfdcb0f 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -69,6 +69,12 @@ lib/gnome-settings-daemon/plugins/xsettings/xsettings.gnome-settings-plugin
 libdata/pkgconfig/gnome-settings-daemon.pc
 libexec/gnome-settings-daemon
 share/dbus-1/services/org.gnome.SettingsDaemon.service
+%%DATADIR%%/xrdb/Editres.ad
+%%DATADIR%%/xrdb/Emacs.ad
+%%DATADIR%%/xrdb/General.ad
+%%DATADIR%%/xrdb/Motif.ad
+%%DATADIR%%/xrdb/Tk.ad
+%%DATADIR%%/xrdb/Xaw.ad
 share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
@@ -150,12 +156,34 @@ share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-%%DATADIR%%/xrdb/Editres.ad
-%%DATADIR%%/xrdb/Emacs.ad
-%%DATADIR%%/xrdb/General.ad
-%%DATADIR%%/xrdb/Motif.ad
-%%DATADIR%%/xrdb/Tk.ad
-%%DATADIR%%/xrdb/Xaw.ad
+@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/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrm %%DATADIR%%/xrdb
 @dirrm %%DATADIR%%
 @dirrm lib/gnome-settings-daemon/plugins/xsettings