5 files changed, 87 insertions, 117 deletions

diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 59f2735ffad0..82030f595667 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -6,33 +6,38 @@
 #
 
 PORTNAME=	libgnomeuimm
-PORTVERSION=	2.0.0
-PORTREVISION=	3
+PORTVERSION=	2.6.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkmm
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libgnomeui library
 
-LIB_DEPENDS=	gnomemm-2.0:${PORTSDIR}/x11/libgnomemm \
-		gnomecanvasmm-2.0:${PORTSDIR}/graphics/libgnomecanvasmm \
-		gconfmm-2.0:${PORTSDIR}/devel/gconfmm \
-		glademm-2.0:${PORTSDIR}/devel/libglademm
+LIB_DEPENDS=	gnomemm-2.6.1:${PORTSDIR}/x11/libgnomemm26 \
+		gnomecanvasmm-2.6.1:${PORTSDIR}/graphics/libgnomecanvasmm26 \
+		gconfmm-2.6.1:${PORTSDIR}/devel/gconfmm26 \
+		glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
+		gnomevfsmm-2.6.1:${PORTSDIR}/devel/gnome-vfsmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+LATEST_LINK=	libgnomeuimm26
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgnomeui
+USE_GCC=	3.3
+USE_REINPLACE=	yes
+USE_GNOME=	gnomehack lthack libgnomeui
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
-.include <bsd.port.pre.mk>
+PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
 
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES=  ${PATCHDIR}/extra-patch-old_gcc_bugs
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
+		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index 3919164c710f..d9a254e53deb 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeuimm-2.0.0.tar.gz) = 6869f8a24a8bda1f42b1c66b418b5fe3
-SIZE (gnome2/libgnomeuimm-2.0.0.tar.gz) = 429018
+MD5 (gnome2/libgnomeuimm-2.6.0.tar.bz2) = 88cef74f116ba3272d1cec46f6566d85
+SIZE (gnome2/libgnomeuimm-2.6.0.tar.bz2) = 296521
diff --git a/x11-toolkits/libgnomeuimm26/files/extra-patch-old_gcc_bugs b/x11-toolkits/libgnomeuimm26/files/extra-patch-old_gcc_bugs
deleted file mode 100644
index f2a69620270f..000000000000
--- a/x11-toolkits/libgnomeuimm26/files/extra-patch-old_gcc_bugs
+++ /dev/null
@@ -1,29 +0,0 @@
---- libgnomeui/libgnomeuimm/dateedit.cc.orig	Fri Aug 22 02:08:35 2003
-+++ libgnomeui/libgnomeuimm/dateedit.cc	Sat Aug 30 01:21:25 2003
-@@ -35,7 +35,7 @@
- : Gtk::HBox(GTK_HBOX(g_object_new(get_type(), (char*)0)))
- {
-   gnome_date_edit_construct(gobj(), the_time,
--    static_cast<GnomeDateEditFlags>( 
-+    GnomeDateEditFlags( 
-       (show_time ? DATE_EDIT_SHOW_TIME : static_cast<DateEditFlags>(0))
-     | (use_24_format ? DATE_EDIT_24_HR : static_cast<DateEditFlags>(0)) ) );
- }
-@@ -44,7 +44,7 @@
- DateEdit::DateEdit(time_t the_time, DateEditFlags flags)
- : Gtk::HBox(GTK_HBOX(g_object_new(get_type(), (char*)0)))
- {
--  gnome_date_edit_construct(gobj(), the_time, static_cast<GnomeDateEditFlags>(flags));
-+  gnome_date_edit_construct(gobj(), the_time, GnomeDateEditFlags(flags));
- }
- 
- 
-@@ -254,7 +254,7 @@
- 
- void DateEdit::set_flags(DateEditFlags flags)
- {
--  gnome_date_edit_set_flags(gobj(), static_cast<GnomeDateEditFlags>(flags));
-+  gnome_date_edit_set_flags(gobj(), GnomeDateEditFlags(flags));
- }
- 
- DateEditFlags DateEdit::get_flags() const
diff --git a/x11-toolkits/libgnomeuimm26/files/patch-configure b/x11-toolkits/libgnomeuimm26/files/patch-configure
deleted file mode 100644
index e22a18268698..000000000000
--- a/x11-toolkits/libgnomeuimm26/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May 21 17:34:00 2003
-+++ configure	Wed May 21 17:34:17 2003
-@@ -7884,6 +7884,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/libgnomeuimm26/pkg-plist b/x11-toolkits/libgnomeuimm26/pkg-plist
index 92a22c7f552e..0e42dd90b70c 100644
--- a/x11-toolkits/libgnomeuimm26/pkg-plist
+++ b/x11-toolkits/libgnomeuimm26/pkg-plist
@@ -1,62 +1,66 @@
-include/libgnomeuimm-2.0/libgnomeuimm/about.h
-include/libgnomeuimm-2.0/libgnomeuimm/app-callback.h
-include/libgnomeuimm-2.0/libgnomeuimm/app-helper.h
-include/libgnomeuimm-2.0/libgnomeuimm/app.h
-include/libgnomeuimm-2.0/libgnomeuimm/appbar.h
-include/libgnomeuimm-2.0/libgnomeuimm/client.h
-include/libgnomeuimm-2.0/libgnomeuimm/color-picker.h
-include/libgnomeuimm-2.0/libgnomeuimm/dateedit.h
-include/libgnomeuimm-2.0/libgnomeuimm/druid-page-edge.h
-include/libgnomeuimm-2.0/libgnomeuimm/druid-page-standard.h
-include/libgnomeuimm-2.0/libgnomeuimm/druid-page.h
-include/libgnomeuimm-2.0/libgnomeuimm/druid.h
-include/libgnomeuimm-2.0/libgnomeuimm/entry.h
-include/libgnomeuimm-2.0/libgnomeuimm/file-entry.h
-include/libgnomeuimm-2.0/libgnomeuimm/font-picker.h
-include/libgnomeuimm-2.0/libgnomeuimm/href.h
-include/libgnomeuimm-2.0/libgnomeuimm/icon-entry.h
-include/libgnomeuimm-2.0/libgnomeuimm/icon-list.h
-include/libgnomeuimm-2.0/libgnomeuimm/icon-sel.h
-include/libgnomeuimm-2.0/libgnomeuimm/icon-textitem.h
-include/libgnomeuimm-2.0/libgnomeuimm/init.h
-include/libgnomeuimm-2.0/libgnomeuimm/pixmap-entry.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/about_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/app_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/appbar_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/client_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/color-picker_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/dateedit_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/druid-page-edge_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/druid-page-standard_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/druid-page_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/druid_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/entry_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/file-entry_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/font-picker_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/href_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/icon-entry_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/icon-list_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/icon-sel_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/icon-textitem_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/private/pixmap-entry_p.h
-include/libgnomeuimm-2.0/libgnomeuimm/stock.h
-include/libgnomeuimm-2.0/libgnomeuimm/types.h
-include/libgnomeuimm-2.0/libgnomeuimm/ui-items-derived.h
-include/libgnomeuimm-2.0/libgnomeuimm/ui-items-icon.h
-include/libgnomeuimm-2.0/libgnomeuimm/ui-items-stock.h
-include/libgnomeuimm-2.0/libgnomeuimm/wrap_init.h
-include/libgnomeuimm-2.0/libgnomeuimm.h
-lib/libgnomeuimm-2.0/include/libgnomeuimmconfig.h
-lib/libgnomeuimm-2.0/proc/m4/convert.m4
-lib/libgnomeuimm-2.0/proc/m4/convert_libgnomeuimm.m4
-lib/libgnomeuimm-2.0.a
-lib/libgnomeuimm-2.0.so
-lib/libgnomeuimm-2.0.so.1
-libdata/pkgconfig/libgnomeuimm-2.0.pc
-@dirrm lib/libgnomeuimm-2.0/include
-@dirrm lib/libgnomeuimm-2.0/proc/m4
-@dirrm lib/libgnomeuimm-2.0/proc
-@dirrm lib/libgnomeuimm-2.0
-@dirrm include/libgnomeuimm-2.0/libgnomeuimm/private
-@dirrm include/libgnomeuimm-2.0/libgnomeuimm
-@dirrm include/libgnomeuimm-2.0
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/about.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/app-callback.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/app-helper.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/app.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/appbar.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/client.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/color-picker.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/dateedit.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/druid-page-edge.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/druid-page-standard.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/druid-page.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/druid.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/entry.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/file-entry.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/font-picker.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/href.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/icon-entry.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/icon-list.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/icon-lookup.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/icon-sel.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/icon-textitem.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/init.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/pixmap-entry.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/about_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/app_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/appbar_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/client_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/color-picker_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/dateedit_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/druid-page-edge_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/druid-page-standard_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/druid-page_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/druid_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/entry_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/file-entry_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/font-picker_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/href_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/icon-entry_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/icon-list_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/icon-lookup_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/icon-sel_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/icon-textitem_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/pixmap-entry_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private/thumbnail_p.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/stock.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/thumbnail.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/types.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/ui-items-derived.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/ui-items-icon.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/ui-items-stock.h
+include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/wrap_init.h
+lib/libgnomeuimm-%%VERSION%%.a
+lib/libgnomeuimm-%%VERSION%%.so
+lib/libgnomeuimm-%%VERSION%%.so.1
+lib/libgnomeuimm-%%API_VERSION%%/include/libgnomeuimmconfig.h
+lib/libgnomeuimm-%%API_VERSION%%/proc/m4/convert.m4
+lib/libgnomeuimm-%%API_VERSION%%/proc/m4/convert_libgnomeuimm.m4
+libdata/pkgconfig/libgnomeuimm-%%API_VERSION%%.pc
+@dirrm lib/libgnomeuimm-%%API_VERSION%%/proc/m4
+@dirrm lib/libgnomeuimm-%%API_VERSION%%/proc
+@dirrm lib/libgnomeuimm-%%API_VERSION%%/include
+@dirrm lib/libgnomeuimm-%%API_VERSION%%
+@dirrm include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/private
+@dirrm include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm
+@dirrm include/libgnomeuimm-%%API_VERSION%%