6 files changed, 22 insertions, 28 deletions
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 5ee44d225..374d006d8 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.1.20041219
+PORTVERSION=	2.9.3
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://people.freebsd.org/~ahze/
-#		${MASTER_SITE_GNOME}
-#MASTER_SITE_SUBDIR=	sources/control-center/2.8
-DISTNAME=	gnome-control-center-1
-#		control-center-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/control-center/2.9
+DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,7 +18,6 @@ COMMENT=	Control center for GNOME 2 project
 
 LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-1//}
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 66df3fbd2..1b824a13d 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-control-center-1.tar.bz2) = a3f96d913343c5459d002ed97aa755b6
-SIZE (gnome2/gnome-control-center-1.tar.bz2) = 2256664
+MD5 (gnome2/control-center-2.9.3.tar.bz2) = 7a34d2ebe33298991ef02663321f5ed2
+SIZE (gnome2/control-center-2.9.3.tar.bz2) = 2628918
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
index c92d8a8fb..41f5b1f12 100644
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 13 01:38:04 2004
-+++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 13 01:38:27 2004
-@@ -343,7 +343,7 @@
- 
+--- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 20 19:17:07 2004
++++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 20 19:18:03 2004
+@@ -296,7 +296,7 @@
  Datadir = $(datadir)/control-center-2.0/interfaces/
  Data_DATA = acme.glade
+ 
 -pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
 +pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
  pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png
+ 
  EXTRA_DIST = \
- 	acme-volume-alsa.c acme-volume-alsa.h	\
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 5ee44d225..374d006d8 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.1.20041219
+PORTVERSION=	2.9.3
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://people.freebsd.org/~ahze/
-#		${MASTER_SITE_GNOME}
-#MASTER_SITE_SUBDIR=	sources/control-center/2.8
-DISTNAME=	gnome-control-center-1
-#		control-center-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/control-center/2.9
+DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,7 +18,6 @@ COMMENT=	Control center for GNOME 2 project
 
 LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-1//}
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 66df3fbd2..1b824a13d 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-control-center-1.tar.bz2) = a3f96d913343c5459d002ed97aa755b6
-SIZE (gnome2/gnome-control-center-1.tar.bz2) = 2256664
+MD5 (gnome2/control-center-2.9.3.tar.bz2) = 7a34d2ebe33298991ef02663321f5ed2
+SIZE (gnome2/control-center-2.9.3.tar.bz2) = 2628918
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
index c92d8a8fb..41f5b1f12 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 13 01:38:04 2004
-+++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 13 01:38:27 2004
-@@ -343,7 +343,7 @@
- 
+--- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 20 19:17:07 2004
++++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 20 19:18:03 2004
+@@ -296,7 +296,7 @@
  Datadir = $(datadir)/control-center-2.0/interfaces/
  Data_DATA = acme.glade
+ 
 -pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
 +pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
  pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png
+ 
  EXTRA_DIST = \
- 	acme-volume-alsa.c acme-volume-alsa.h	\