7 files changed, 38 insertions, 45 deletions

diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 4c0198dc4850..cdc733e2a83f 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gdl
-PORTVERSION=	0.4.0
-PORTREVISION=	4
+PORTVERSION=	0.5.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Components intended to be shared between GNOME development tools
@@ -18,14 +17,10 @@ COMMENT=	Components intended to be shared between GNOME development tools
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -Ee \
-		's|-D[^[:space:]_]+_DISABLE_DEPRECATED||g'
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index e228f7d62b6a..246301022055 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,2 +1,2 @@
-MD5 (gdl-0.4.0.tar.bz2) = eb4dfd9def266e4e5cd1e9883b5bdf2a
-SIZE (gdl-0.4.0.tar.bz2) = 529313
+MD5 (gdl-0.5.0.tar.bz2) = 16971189d8a8cb359bc83a384ac440ec
+SIZE (gdl-0.5.0.tar.bz2) = 480806
diff --git a/x11-toolkits/gdl/files/patch-configure b/x11-toolkits/gdl/files/patch-configure
deleted file mode 100644
index dc389d96bad3..000000000000
--- a/x11-toolkits/gdl/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure	2002/08/04 21:18:58	1.1
-+++ configure	2002/08/04 21:19:10
-@@ -5853,6 +5853,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
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 000000000000..bcfde3afce14
--- /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-symbol-browser-control_symbol-browser.c b/x11-toolkits/gdl/files/patch-symbol-browser-control_symbol-browser.c
deleted file mode 100644
index eb8d8cb71597..000000000000
--- a/x11-toolkits/gdl/files/patch-symbol-browser-control_symbol-browser.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- symbol-browser-control/symbol-browser.c.orig	Fri Aug 13 20:41:15 2004
-+++ symbol-browser-control/symbol-browser.c	Fri Aug 13 20:41:42 2004
-@@ -28,6 +28,7 @@
- #include <gtk/gtktreeview.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#include <string.h>
- 
- #include <tm_project.h>
- #include <tm_tagmanager.h>
diff --git a/x11-toolkits/gdl/files/patch-symbol-browser-control_tagmanager_parse.h b/x11-toolkits/gdl/files/patch-symbol-browser-control_tagmanager_parse.h
deleted file mode 100644
index 844b1aceecc0..000000000000
--- a/x11-toolkits/gdl/files/patch-symbol-browser-control_tagmanager_parse.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- symbol-browser-control/tagmanager/parse.h.orig	Sun Aug 24 00:47:40 2003
-+++ symbol-browser-control/tagmanager/parse.h	Sun Aug 24 00:47:50 2003
-@@ -10,6 +10,8 @@
- #ifndef _PARSE_H
- #define _PARSE_H
- 
-+#include <sys/types.h>
-+
- /*
- *   INCLUDE FILES
- */
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 3455655a7870..197b1669b697 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -1,6 +1,6 @@
-bin/gnome-symbol-browser
 include/libgdl-1.0/gdl/GDL.h
-include/libgdl-1.0/gdl/gdl-dock-item-grip.h
+include/libgdl-1.0/gdl/gdl-combo-button.h
+include/libgdl-1.0/gdl/gdl-dock-bar.h
 include/libgdl-1.0/gdl/gdl-dock-item.h
 include/libgdl-1.0/gdl/gdl-dock-layout.h
 include/libgdl-1.0/gdl/gdl-dock-master.h
@@ -12,43 +12,55 @@ include/libgdl-1.0/gdl/gdl-dock-tablabel.h
 include/libgdl-1.0/gdl/gdl-dock.h
 include/libgdl-1.0/gdl/gdl-icons.h
 include/libgdl-1.0/gdl/gdl-recent.h
+include/libgdl-1.0/gdl/gdl-stock.h
 include/libgdl-1.0/gdl/gdl-tools.h
 include/libgdl-1.0/gdl/gdl.h
 include/libgdl-1.0/gdl/libgdltypebuiltins.h
 lib/libgdl-1.a
 lib/libgdl-1.so
 lib/libgdl-1.so.0
-libdata/bonobo/servers/GNOME_Development_SymbolBrowser.server
 libdata/pkgconfig/gdl-1.0.pc
+share/gdl/images/stock-close-12.png
+share/gdl/images/stock-menu-left-12.png
+share/gdl/images/stock-menu-right-12.png
 share/gnome/gdl/glade/layout.glade
-share/gnome/gnome-2.0/ui/gnome-symbol-browser.xml
 share/gnome/idl/libgdl-1.0/GDL.idl
 share/gnome/idl/libgdl-1.0/editor-buffer.idl
 share/gnome/idl/libgdl-1.0/editor-gutter.idl
 share/gnome/idl/libgdl-1.0/symbol-browser.idl
 share/locale/am/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
 share/locale/da/LC_MESSAGES/gdl-1.mo
 share/locale/de/LC_MESSAGES/gdl-1.mo
 share/locale/el/LC_MESSAGES/gdl-1.mo
+share/locale/en_CA/LC_MESSAGES/gdl-1.mo
+share/locale/en_GB/LC_MESSAGES/gdl-1.mo
 share/locale/es/LC_MESSAGES/gdl-1.mo
 share/locale/fr/LC_MESSAGES/gdl-1.mo
+share/locale/ga/LC_MESSAGES/gdl-1.mo
+share/locale/hr/LC_MESSAGES/gdl-1.mo
 share/locale/it/LC_MESSAGES/gdl-1.mo
 share/locale/ja/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
 share/locale/nl/LC_MESSAGES/gdl-1.mo
 share/locale/no/LC_MESSAGES/gdl-1.mo
+share/locale/pa/LC_MESSAGES/gdl-1.mo
 share/locale/pl/LC_MESSAGES/gdl-1.mo
 share/locale/pt/LC_MESSAGES/gdl-1.mo
 share/locale/pt_BR/LC_MESSAGES/gdl-1.mo
 share/locale/ru/LC_MESSAGES/gdl-1.mo
+share/locale/rw/LC_MESSAGES/gdl-1.mo
 share/locale/sk/LC_MESSAGES/gdl-1.mo
+share/locale/sq/LC_MESSAGES/gdl-1.mo
 share/locale/sr/LC_MESSAGES/gdl-1.mo
 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/gnome/idl/libgdl-1.0
 @dirrm share/gnome/gdl/glade
 @dirrm share/gnome/gdl