Added libgnomecanvasmm; removed libgnomecanvas20, libgnomecanvasmm26

11 files changed, 2 insertions, 233 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index a3997715a3d..1fc62aa6742 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.386 2005/07/13 14:54:10 adam Exp $
+# $NetBSD: Makefile,v 1.387 2005/07/22 21:56:12 adam Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -166,8 +166,7 @@ SUBDIR+=	libggiwmh
 SUBDIR+=	libgii
 SUBDIR+=	libgiigic
 SUBDIR+=	libgnomecanvas
-SUBDIR+=	libgnomecanvasmm20
-SUBDIR+=	libgnomecanvasmm26
+SUBDIR+=	libgnomecanvasmm
 SUBDIR+=	libkexif
 SUBDIR+=	libkipi
 SUBDIR+=	libpixman
diff --git a/graphics/libgnomecanvasmm20/DESCR b/graphics/libgnomecanvasmm20/DESCR
deleted file mode 100644
index d8b0cad09a5..00000000000
--- a/graphics/libgnomecanvasmm20/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-gtkmm (previously known as Gtk--) is the official C++ interface for the
-popular GUI library GTK+. Highlights include typesafe callbacks, widgets
-extensible via inheritance and a comprehensive set of widget classes that
-can be freely combined to quickly create complex user interfaces.
diff --git a/graphics/libgnomecanvasmm20/Makefile b/graphics/libgnomecanvasmm20/Makefile
deleted file mode 100644
index ef7b343a8e7..00000000000
--- a/graphics/libgnomecanvasmm20/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:51 wiz Exp $
-#
-
-DISTNAME=		libgnomecanvasmm-2.0.2
-PKGNAME=		libgnomecanvasmm20-2.0.2
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvasmm/2.0/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://gtkmm.sourceforge.net/
-COMMENT=		C++ bindings for libgnomecanvas
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomecanvas/libgnomecanvasmm-2.0.pc.in
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
-
-.include "../../devel/pkg-config/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-# gtkmm must be 2.0/2.2
-.include "../../x11/gtkmm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvasmm20/PLIST b/graphics/libgnomecanvasmm20/PLIST
deleted file mode 100644
index b65ec0f38d6..00000000000
--- a/graphics/libgnomecanvasmm20/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:36 jlam Exp $
-include/libgnomecanvasmm-2.0/libgnomecanvasmm.h
-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
-lib/libgnomecanvasmm-2.0.la
-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/pkgconfig/libgnomecanvasmm-2.0.pc
-@dirrm lib/libgnomecanvasmm-2.0/proc/m4
-@dirrm lib/libgnomecanvasmm-2.0/proc
-@dirrm lib/libgnomecanvasmm-2.0/include
-@dirrm lib/libgnomecanvasmm-2.0
-@dirrm include/libgnomecanvasmm-2.0/libgnomecanvasmm/private
-@dirrm include/libgnomecanvasmm-2.0/libgnomecanvasmm
-@dirrm include/libgnomecanvasmm-2.0
diff --git a/graphics/libgnomecanvasmm20/buildlink3.mk b/graphics/libgnomecanvasmm20/buildlink3.mk
deleted file mode 100644
index 20a3af2745d..00000000000
--- a/graphics/libgnomecanvasmm20/buildlink3.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:14:55 tv Exp $
-# XXX
-# XXX This file was created automatically using createbuildlink-3.4.
-# XXX After this file as been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed.  Please do not commit
-# XXX unverified buildlink[23].mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX	BUILDLINK_DEPMETHOD.libgnomecanvasmm20?=	build
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-LIBGNOMECANVASMM20_BUILDLINK3_MK:=	${LIBGNOMECANVASMM20_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomecanvasmm20
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvasmm20}
-BUILDLINK_PACKAGES+=	libgnomecanvasmm20
-
-.if !empty(LIBGNOMECANVASMM20_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecanvasmm20+=	libgnomecanvasmm20>=2.0.1
-BUILDLINK_RECOMMENDED.libgnomecanvasmm20+=	libgnomecanvasmm20>=2.0.1nb1
-BUILDLINK_PKGSRCDIR.libgnomecanvasmm20?=	../../graphics/libgnomecanvasmm20
-.endif	# LIBGNOMECANVASMM20_BUILDLINK3_MK
-
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../x11/gtkmm/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgnomecanvasmm20/distinfo b/graphics/libgnomecanvasmm20/distinfo
deleted file mode 100644
index bbeb7082ec8..00000000000
--- a/graphics/libgnomecanvasmm20/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:09 agc Exp $
-
-SHA1 (libgnomecanvasmm-2.0.2.tar.bz2) = d783fb8debe6c225a6b10e97751faef607d5acc7
-RMD160 (libgnomecanvasmm-2.0.2.tar.bz2) = 70155c54a87fd996b457ffba279bd0c6245f0c2f
-Size (libgnomecanvasmm-2.0.2.tar.bz2) = 288672 bytes
diff --git a/graphics/libgnomecanvasmm26/DESCR b/graphics/libgnomecanvasmm26/DESCR
deleted file mode 100644
index d8b0cad09a5..00000000000
--- a/graphics/libgnomecanvasmm26/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-gtkmm (previously known as Gtk--) is the official C++ interface for the
-popular GUI library GTK+. Highlights include typesafe callbacks, widgets
-extensible via inheritance and a comprehensive set of widget classes that
-can be freely combined to quickly create complex user interfaces.
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
deleted file mode 100644
index 80fec578554..00000000000
--- a/graphics/libgnomecanvasmm26/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:51 wiz Exp $
-#
-
-DISTNAME=		libgnomecanvasmm-2.6.1
-PKGNAME=		libgnomecanvasmm26-2.6.1
-PKGREVISION=		1
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvasmm/2.6/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://gtkmm.sourceforge.net/
-COMMENT=		C++ bindings for libgnomecanvas
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomecanvas/libgnomecanvasmm-2.6.pc.in
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
-
-.include "../../devel/pkg-config/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../x11/gtkmm24/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvasmm26/PLIST b/graphics/libgnomecanvasmm26/PLIST
deleted file mode 100644
index 0d904dd9a93..00000000000
--- a/graphics/libgnomecanvasmm26/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:36 jlam Exp $
-include/libgnomecanvasmm-2.6/libgnomecanvasmm.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/affinetrans.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/bpath.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/canvas.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/ellipse.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/group.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/init.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/item.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/line.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/path-def.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/pixbuf.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/point.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/polygon.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/bpath_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/canvas_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/ellipse_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/group_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/item_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/line_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/path-def_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/pixbuf_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/polygon_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/rect-ellipse_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/rect_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/rich-text_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/shape_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/text_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/private/widget_p.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/properties.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/rect-ellipse.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/rect.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/rich-text.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/shape.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/text.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/widget.h
-include/libgnomecanvasmm-2.6/libgnomecanvasmm/wrap_init.h
-lib/libgnomecanvasmm-2.6.la
-lib/libgnomecanvasmm-2.6/include/libgnomecanvasmmconfig.h
-lib/libgnomecanvasmm-2.6/proc/m4/convert.m4
-lib/libgnomecanvasmm-2.6/proc/m4/convert_libgnomecanvasmm.m4
-lib/pkgconfig/libgnomecanvasmm-2.6.pc
-@dirrm lib/libgnomecanvasmm-2.6/proc/m4
-@dirrm lib/libgnomecanvasmm-2.6/proc
-@dirrm lib/libgnomecanvasmm-2.6/include
-@dirrm lib/libgnomecanvasmm-2.6
-@dirrm include/libgnomecanvasmm-2.6/libgnomecanvasmm/private
-@dirrm include/libgnomecanvasmm-2.6/libgnomecanvasmm
-@dirrm include/libgnomecanvasmm-2.6
diff --git a/graphics/libgnomecanvasmm26/buildlink3.mk b/graphics/libgnomecanvasmm26/buildlink3.mk
deleted file mode 100644
index 6da6a34f4d2..00000000000
--- a/graphics/libgnomecanvasmm26/buildlink3.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:14:55 tv Exp $
-# XXX
-# XXX This file was created automatically using createbuildlink-3.4.
-# XXX After this file as been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed.  Please do not commit
-# XXX unverified buildlink[23].mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX	BUILDLINK_DEPMETHOD.libgnomecanvasmm26?=	build
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-LIBGNOMECANVASMM26_BUILDLINK3_MK:=	${LIBGNOMECANVASMM26_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomecanvasmm26
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvasmm26}
-BUILDLINK_PACKAGES+=	libgnomecanvasmm26
-
-.if !empty(LIBGNOMECANVASMM26_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecanvasmm26+=	libgnomecanvasmm26>=2.6.1
-BUILDLINK_RECOMMENDED.libgnomecanvasmm26+=	libgnomecanvasmm26>=2.6.1nb1
-BUILDLINK_PKGSRCDIR.libgnomecanvasmm26?=	../../graphics/libgnomecanvasmm26
-.endif	# LIBGNOMECANVASMM26_BUILDLINK3_MK
-
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../x11/gtkmm24/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo
deleted file mode 100644
index 1dd04182514..00000000000
--- a/graphics/libgnomecanvasmm26/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:09 agc Exp $
-
-SHA1 (libgnomecanvasmm-2.6.1.tar.bz2) = c919f96daad54f7b9e4f2bdf26917c417abdaa63
-RMD160 (libgnomecanvasmm-2.6.1.tar.bz2) = 83982f3a1ded0c8de826b1b1bca3b1c5a116635d
-Size (libgnomecanvasmm-2.6.1.tar.bz2) = 306363 bytes