- Sync w/ FreeBSD ports.

- As for the gimp-app-devel and gnome-build, be sure to do the force
  reinstall, because both of ports have PORTEPOCH bumped by mistake.
- As for avahi, bump to 0.6.21_1.
- As for cairo, reset the $FreeBSD$.


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

5 files changed, 30 insertions, 20 deletions

diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index ff01afa8a..bfafc6222 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.13 2007/06/29 23:21:50 mezz Exp $
+#   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.8 2007/02/16 18:14:27 mezz Exp $
 #
 
 PORTNAME=	gdl
-PORTVERSION=	0.7.6
-PORTREVISION=	2
+PORTVERSION=	0.7.7
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index d8a83b27f..1661f7b60 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-0.7.6.tar.bz2) = 3762f6c134960ffc93143ab09b060fe5
-SHA256 (gdl-0.7.6.tar.bz2) = 8f4187a7c0740f140f1b171498cb45044e2d67ee0f9b0625dba6eaafc6b84790
-SIZE (gdl-0.7.6.tar.bz2) = 448801
+MD5 (gdl-0.7.7.tar.bz2) = c3b676b174c3e6c4ccd654557ebe82ec
+SHA256 (gdl-0.7.7.tar.bz2) = 5e0b5de8e819550e4b20cc129b13f590db91ccfd5e0766f346b114711b970720
+SIZE (gdl-0.7.7.tar.bz2) = 453142
diff --git a/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c b/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c
new file mode 100644
index 000000000..bcfde3afc
--- /dev/null
+++ b/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c
@@ -0,0 +1,17 @@
+--- gdl/gdl-icons.c.orig	Tue May 24 16:37:14 2005
++++ gdl/gdl-icons.c	Tue May 24 16:37:38 2005
+@@ -202,12 +202,13 @@
+ {
+ 	GdkPixbuf *pixbuf;
+ 	char *icon_name;
++	GdlIconsPrivate *priv;
+ 
+ 	g_return_val_if_fail (icons != NULL, NULL);
+ 	g_return_val_if_fail (GDL_IS_ICONS (icons), NULL);
+ 	g_return_val_if_fail (mime_type != NULL, NULL);
+ 
+-	GdlIconsPrivate *priv = GDL_ICONS_GET_PRIVATE (icons);
++	priv = GDL_ICONS_GET_PRIVATE (icons);
+ 
+ 	pixbuf = g_hash_table_lookup (priv->icons, mime_type);
+ 	if (pixbuf != NULL) {
diff --git a/x11-toolkits/gdl/files/patch-gdl_gdl-switcher.c b/x11-toolkits/gdl/files/patch-gdl_gdl-switcher.c
deleted file mode 100644
index 53f0d747c..000000000
--- a/x11-toolkits/gdl/files/patch-gdl_gdl-switcher.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdl/gdl-switcher.c.orig	Tue Jul 10 00:35:38 2007
-+++ gdl/gdl-switcher.c	Tue Jul 10 00:34:14 2007
-@@ -285,6 +285,7 @@ layout_buttons (GdlSwitcher *switcher)
-     }
- 
-     rows_count = num_btns / btns_per_row;
-+    rows_count += (num_btns % btns_per_row == 0) ? 0 : 1;
-     
-     /* Assign buttons to rows */
-     rows = g_new0 (GSList *, rows_count);
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index e4fac62da..d897ab137 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -26,6 +26,7 @@ libdata/pkgconfig/gdl-1.0.pc
 libdata/pkgconfig/gdl-gnome-1.0.pc
 share/gdl/glade/layout.glade
 share/locale/am/LC_MESSAGES/gdl-1.mo
+share/locale/ar/LC_MESSAGES/gdl-1.mo
 share/locale/az/LC_MESSAGES/gdl-1.mo
 share/locale/ca/LC_MESSAGES/gdl-1.mo
 share/locale/cs/LC_MESSAGES/gdl-1.mo
@@ -39,10 +40,12 @@ share/locale/es/LC_MESSAGES/gdl-1.mo
 share/locale/fi/LC_MESSAGES/gdl-1.mo
 share/locale/fr/LC_MESSAGES/gdl-1.mo
 share/locale/ga/LC_MESSAGES/gdl-1.mo
+share/locale/gl/LC_MESSAGES/gdl-1.mo
 share/locale/hr/LC_MESSAGES/gdl-1.mo
 share/locale/hu/LC_MESSAGES/gdl-1.mo
 share/locale/it/LC_MESSAGES/gdl-1.mo
 share/locale/ja/LC_MESSAGES/gdl-1.mo
+share/locale/lv/LC_MESSAGES/gdl-1.mo
 share/locale/mk/LC_MESSAGES/gdl-1.mo
 share/locale/ml/LC_MESSAGES/gdl-1.mo
 share/locale/nb/LC_MESSAGES/gdl-1.mo
@@ -61,11 +64,11 @@ share/locale/sr@Latn/LC_MESSAGES/gdl-1.mo
 share/locale/sv/LC_MESSAGES/gdl-1.mo
 share/locale/vi/LC_MESSAGES/gdl-1.mo
 share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
-@dirrm share/gdl/glade
-@dirrm share/gdl
-@dirrm include/libgdl-1.0/gdl
-@dirrm include/libgdl-1.0
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrm share/gdl/glade
+@dirrm share/gdl
+@dirrm include/libgdl-1.0/gdl
+@dirrm include/libgdl-1.0