Add libgnomecanvasmm 2.6.1 after repocopy from libgnomecanvasmm,

C++ wrapper for libgnomecanvas library.

5 files changed, 66 insertions, 68 deletions

diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index e2031c8c2fd7..ecf448a0d599 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -6,24 +6,32 @@
 #
 
 PORTNAME=	libgnomecanvasmm
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.6.1
 CATEGORIES=	graphics 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 libgnomecanvas library
 
-LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
+LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm26
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgnomecanvas
+USE_GCC=	3.3
+USE_REINPLACE=	yes
+USE_GNOME=	gnomehack libgnomecanvas 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/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo
index b0ec2131ccc6..97c6319c72b2 100644
--- a/graphics/libgnomecanvasmm26/distinfo
+++ b/graphics/libgnomecanvasmm26/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomecanvasmm-2.0.1.tar.gz) = bf05e2d85c0e10aa29dc6d451a52b3bf
-SIZE (gnome2/libgnomecanvasmm-2.0.1.tar.gz) = 421895
+MD5 (gnome2/libgnomecanvasmm-2.6.1.tar.bz2) = 52e6eea23dad7873485439f11d5b5a43
+SIZE (gnome2/libgnomecanvasmm-2.6.1.tar.bz2) = 306363
diff --git a/graphics/libgnomecanvasmm26/files/patch-configure b/graphics/libgnomecanvasmm26/files/patch-configure
deleted file mode 100644
index 35c76e40e089..000000000000
--- a/graphics/libgnomecanvasmm26/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May 21 16:30:53 2003
-+++ configure	Wed May 21 16:31:19 2003
-@@ -7730,6 +7730,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/graphics/libgnomecanvasmm26/files/patch-libgnomecanvas_libgnomecanvasmm_item.cc b/graphics/libgnomecanvasmm26/files/patch-libgnomecanvas::libgnomecanvasmm::item.cc
index b76f284bd154..b76f284bd154 100644
--- a/graphics/libgnomecanvasmm26/files/patch-libgnomecanvas_libgnomecanvasmm_item.cc
+++ b/graphics/libgnomecanvasmm26/files/patch-libgnomecanvas::libgnomecanvasmm::item.cc
diff --git a/graphics/libgnomecanvasmm26/pkg-plist b/graphics/libgnomecanvasmm26/pkg-plist
index 5fd70aa3ae1d..96851310959e 100644
--- a/graphics/libgnomecanvasmm26/pkg-plist
+++ b/graphics/libgnomecanvasmm26/pkg-plist
@@ -1,50 +1,50 @@
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/affinetrans.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/bpath.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/canvas.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/ellipse.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/group.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/init.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/item.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/line.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/path-def.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/pixbuf.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/point.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/polygon.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/bpath_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/canvas_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/ellipse_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/group_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/item_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/line_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/path-def_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/pixbuf_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/polygon_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/rect-ellipse_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/rect_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/rich-text_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/shape_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/text_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/private/widget_p.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/properties.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/rect-ellipse.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/rect.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/rich-text.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/shape.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/text.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/widget.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm/wrap_init.h
-include/libgnomecanvasmm-2.0/libgnomecanvasmm.h
-lib/libgnomecanvasmm-2.0/include/libgnomecanvasmmconfig.h
-lib/libgnomecanvasmm-2.0/proc/m4/convert.m4
-lib/libgnomecanvasmm-2.0/proc/m4/convert_libgnomecanvasmm.m4
-lib/libgnomecanvasmm-2.0.a
-lib/libgnomecanvasmm-2.0.so
-lib/libgnomecanvasmm-2.0.so.1
-libdata/pkgconfig/libgnomecanvasmm-2.0.pc
-@dirrm lib/libgnomecanvasmm-2.0/include
-@dirrm lib/libgnomecanvasmm-2.0/proc/m4
-@dirrm lib/libgnomecanvasmm-2.0/proc
-@dirrm lib/libgnomecanvasmm-2.0
-@dirrm include/libgnomecanvasmm-2.0/libgnomecanvasmm/private
-@dirrm include/libgnomecanvasmm-2.0/libgnomecanvasmm
-@dirrm include/libgnomecanvasmm-2.0
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/affinetrans.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/bpath.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/canvas.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/ellipse.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/group.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/init.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/item.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/line.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/path-def.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/pixbuf.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/point.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/polygon.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/bpath_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/canvas_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/ellipse_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/group_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/item_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/line_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/path-def_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/pixbuf_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/polygon_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/rect-ellipse_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/rect_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/rich-text_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/shape_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/text_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private/widget_p.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/properties.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/rect-ellipse.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/rect.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/rich-text.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/shape.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/text.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/widget.h
+include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/wrap_init.h
+lib/libgnomecanvasmm-%%VERSION%%.a
+lib/libgnomecanvasmm-%%VERSION%%.so
+lib/libgnomecanvasmm-%%VERSION%%.so.1
+lib/libgnomecanvasmm-%%API_VERSION%%/include/libgnomecanvasmmconfig.h
+lib/libgnomecanvasmm-%%API_VERSION%%/proc/m4/convert.m4
+lib/libgnomecanvasmm-%%API_VERSION%%/proc/m4/convert_libgnomecanvasmm.m4
+libdata/pkgconfig/libgnomecanvasmm-%%API_VERSION%%.pc
+@dirrm lib/libgnomecanvasmm-%%API_VERSION%%/proc/m4
+@dirrm lib/libgnomecanvasmm-%%API_VERSION%%/proc
+@dirrm lib/libgnomecanvasmm-%%API_VERSION%%/include
+@dirrm lib/libgnomecanvasmm-%%API_VERSION%%
+@dirrm include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm/private
+@dirrm include/libgnomecanvasmm-%%API_VERSION%%/libgnomecanvasmm
+@dirrm include/libgnomecanvasmm-%%API_VERSION%%