Remove a patch that was breaking the volume control and brightness icons.

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

6 files changed, 12 insertions, 32 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 2de8b6b69..c55550d16 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/gnomecontrolcenter2/Makefile,v 1.81 2005/08/10 19:57:20 marcus Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.82 2005/08/22 16:11:27 ahze Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
 PORTVERSION=	2.11.92
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.11
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
deleted file mode 100644
index 15281344b..000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/actions/Makefile.in.orig	Wed Jul 27 13:38:40 2005
-+++ gnome-settings-daemon/actions/Makefile.in	Wed Jul 27 13:38:59 2005
-@@ -375,7 +375,7 @@
- libacme_la_LIBADD = $(am__append_3) $(am__append_6)
- 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/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 0448d69df..66509d1e7 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -88,6 +88,10 @@ share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
+share/gnome/control-center-2.0/pixmaps/acme-brightness.png
+share/gnome/control-center-2.0/pixmaps/acme-eject.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
@@ -136,10 +140,6 @@ share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/display-capplet.png
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
-share/icons/gnome/48x48/apps/acme-brightness.png
-share/icons/gnome/48x48/apps/acme-eject.png
-share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png
-share/icons/gnome/48x48/apps/gnome-speakernotes.png
 share/icons/hicolor/48x48/apps/gnome-control-center.png
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 2de8b6b69..c55550d16 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.81 2005/08/10 19:57:20 marcus Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.82 2005/08/22 16:11:27 ahze Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
 PORTVERSION=	2.11.92
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.11
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
deleted file mode 100644
index 15281344b..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/actions/Makefile.in.orig	Wed Jul 27 13:38:40 2005
-+++ gnome-settings-daemon/actions/Makefile.in	Wed Jul 27 13:38:59 2005
-@@ -375,7 +375,7 @@
- libacme_la_LIBADD = $(am__append_3) $(am__append_6)
- 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/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 0448d69df..66509d1e7 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -88,6 +88,10 @@ share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
+share/gnome/control-center-2.0/pixmaps/acme-brightness.png
+share/gnome/control-center-2.0/pixmaps/acme-eject.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
@@ -136,10 +140,6 @@ share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/display-capplet.png
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
-share/icons/gnome/48x48/apps/acme-brightness.png
-share/icons/gnome/48x48/apps/acme-eject.png
-share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png
-share/icons/gnome/48x48/apps/gnome-speakernotes.png
 share/icons/hicolor/48x48/apps/gnome-control-center.png
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo