Fix the install path of the D-BUS service file which gets g-s-d to properly

startup at login time.


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

3 files changed, 16 insertions, 6 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 1f7bb8634..1f905cbca 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.111 2006/06/13 05:08:30 marcus Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.112 2006/07/11 20:05:03 ahze Exp $
 #
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.15.4
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index d8e861724..94466c855 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jan 13 02:39:28 2005
-+++ configure	Thu Jan 13 02:39:28 2005
-@@ -22221,6 +22221,7 @@
+--- configure.orig	Thu Jul 13 12:02:50 2006
++++ configure	Thu Jul 13 12:04:24 2006
+@@ -22229,6 +22229,7 @@ echo $ECHO_N "checking for $ac_func... $
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,7 +8,16 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27490,7 +27491,7 @@
+@@ -28440,7 +28441,7 @@ BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG 
+ 
+ 
+ # dbus directory
+-DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
++DBUS_SERVICES_DIR='$(prefix)'"/share/dbus-1/services"
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -29126,7 +29127,7 @@ fi
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 5a2f5a7e9..e7b652ccc 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -46,6 +46,7 @@ lib/window-manager-settings/libmetacity.so
 libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/gnome-settings-daemon
+share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/gnome/applications/accessibility-keyboard.desktop
 share/gnome/applications/at-properties.desktop
 share/gnome/applications/background.desktop
@@ -128,7 +129,6 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
-share/gnome/dbus-1/services/org.gnome.SettingsDaemon.service
 share/gnome/desktop-directories/font-method.directory
 share/gnome/desktop-directories/theme-method.directory
 share/gnome/gnome-default-applications/gnome-default-applications.xml