Add gconfmm 2.6.1 after repocopy from gconfmm, C++ wrapper for

gconf2 API library.

4 files changed, 48 insertions, 37 deletions

diff --git a/devel/Makefile b/devel/Makefile
index f15c9233b5b..af3ef3c803c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -261,6 +261,7 @@
     SUBDIR += gconf
     SUBDIR += gconf2
     SUBDIR += gconfmm
+    SUBDIR += gconfmm26
     SUBDIR += gcvs
     SUBDIR += gdb52
     SUBDIR += gdb53
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 129a4881bdd..3f7290dfb6a 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gconfmm
-PORTVERSION=	2.0.2
+PORTVERSION=	2.6.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -15,14 +15,24 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for gconf2 API library
 
-LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		${X11BASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack lthack gconf2
-USE_LIBTOOL_VER=	13
+USE_GCC=	3.3
+USE_REINPLACE=	yes
+USE_GNOME=	gnomehack gconf2 lthack
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
+PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index f2ebe6b1014..79b00d4e7d5 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gconfmm-2.0.2.tar.gz) = 55ca17a4b9cd744e797aefab826bdb21
-SIZE (gnome2/gconfmm-2.0.2.tar.gz) = 363645
+MD5 (gnome2/gconfmm-2.6.1.tar.bz2) = 9edf4f866de9bd6db9ae7cf31535ad49
+SIZE (gnome2/gconfmm-2.6.1.tar.bz2) = 258830
diff --git a/devel/gconfmm26/pkg-plist b/devel/gconfmm26/pkg-plist
index 8865ccf17c4..b8649f14bd6 100644
--- a/devel/gconfmm26/pkg-plist
+++ b/devel/gconfmm26/pkg-plist
@@ -1,30 +1,30 @@
-include/gconfmm-2.0/gconfmm.h
-include/gconfmm-2.0/gconfmm/callback.h
-include/gconfmm-2.0/gconfmm/changeset.h
-include/gconfmm-2.0/gconfmm/client.h
-include/gconfmm-2.0/gconfmm/entry.h
-include/gconfmm-2.0/gconfmm/init.h
-include/gconfmm-2.0/gconfmm/private/changeset_p.h
-include/gconfmm-2.0/gconfmm/private/client_p.h
-include/gconfmm-2.0/gconfmm/private/entry_p.h
-include/gconfmm-2.0/gconfmm/private/schema_p.h
-include/gconfmm-2.0/gconfmm/private/value_p.h
-include/gconfmm-2.0/gconfmm/schema.h
-include/gconfmm-2.0/gconfmm/setinterface.h
-include/gconfmm-2.0/gconfmm/value.h
-include/gconfmm-2.0/gconfmm/value_listhelpers.h
-include/gconfmm-2.0/gconfmm/wrap_init.h
-lib/gconfmm-2.0/include/gconfmmconfig.h
-lib/gconfmm-2.0/proc/m4/convert.m4
-lib/gconfmm-2.0/proc/m4/convert_gconfmm.m4
-lib/libgconfmm-2.0.a
-lib/libgconfmm-2.0.so
-lib/libgconfmm-2.0.so.1
-libdata/pkgconfig/gconfmm-2.0.pc
-@dirrm lib/gconfmm-2.0/include
-@dirrm lib/gconfmm-2.0/proc/m4
-@dirrm lib/gconfmm-2.0/proc
-@dirrm lib/gconfmm-2.0
-@dirrm include/gconfmm-2.0/gconfmm/private
-@dirrm include/gconfmm-2.0/gconfmm
-@dirrm include/gconfmm-2.0
+include/gconfmm-%%API_VERSION%%/gconfmm.h
+include/gconfmm-%%API_VERSION%%/gconfmm/callback.h
+include/gconfmm-%%API_VERSION%%/gconfmm/changeset.h
+include/gconfmm-%%API_VERSION%%/gconfmm/client.h
+include/gconfmm-%%API_VERSION%%/gconfmm/entry.h
+include/gconfmm-%%API_VERSION%%/gconfmm/init.h
+include/gconfmm-%%API_VERSION%%/gconfmm/private/changeset_p.h
+include/gconfmm-%%API_VERSION%%/gconfmm/private/client_p.h
+include/gconfmm-%%API_VERSION%%/gconfmm/private/entry_p.h
+include/gconfmm-%%API_VERSION%%/gconfmm/private/schema_p.h
+include/gconfmm-%%API_VERSION%%/gconfmm/private/value_p.h
+include/gconfmm-%%API_VERSION%%/gconfmm/schema.h
+include/gconfmm-%%API_VERSION%%/gconfmm/setinterface.h
+include/gconfmm-%%API_VERSION%%/gconfmm/value.h
+include/gconfmm-%%API_VERSION%%/gconfmm/value_listhelpers.h
+include/gconfmm-%%API_VERSION%%/gconfmm/wrap_init.h
+lib/gconfmm-%%API_VERSION%%/include/gconfmmconfig.h
+lib/gconfmm-%%API_VERSION%%/proc/m4/convert.m4
+lib/gconfmm-%%API_VERSION%%/proc/m4/convert_gconfmm.m4
+lib/libgconfmm-%%VERSION%%.a
+lib/libgconfmm-%%VERSION%%.so
+lib/libgconfmm-%%VERSION%%.so.1
+libdata/pkgconfig/gconfmm-%%API_VERSION%%.pc
+@dirrm lib/gconfmm-%%API_VERSION%%/proc/m4
+@dirrm lib/gconfmm-%%API_VERSION%%/proc
+@dirrm lib/gconfmm-%%API_VERSION%%/include
+@dirrm lib/gconfmm-%%API_VERSION%%
+@dirrm include/gconfmm-%%API_VERSION%%/gconfmm/private
+@dirrm include/gconfmm-%%API_VERSION%%/gconfmm
+@dirrm include/gconfmm-%%API_VERSION%%