Update to 2.6.0.

5 files changed, 11 insertions, 23 deletions

diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index ffe54cc2dcb..87eb3c7d194 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	glade2
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
 DISTNAME=	glade-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,9 +19,9 @@ COMMENT=	A user interface builder for GTK+/GNOME
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=	13
-USE_GNOME=	gnomeprefix gnomehack libgnomedb libgnomeui
+USE_GNOME=	gnomeprefix intlhack gnomehack lthack libgnomedb libgnomeui
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index 081b495f1f4..8c7206aae14 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/glade-2.0.1.tar.bz2) = 83fae1cdebb37461450906f212c1bc76
-SIZE (gnome2/glade-2.0.1.tar.bz2) = 1912213
+MD5 (gnome2/glade-2.6.0.tar.bz2) = 49ff3e8123f55937e53a3a3bb3ec90fa
+SIZE (gnome2/glade-2.6.0.tar.bz2) = 2145674
diff --git a/devel/glade2/files/patch-configure b/devel/glade2/files/patch-configure
deleted file mode 100644
index 886a0a57d1c..00000000000
--- a/devel/glade2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sun Jun  2 22:01:19 2002
-+++ configure	Sun Jun  2 22:01:34 2002
-@@ -7089,6 +7089,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/devel/glade2/pkg-descr b/devel/glade2/pkg-descr
index ba67d8da44b..b74a7247cf0 100644
--- a/devel/glade2/pkg-descr
+++ b/devel/glade2/pkg-descr
@@ -1,5 +1,5 @@
 Glade is a RAD tool to enable quick & easy development of user interfaces
-for GTK+/GNOME. It also contains built-in support for generating the
-C source code needed to recreate the interfaces.
+for GTK+/GNOME.  It can generate the C source code needed to create
+the interfaces designed within Glade's interface editor.
 
 WWW: http://glade.gnome.org/
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index 23cb36bdabf..b6cb3f25b43 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -18,7 +18,6 @@ share/gnome/help/glade-2/C/figures/window-palette-add.png
 share/gnome/help/glade-2/C/figures/window-palette-basic.png
 share/gnome/help/glade-2/C/figures/window-palette-gnome.png
 share/gnome/help/glade-2/C/glade-faq.xml
-share/gnome/help/glade-2/C/glade-turbo-start.xml
 share/gnome/help/glade-2/C/glade-user-guide.xml
 share/gnome/help/glade-2/C/legal.xml
 share/gnome/help/glade-2/ro/glade-faq.xml
@@ -27,8 +26,6 @@ share/gnome/omf/glade-2/glade-faq-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-faq-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/glade-2/glade-faq-ro.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-faq-ro.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/glade-2/glade-turbo-start-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-turbo-start-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/glade-2/glade-user-guide-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-user-guide-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/glade-2.png
@@ -41,11 +38,13 @@ share/locale/cs/LC_MESSAGES/glade-2.0.mo
 share/locale/da/LC_MESSAGES/glade-2.0.mo
 share/locale/de/LC_MESSAGES/glade-2.0.mo
 share/locale/el/LC_MESSAGES/glade-2.0.mo
+share/locale/en_CA/LC_MESSAGES/glade-2.0.mo
 share/locale/en_GB/LC_MESSAGES/glade-2.0.mo
 share/locale/es/LC_MESSAGES/glade-2.0.mo
 share/locale/fr/LC_MESSAGES/glade-2.0.mo
 share/locale/ga/LC_MESSAGES/glade-2.0.mo
 share/locale/gl/LC_MESSAGES/glade-2.0.mo
+share/locale/hr/LC_MESSAGES/glade-2.0.mo
 share/locale/hu/LC_MESSAGES/glade-2.0.mo
 share/locale/it/LC_MESSAGES/glade-2.0.mo
 share/locale/ja/LC_MESSAGES/glade-2.0.mo
@@ -81,5 +80,5 @@ share/locale/zh_CN/LC_MESSAGES/glade-2.0.mo
 @dirrm share/gnome/glade-2/gtk
 @dirrm share/gnome/glade-2
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/glade-2/glade-faq-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/glade-2/glade-turbo-start-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/glade-2/glade-faq-ro.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/glade-2/glade-user-guide-C.omf 2>/dev/null || /usr/bin/true