5 files changed, 66 insertions, 31 deletions

diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 1dbdfaea4362..43863324bcaa 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	gdl
-PORTVERSION=	0.1.0
-CATEGORIES?=	x11-toolkits gnome
+PORTVERSION=	0.4.0
+CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.1
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.4
 
-MAINTAINER?=	gnome@FreeBSD.org
-COMMENT=	A components intended to be shared between GNOME development tools
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Components intended to be shared between GNOME development tools
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack bonobo gnomevfs
+USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index 580d548da627..7cc516544628 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1 +1 @@
-MD5 (gdl-0.1.0.tar.bz2) = 29f88e72f6bf5ba4314e4779e029fe0a
+MD5 (gdl-0.4.0.tar.bz2) = eb4dfd9def266e4e5cd1e9883b5bdf2a
diff --git a/x11-toolkits/gdl/files/patch-configure b/x11-toolkits/gdl/files/patch-configure
index d1fec8a86595..dc389d96bad3 100644
--- a/x11-toolkits/gdl/files/patch-configure
+++ b/x11-toolkits/gdl/files/patch-configure
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- configure	2002/08/04 21:18:58	1.1
 +++ configure	2002/08/04 21:19:10
 @@ -5853,6 +5853,7 @@
diff --git a/x11-toolkits/gdl/pkg-descr b/x11-toolkits/gdl/pkg-descr
index ae7f43d40aea..fb910eeedcde 100644
--- a/x11-toolkits/gdl/pkg-descr
+++ b/x11-toolkits/gdl/pkg-descr
@@ -2,13 +2,11 @@ Gnome Devtool Libraries
 =======================
 
 This package contains components and libraries that are intended to be
-shared between GNOME development tools, including gnome-debug,
-gnome-build, and gIDE.
+shared between Scaffold, the new GNOME 2 development system.
 
 The current pieces of GDL include:
 
- - A code-editing bonboo component based on the Scintilla
-   widget (scintilla-control).
+ - A code-editing bonboo component based on GtkSourceView
 
  - An utility library that also contains the stubs and skels for
    the above components (gdl).
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 2f6b5437f208..3455655a7870 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -1,16 +1,56 @@
-bin/scintilla-control
-etc/gdlConf.sh
-include/gdl/GDL.h
-include/gdl/gdl-server-manager.h
-include/gdl/gdl-tools.h
-include/gdl/gdl.h
-lib/libgdl.a
-lib/libgdl.so
-lib/libgdl.so.0
-share/aclocal/gdl.m4
-share/gnome/idl/GDL.idl
-share/gnome/idl/editor-buffer.idl
-share/gnome/idl/editor-gutter.idl
-share/gnome/oaf/Bonobo_Control_Scintilla.oaf
-share/gnome/ui/scintilla-ui.xml
-@dirrm include/gdl
+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-dock-item.h
+include/libgdl-1.0/gdl/gdl-dock-layout.h
+include/libgdl-1.0/gdl/gdl-dock-master.h
+include/libgdl-1.0/gdl/gdl-dock-notebook.h
+include/libgdl-1.0/gdl/gdl-dock-object.h
+include/libgdl-1.0/gdl/gdl-dock-paned.h
+include/libgdl-1.0/gdl/gdl-dock-placeholder.h
+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-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/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/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/es/LC_MESSAGES/gdl-1.mo
+share/locale/fr/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/nl/LC_MESSAGES/gdl-1.mo
+share/locale/no/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/sk/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
+@dirrm share/gnome/idl/libgdl-1.0
+@dirrm share/gnome/gdl/glade
+@dirrm share/gnome/gdl
+@dirrm include/libgdl-1.0/gdl
+@dirrm include/libgdl-1.0