Added libgnomeuimm; removed libgnomeuimm20, libgnomeuimm26

11 files changed, 2 insertions, 276 deletions

diff --git a/devel/Makefile b/devel/Makefile
index d83881b755a..f7e9ae50709 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.662 2005/07/22 22:03:09 adam Exp $
+# $NetBSD: Makefile,v 1.663 2005/07/22 22:06:56 adam Exp $
 #
 
 COMMENT=	Development utilities
@@ -227,8 +227,7 @@ SUBDIR+=	libglademm
 SUBDIR+=	libgnome
 SUBDIR+=	libgnomemm
 SUBDIR+=	libgnomeui
-SUBDIR+=	libgnomeuimm20
-SUBDIR+=	libgnomeuimm26
+SUBDIR+=	libgnomeuimm
 SUBDIR+=	libgphoto2
 SUBDIR+=	libgsf
 SUBDIR+=	libhfs
diff --git a/devel/libgnomeuimm20/DESCR b/devel/libgnomeuimm20/DESCR
deleted file mode 100644
index d8b0cad09a5..00000000000
--- a/devel/libgnomeuimm20/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/devel/libgnomeuimm20/Makefile b/devel/libgnomeuimm20/Makefile
deleted file mode 100644
index 1ea726aa17a..00000000000
--- a/devel/libgnomeuimm20/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
-#
-
-DISTNAME=		libgnomeuimm-2.0.0
-PKGNAME=		libgnomeuimm20-2.0.0
-PKGREVISION=		1
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.0/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://gtkmm.sourceforge.net/
-COMMENT=		C++ bindings for libgnomeui
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomeui/libgnomeuimm-2.0.pc.in
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
-
-.include "../../devel/pkg-config/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libgnomemm20/buildlink3.mk"
-.include "../../graphics/libgnomecanvasmm20/buildlink3.mk"
-# gconfmm must be 2.0
-.include "../../devel/gconfmm/buildlink3.mk"
-.include "../../devel/libglademm20/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeuimm20/PLIST b/devel/libgnomeuimm20/PLIST
deleted file mode 100644
index c8394db6d93..00000000000
--- a/devel/libgnomeuimm20/PLIST
+++ /dev/null
@@ -1,61 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:27 jlam Exp $
-include/libgnomeuimm-2.0/libgnomeuimm.h
-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
-lib/libgnomeuimm-2.0.la
-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/pkgconfig/libgnomeuimm-2.0.pc
-@dirrm lib/libgnomeuimm-2.0/proc/m4
-@dirrm lib/libgnomeuimm-2.0/proc
-@dirrm lib/libgnomeuimm-2.0/include
-@dirrm lib/libgnomeuimm-2.0
-@dirrm include/libgnomeuimm-2.0/libgnomeuimm/private
-@dirrm include/libgnomeuimm-2.0/libgnomeuimm
-@dirrm include/libgnomeuimm-2.0
diff --git a/devel/libgnomeuimm20/buildlink3.mk b/devel/libgnomeuimm20/buildlink3.mk
deleted file mode 100644
index b0195d362c9..00000000000
--- a/devel/libgnomeuimm20/buildlink3.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 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.libgnomeuimm20?=	build
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMEUIMM20_BUILDLINK3_MK:=	${LIBGNOMEUIMM20_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomeuimm20
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeuimm20}
-BUILDLINK_PACKAGES+=	libgnomeuimm20
-
-.if !empty(LIBGNOMEUIMM20_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeuimm20+=	libgnomeuimm20>=2.0.0
-BUILDLINK_RECOMMENDED.libgnomeuimm20+=	libgnomeuimm20>=2.0.0nb1
-BUILDLINK_PKGSRCDIR.libgnomeuimm20?=	../../devel/libgnomeuimm20
-.endif	# LIBGNOMEUIMM20_BUILDLINK3_MK
-
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libgnomemm20/buildlink3.mk"
-.include "../../graphics/libgnomecanvasmm20/buildlink3.mk"
-.include "../../devel/gconfmm/buildlink3.mk"
-.include "../../devel/libglademm20/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnomeuimm20/distinfo b/devel/libgnomeuimm20/distinfo
deleted file mode 100644
index abedf6c3172..00000000000
--- a/devel/libgnomeuimm20/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:18 agc Exp $
-
-SHA1 (libgnomeuimm-2.0.0.tar.bz2) = 37ff31ab70e426be834c558684a4390f11c7f361
-RMD160 (libgnomeuimm-2.0.0.tar.bz2) = 5323ed865e5f782e77f1e9869eb01f79f4a23e2a
-Size (libgnomeuimm-2.0.0.tar.bz2) = 277918 bytes
diff --git a/devel/libgnomeuimm26/DESCR b/devel/libgnomeuimm26/DESCR
deleted file mode 100644
index d8b0cad09a5..00000000000
--- a/devel/libgnomeuimm26/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/devel/libgnomeuimm26/Makefile b/devel/libgnomeuimm26/Makefile
deleted file mode 100644
index 4ce7d501b3b..00000000000
--- a/devel/libgnomeuimm26/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
-#
-
-DISTNAME=		libgnomeuimm-2.6.0
-PKGNAME=		libgnomeuimm26-2.6.0
-PKGREVISION=		1
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.6/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://gtkmm.sourceforge.net/
-COMMENT=		C++ bindings for libgnomeui
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomeui/libgnomeuimm-2.6.pc.in
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
-
-.include "../../devel/pkg-config/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libgnomemm26/buildlink3.mk"
-.include "../../graphics/libgnomecanvasmm26/buildlink3.mk"
-.include "../../devel/gconfmm26/buildlink3.mk"
-.include "../../devel/libglademm24/buildlink3.mk"
-.include "../../sysutils/gnome-vfsmm26/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeuimm26/PLIST b/devel/libgnomeuimm26/PLIST
deleted file mode 100644
index 4b1fdd8055b..00000000000
--- a/devel/libgnomeuimm26/PLIST
+++ /dev/null
@@ -1,65 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:27 jlam Exp $
-include/libgnomeuimm-2.6/libgnomeuimm.h
-include/libgnomeuimm-2.6/libgnomeuimm/about.h
-include/libgnomeuimm-2.6/libgnomeuimm/app-callback.h
-include/libgnomeuimm-2.6/libgnomeuimm/app-helper.h
-include/libgnomeuimm-2.6/libgnomeuimm/app.h
-include/libgnomeuimm-2.6/libgnomeuimm/appbar.h
-include/libgnomeuimm-2.6/libgnomeuimm/client.h
-include/libgnomeuimm-2.6/libgnomeuimm/color-picker.h
-include/libgnomeuimm-2.6/libgnomeuimm/dateedit.h
-include/libgnomeuimm-2.6/libgnomeuimm/druid-page-edge.h
-include/libgnomeuimm-2.6/libgnomeuimm/druid-page-standard.h
-include/libgnomeuimm-2.6/libgnomeuimm/druid-page.h
-include/libgnomeuimm-2.6/libgnomeuimm/druid.h
-include/libgnomeuimm-2.6/libgnomeuimm/entry.h
-include/libgnomeuimm-2.6/libgnomeuimm/file-entry.h
-include/libgnomeuimm-2.6/libgnomeuimm/font-picker.h
-include/libgnomeuimm-2.6/libgnomeuimm/href.h
-include/libgnomeuimm-2.6/libgnomeuimm/icon-entry.h
-include/libgnomeuimm-2.6/libgnomeuimm/icon-list.h
-include/libgnomeuimm-2.6/libgnomeuimm/icon-lookup.h
-include/libgnomeuimm-2.6/libgnomeuimm/icon-sel.h
-include/libgnomeuimm-2.6/libgnomeuimm/icon-textitem.h
-include/libgnomeuimm-2.6/libgnomeuimm/init.h
-include/libgnomeuimm-2.6/libgnomeuimm/pixmap-entry.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/about_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/app_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/appbar_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/client_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/color-picker_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/dateedit_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/druid-page-edge_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/druid-page-standard_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/druid-page_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/druid_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/entry_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/file-entry_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/font-picker_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/href_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/icon-entry_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/icon-list_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/icon-lookup_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/icon-sel_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/icon-textitem_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/pixmap-entry_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/private/thumbnail_p.h
-include/libgnomeuimm-2.6/libgnomeuimm/stock.h
-include/libgnomeuimm-2.6/libgnomeuimm/thumbnail.h
-include/libgnomeuimm-2.6/libgnomeuimm/types.h
-include/libgnomeuimm-2.6/libgnomeuimm/ui-items-derived.h
-include/libgnomeuimm-2.6/libgnomeuimm/ui-items-icon.h
-include/libgnomeuimm-2.6/libgnomeuimm/ui-items-stock.h
-include/libgnomeuimm-2.6/libgnomeuimm/wrap_init.h
-lib/libgnomeuimm-2.6.la
-lib/libgnomeuimm-2.6/include/libgnomeuimmconfig.h
-lib/libgnomeuimm-2.6/proc/m4/convert.m4
-lib/libgnomeuimm-2.6/proc/m4/convert_libgnomeuimm.m4
-lib/pkgconfig/libgnomeuimm-2.6.pc
-@dirrm lib/libgnomeuimm-2.6/proc/m4
-@dirrm lib/libgnomeuimm-2.6/proc
-@dirrm lib/libgnomeuimm-2.6/include
-@dirrm lib/libgnomeuimm-2.6
-@dirrm include/libgnomeuimm-2.6/libgnomeuimm/private
-@dirrm include/libgnomeuimm-2.6/libgnomeuimm
-@dirrm include/libgnomeuimm-2.6
diff --git a/devel/libgnomeuimm26/buildlink3.mk b/devel/libgnomeuimm26/buildlink3.mk
deleted file mode 100644
index cd567129068..00000000000
--- a/devel/libgnomeuimm26/buildlink3.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 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.libgnomeuimm26?=	build
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGNOMEUIMM26_BUILDLINK3_MK:=	${LIBGNOMEUIMM26_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgnomeuimm26
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeuimm26}
-BUILDLINK_PACKAGES+=	libgnomeuimm26
-
-.if !empty(LIBGNOMEUIMM26_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeuimm26+=	libgnomeuimm26>=2.6.0
-BUILDLINK_RECOMMENDED.libgnomeuimm26+=	libgnomeuimm26>=2.6.0nb1
-BUILDLINK_PKGSRCDIR.libgnomeuimm26?=	../../devel/libgnomeuimm26
-.endif	# LIBGNOMEUIMM26_BUILDLINK3_MK
-
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libgnomemm26/buildlink3.mk"
-.include "../../graphics/libgnomecanvasmm26/buildlink3.mk"
-.include "../../devel/gconfmm26/buildlink3.mk"
-.include "../../devel/libglademm24/buildlink3.mk"
-.include "../../sysutils/gnome-vfsmm26/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnomeuimm26/distinfo b/devel/libgnomeuimm26/distinfo
deleted file mode 100644
index abca8aeb373..00000000000
--- a/devel/libgnomeuimm26/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:18 agc Exp $
-
-SHA1 (libgnomeuimm-2.6.0.tar.bz2) = c108d4f16fa1e069258f9b8ab3c043f536337b91
-RMD160 (libgnomeuimm-2.6.0.tar.bz2) = 8dbc747510c933dbdaee24f0df6858a05ba9697f
-Size (libgnomeuimm-2.6.0.tar.bz2) = 296521 bytes