Update to 2.1.3.

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

8 files changed, 12 insertions, 28 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index fcfc810ab..3ad3ca14d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
@@ -15,7 +15,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnome-desktop-2.2:${PORTSDIR}/x11/gnomedesktop
+LIB_DEPENDS=	gnome-desktop-2.2:${PORTSDIR}/x11/gnomedesktop \
+		metacity-private.0:${PORTSDIR}/x11-wm/metacity
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -24,6 +25,7 @@ USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 90d90945d..6ba6dd248 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.1.2.tar.bz2) = 4af11b122187b1d4a2b097a0587cb327
+MD5 (gnome2/control-center-2.1.3.tar.bz2) = e063b961a632f213e08d41688d78f689
diff --git a/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_Makefile.in
deleted file mode 100644
index 659e3c9da..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_theme-switcher_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/theme-switcher/Makefile.in.orig	Thu Oct 10 17:26:56 2002
-+++ capplets/theme-switcher/Makefile.in	Thu Oct 10 17:27:46 2002
-@@ -159,7 +159,7 @@
- gladedir = $(GNOMECC_GLADE_DIR)
- glade_DATA = theme-properties.glade theme-install.glade
- 
--INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\"
-+INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\" -DMETACITY_THEME_LOCATION=\""$(datadir)/themes"\"
- 
- 
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index d33006c46..14541f15e 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -118,6 +118,7 @@ share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
+share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index fcfc810ab..3ad3ca14d 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
@@ -15,7 +15,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnome-desktop-2.2:${PORTSDIR}/x11/gnomedesktop
+LIB_DEPENDS=	gnome-desktop-2.2:${PORTSDIR}/x11/gnomedesktop \
+		metacity-private.0:${PORTSDIR}/x11-wm/metacity
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -24,6 +25,7 @@ USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 90d90945d..6ba6dd248 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.1.2.tar.bz2) = 4af11b122187b1d4a2b097a0587cb327
+MD5 (gnome2/control-center-2.1.3.tar.bz2) = e063b961a632f213e08d41688d78f689
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_Makefile.in
deleted file mode 100644
index 659e3c9da..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_theme-switcher_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/theme-switcher/Makefile.in.orig	Thu Oct 10 17:26:56 2002
-+++ capplets/theme-switcher/Makefile.in	Thu Oct 10 17:27:46 2002
-@@ -159,7 +159,7 @@
- gladedir = $(GNOMECC_GLADE_DIR)
- glade_DATA = theme-properties.glade theme-install.glade
- 
--INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\"
-+INCLUDES =  	-I$(top_srcdir)				$(GNOMECC_CAPPLETS_CFLAGS)		-DGLADEDIR=\""$(gladedir)"\" -DMETACITY_THEME_LOCATION=\""$(datadir)/themes"\"
- 
- 
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index d33006c46..14541f15e 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -118,6 +118,7 @@ share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
+share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo