5 files changed, 35 insertions, 42 deletions

diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 80ce5b1aa429..875dc9c8fd3d 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -6,24 +6,27 @@
 #
 
 PORTNAME=	libgnomemm
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.6.0
 CATEGORIES=	x11 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 libgnome library
 
-LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
+LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgnome
+USE_GCC=	3.3
+USE_GNOME=	gnomehack lthack libgnome
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
+PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
+
 .include <bsd.port.mk>
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index 0c961530ac00..70b5a237b313 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomemm-2.0.1.tar.gz) = 1442244aed3e20edad647ba61de77431
-SIZE (gnome2/libgnomemm-2.0.1.tar.gz) = 334743
+MD5 (gnome2/libgnomemm-2.6.0.tar.bz2) = 684a11aa4726e4f9b148866d1662fc24
+SIZE (gnome2/libgnomemm-2.6.0.tar.bz2) = 238958
diff --git a/x11/libgnomemm26/files/patch-configure b/x11/libgnomemm26/files/patch-configure
deleted file mode 100644
index 8c117297dcb6..000000000000
--- a/x11/libgnomemm26/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May 21 15:52:43 2003
-+++ configure	Wed May 21 15:53:07 2003
-@@ -7854,6 +7854,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/libgnomemm26/pkg-descr b/x11/libgnomemm26/pkg-descr
index 4e71ae5989e1..02e98740a6d0 100644
--- a/x11/libgnomemm26/pkg-descr
+++ b/x11/libgnomemm26/pkg-descr
@@ -1,3 +1,3 @@
-This is a set of thin C++ wrappers for libglade v2 library.
+This is a set of thin C++ wrappers for libgnome library.
 
 WWW: http://gtkmm.sourceforge.net/
diff --git a/x11/libgnomemm26/pkg-plist b/x11/libgnomemm26/pkg-plist
index 28f166fb19f5..0c3118e7c8fd 100644
--- a/x11/libgnomemm26/pkg-plist
+++ b/x11/libgnomemm26/pkg-plist
@@ -1,23 +1,23 @@
-include/libgnomemm-2.0/libgnomemm.h
-include/libgnomemm-2.0/libgnomemm/init.h
-include/libgnomemm-2.0/libgnomemm/main.h
-include/libgnomemm-2.0/libgnomemm/moduleinfo.h
-include/libgnomemm-2.0/libgnomemm/private/main_p.h
-include/libgnomemm-2.0/libgnomemm/private/moduleinfo_p.h
-include/libgnomemm-2.0/libgnomemm/private/program_p.h
-include/libgnomemm-2.0/libgnomemm/program.h
-include/libgnomemm-2.0/libgnomemm/wrap_init.h
-lib/libgnomemm-2.0.a
-lib/libgnomemm-2.0.so
-lib/libgnomemm-2.0.so.1
-lib/libgnomemm-2.0/include/libgnomemmconfig.h
-lib/libgnomemm-2.0/proc/m4/convert.m4
-lib/libgnomemm-2.0/proc/m4/convert_libgnomemm.m4
-libdata/pkgconfig/libgnomemm-2.0.pc
-@dirrm lib/libgnomemm-2.0/include
-@dirrm lib/libgnomemm-2.0/proc/m4
-@dirrm lib/libgnomemm-2.0/proc
-@dirrm lib/libgnomemm-2.0
-@dirrm include/libgnomemm-2.0/libgnomemm/private
-@dirrm include/libgnomemm-2.0/libgnomemm
-@dirrm include/libgnomemm-2.0
+include/libgnomemm-%%API_VERSION%%/libgnomemm.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/init.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/main.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/moduleinfo.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/private/main_p.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/private/moduleinfo_p.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/private/program_p.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/program.h
+include/libgnomemm-%%API_VERSION%%/libgnomemm/wrap_init.h
+lib/libgnomemm-%%VERSION%%.a
+lib/libgnomemm-%%VERSION%%.so
+lib/libgnomemm-%%VERSION%%.so.1
+lib/libgnomemm-%%API_VERSION%%/include/libgnomemmconfig.h
+lib/libgnomemm-%%API_VERSION%%/proc/m4/convert.m4
+lib/libgnomemm-%%API_VERSION%%/proc/m4/convert_libgnomemm.m4
+libdata/pkgconfig/libgnomemm-%%API_VERSION%%.pc
+@dirrm lib/libgnomemm-%%API_VERSION%%/proc/m4
+@dirrm lib/libgnomemm-%%API_VERSION%%/proc
+@dirrm lib/libgnomemm-%%API_VERSION%%/include
+@dirrm lib/libgnomemm-%%API_VERSION%%
+@dirrm include/libgnomemm-%%API_VERSION%%/libgnomemm/private
+@dirrm include/libgnomemm-%%API_VERSION%%/libgnomemm
+@dirrm include/libgnomemm-%%API_VERSION%%