Update to 2.1.5.

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

10 files changed, 34 insertions, 32 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 01d91236c..e641329c8 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
@@ -36,5 +35,7 @@ post-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \
 		${WRKSRC}/capplets/font/main.c
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 6ba6dd248..bb01e042e 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.1.3.tar.bz2) = e063b961a632f213e08d41688d78f689
+MD5 (gnome2/control-center-2.1.5.tar.bz2) = bb85e28f7695b61e382ef27116253c83
diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
index 0969a7707..9c487d7b8 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -1,6 +1,6 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	Wed May 29 00:14:19 2002
-+++ capplets/mouse/gnome-mouse-properties.c	Tue Jun 25 21:51:30 2002
-@@ -570,7 +570,7 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
++++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
+@@ -591,7 +591,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
@@ -9,7 +9,7 @@
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -591,7 +591,7 @@
+@@ -612,7 +612,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
@@ -18,7 +18,7 @@
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
+@@ -633,7 +633,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index f43c53c1e..1f63c8a48 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Aug  6 01:33:52 2002
-+++ configure	Wed Aug  7 01:22:14 2002
-@@ -5768,6 +5768,7 @@
+--- configure.orig	Wed Dec 18 16:10:09 2002
++++ configure	Sun Dec 22 16:36:03 2002
+@@ -8516,6 +8516,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9090,7 +9091,7 @@
- fi
+@@ -12607,7 +12608,7 @@
  
- cat >> confdefs.h <<EOF
+ 
+ cat >>confdefs.h <<_ACEOF
 -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
 +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- EOF
+ _ACEOF
  
  GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 14541f15e..2ff8965eb 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -48,7 +48,6 @@ share/gnome/control-center-2.0/capplets/sound.desktop
 share/gnome/control-center-2.0/capplets/window-properties.desktop
 share/gnome/control-center-2.0/icons/accessibility-directory.png
 share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
-share/gnome/control-center-2.0/icons/advanced-directory.png
 share/gnome/control-center-2.0/icons/background-capplet.png
 share/gnome/control-center-2.0/icons/behavior-capplet.png
 share/gnome/control-center-2.0/icons/default-applications-capplet.png
@@ -151,6 +150,7 @@ share/locale/ru/LC_MESSAGES/control-center-2.0.mo
 share/locale/sk/LC_MESSAGES/control-center-2.0.mo
 share/locale/sl/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
+share/locale/ta/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/control-center-2.0.mo
 share/locale/vi/LC_MESSAGES/control-center-2.0.mo
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 01d91236c..e641329c8 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.1
@@ -36,5 +35,7 @@ post-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \
 		${WRKSRC}/capplets/font/main.c
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 6ba6dd248..bb01e042e 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.1.3.tar.bz2) = e063b961a632f213e08d41688d78f689
+MD5 (gnome2/control-center-2.1.5.tar.bz2) = bb85e28f7695b61e382ef27116253c83
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
index 0969a7707..9c487d7b8 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -1,6 +1,6 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	Wed May 29 00:14:19 2002
-+++ capplets/mouse/gnome-mouse-properties.c	Tue Jun 25 21:51:30 2002
-@@ -570,7 +570,7 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
++++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
+@@ -591,7 +591,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
@@ -9,7 +9,7 @@
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -591,7 +591,7 @@
+@@ -612,7 +612,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
@@ -18,7 +18,7 @@
  
  	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
+@@ -633,7 +633,7 @@
  	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
  	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  	g_free (filename);
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index f43c53c1e..1f63c8a48 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Aug  6 01:33:52 2002
-+++ configure	Wed Aug  7 01:22:14 2002
-@@ -5768,6 +5768,7 @@
+--- configure.orig	Wed Dec 18 16:10:09 2002
++++ configure	Sun Dec 22 16:36:03 2002
+@@ -8516,6 +8516,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9090,7 +9091,7 @@
- fi
+@@ -12607,7 +12608,7 @@
  
- cat >> confdefs.h <<EOF
+ 
+ cat >>confdefs.h <<_ACEOF
 -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
 +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- EOF
+ _ACEOF
  
  GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 14541f15e..2ff8965eb 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -48,7 +48,6 @@ share/gnome/control-center-2.0/capplets/sound.desktop
 share/gnome/control-center-2.0/capplets/window-properties.desktop
 share/gnome/control-center-2.0/icons/accessibility-directory.png
 share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
-share/gnome/control-center-2.0/icons/advanced-directory.png
 share/gnome/control-center-2.0/icons/background-capplet.png
 share/gnome/control-center-2.0/icons/behavior-capplet.png
 share/gnome/control-center-2.0/icons/default-applications-capplet.png
@@ -151,6 +150,7 @@ share/locale/ru/LC_MESSAGES/control-center-2.0.mo
 share/locale/sk/LC_MESSAGES/control-center-2.0.mo
 share/locale/sl/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
+share/locale/ta/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/control-center-2.0.mo
 share/locale/vi/LC_MESSAGES/control-center-2.0.mo