Merge gnome2-pixmaps into gnome-desktop. gnome-pixmaps (v1) was deleted

three months ago, so there is no need for this separation any more.
Simplifies maintenance.  Bump gnome-desktop's PKGREVISION to 1.

10 files changed, 79 insertions, 158 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index fce5733c3ec..ea9acd1f70f 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.388 2005/07/23 21:34:55 wiz Exp $
+# $NetBSD: Makefile,v 1.389 2005/08/21 11:26:47 jmmv Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -109,7 +109,6 @@ SUBDIR+=	glut
 SUBDIR+=	gmngview
 SUBDIR+=	gnome-backgrounds
 SUBDIR+=	gnome-icon-theme
-SUBDIR+=	gnome2-pixmaps
 SUBDIR+=	gnuplot
 SUBDIR+=	gnuplot-nox11
 SUBDIR+=	gpaint
diff --git a/graphics/gnome2-pixmaps/DESCR b/graphics/gnome2-pixmaps/DESCR
deleted file mode 100644
index 9095f808114..00000000000
--- a/graphics/gnome2-pixmaps/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-  This package contains the pixmaps for gnome2-desktop.
-These have been split out to allow GNOME and GNOME2 to co-exist.
diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile
deleted file mode 100644
index f3aeaaf9625..00000000000
--- a/graphics/gnome2-pixmaps/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2005/06/16 06:57:58 jlam Exp $
-#
-
-DISTNAME=		gnome-desktop-2.10.1
-PKGNAME=		${DISTNAME:S/-desktop/2-pixmaps/}
-CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.10/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Pixmaps for gnome-core
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${LOCALBASE} == ${X11PREFIX})
-CONFLICTS+=		gnome-core<1.4.2
-CONFLICTS+=		gnome-pixmaps-[0-9]*
-.else
-CONFLICTS+=		gnome-pixmaps-2.0.8
-.endif
-
-USE_DIRS+=		xdg-1.1
-NO_CONFIGURE=		YES
-NO_BUILD=		YES
-
-DSTDIR=			${PREFIX}/share/pixmaps
-INSTALLATION_DIRS=	share/pixmaps
-
-.include "../../mk/x11.buildlink3.mk"
-
-do-install:
-	cd ${WRKSRC}/pixmaps &&					\
-	for i in *.png *.xpm ; do				\
-		${INSTALL_DATA} $$i ${DSTDIR} ;			\
-	done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnome2-pixmaps/PLIST b/graphics/gnome2-pixmaps/PLIST
deleted file mode 100644
index 8442a5c78c7..00000000000
--- a/graphics/gnome2-pixmaps/PLIST
+++ /dev/null
@@ -1,75 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/22 16:09:27 jmmv Exp $
-share/pixmaps/apple-green.png
-share/pixmaps/apple-red.png
-share/pixmaps/gnome-aorta.png
-share/pixmaps/gnome-applets.png
-share/pixmaps/gnome-background-image.png
-share/pixmaps/gnome-background-pattern.png
-share/pixmaps/gnome-background.png
-share/pixmaps/gnome-calc2.png
-share/pixmaps/gnome-calc3.png
-share/pixmaps/gnome-calendar.png
-share/pixmaps/gnome-ccbackground.png
-share/pixmaps/gnome-ccdesktop.png
-share/pixmaps/gnome-ccdialog.png
-share/pixmaps/gnome-ccmime.png
-share/pixmaps/gnome-ccperiph.png
-share/pixmaps/gnome-ccscreensaver.png
-share/pixmaps/gnome-ccwindowmanager.png
-share/pixmaps/gnome-color-browser.png
-share/pixmaps/gnome-color-xterm.png
-share/pixmaps/gnome-computer.png
-share/pixmaps/gnome-cromagnon.png
-share/pixmaps/gnome-day.png
-share/pixmaps/gnome-debian.png
-share/pixmaps/gnome-diskfree.png
-share/pixmaps/gnome-emacs.png
-share/pixmaps/gnome-eterm.png
-share/pixmaps/gnome-file-c.png
-share/pixmaps/gnome-file-h.png
-share/pixmaps/gnome-folder.png
-share/pixmaps/gnome-gemvt.png
-share/pixmaps/gnome-gimp.png
-share/pixmaps/gnome-gmenu.png
-share/pixmaps/gnome-gmush.png
-share/pixmaps/gnome-gnomoku.png
-share/pixmaps/gnome-home.png
-share/pixmaps/gnome-html.png
-share/pixmaps/gnome-image-gif.png
-share/pixmaps/gnome-image-jpeg.png
-share/pixmaps/gnome-irc.png
-share/pixmaps/gnome-laptop.png
-share/pixmaps/gnome-log.png
-share/pixmaps/gnome-logo-icon-transparent.png
-share/pixmaps/gnome-logo-icon.png
-share/pixmaps/gnome-logo-large.png
-share/pixmaps/gnome-mdi.png
-share/pixmaps/gnome-mnemonic.png
-share/pixmaps/gnome-month.png
-share/pixmaps/gnome-mouse.png
-share/pixmaps/gnome-news.png
-share/pixmaps/gnome-note.png
-share/pixmaps/gnome-qeye.png
-share/pixmaps/gnome-set-time.png
-share/pixmaps/gnome-spider.png
-share/pixmaps/gnome-squeak.png
-share/pixmaps/gnome-suse.png
-share/pixmaps/gnome-talk.png
-share/pixmaps/gnome-term-linux.png
-share/pixmaps/gnome-term-linux2.png
-share/pixmaps/gnome-term-night.png
-share/pixmaps/gnome-term-tiger.png
-share/pixmaps/gnome-term.png
-share/pixmaps/gnome-tigert.png
-share/pixmaps/gnome-touristinfo.png
-share/pixmaps/gnome-user-interface.png
-share/pixmaps/gnome-week.png
-share/pixmaps/gnome-windows.png
-share/pixmaps/gnome-word.png
-share/pixmaps/gnome-workspace.png
-share/pixmaps/gnome-xterm.png
-share/pixmaps/gtkvim.png
-share/pixmaps/kterm.xpm
-share/pixmaps/monitor.png
-share/pixmaps/vnterm.xpm
-@comment in xdg-dirs: @dirrm share/pixmaps
diff --git a/graphics/gnome2-pixmaps/buildlink3.mk b/graphics/gnome2-pixmaps/buildlink3.mk
deleted file mode 100644
index 72f5193dc17..00000000000
--- a/graphics/gnome2-pixmaps/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/03/22 16:09:27 jmmv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME2_PIXMAPS_BUILDLINK3_MK:=	${GNOME2_PIXMAPS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome2-pixmaps
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-pixmaps}
-BUILDLINK_PACKAGES+=	gnome2-pixmaps
-
-.if !empty(GNOME2_PIXMAPS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome2-pixmaps+=	gnome2-pixmaps>=2.10.0
-BUILDLINK_PKGSRCDIR.gnome2-pixmaps?=	../../graphics/gnome2-pixmaps
-.endif	# GNOME2_PIXMAPS_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gnome2-pixmaps/distinfo b/graphics/gnome2-pixmaps/distinfo
deleted file mode 100644
index 0cce183ec67..00000000000
--- a/graphics/gnome2-pixmaps/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.12 2005/05/18 16:43:33 jmmv Exp $
-
-SHA1 (gnome-desktop-2.10.1.tar.bz2) = 23ac5dce753f7fa517a3ab54bb9ff589cd43b68f
-RMD160 (gnome-desktop-2.10.1.tar.bz2) = d3012f8f4c367800a64b3029bb093bc4ab7b6874
-Size (gnome-desktop-2.10.1.tar.bz2) = 1084349 bytes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 11371b4fd14..ebe4d578639 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:26 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/21 11:26:47 jmmv Exp $
 #
 
 DISTNAME=		gnome-desktop-2.10.2
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.10/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,7 +25,6 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../graphics/gnome2-pixmaps/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index bafadcab0e3..043539b3884 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/07/06 18:01:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/08/21 11:26:47 jmmv Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
@@ -114,6 +114,80 @@ share/omf/gnome-desktop/gpl-C.omf
 share/omf/gnome-desktop/gpl-eu.omf
 share/omf/gnome-desktop/lgpl-C.omf
 share/omf/gnome-desktop/lgpl-eu.omf
+share/pixmaps/apple-green.png
+share/pixmaps/apple-red.png
+share/pixmaps/gnome-aorta.png
+share/pixmaps/gnome-applets.png
+share/pixmaps/gnome-background-image.png
+share/pixmaps/gnome-background-pattern.png
+share/pixmaps/gnome-background.png
+share/pixmaps/gnome-calc2.png
+share/pixmaps/gnome-calc3.png
+share/pixmaps/gnome-calendar.png
+share/pixmaps/gnome-ccbackground.png
+share/pixmaps/gnome-ccdesktop.png
+share/pixmaps/gnome-ccdialog.png
+share/pixmaps/gnome-ccmime.png
+share/pixmaps/gnome-ccperiph.png
+share/pixmaps/gnome-ccscreensaver.png
+share/pixmaps/gnome-ccwindowmanager.png
+share/pixmaps/gnome-color-browser.png
+share/pixmaps/gnome-color-xterm.png
+share/pixmaps/gnome-computer.png
+share/pixmaps/gnome-cromagnon.png
+share/pixmaps/gnome-day.png
+share/pixmaps/gnome-debian.png
+share/pixmaps/gnome-diskfree.png
+share/pixmaps/gnome-emacs.png
+share/pixmaps/gnome-eterm.png
+share/pixmaps/gnome-file-c.png
+share/pixmaps/gnome-file-h.png
+share/pixmaps/gnome-folder.png
+share/pixmaps/gnome-gemvt.png
+share/pixmaps/gnome-gimp.png
+share/pixmaps/gnome-gmenu.png
+share/pixmaps/gnome-gmush.png
+share/pixmaps/gnome-gnomoku.png
+share/pixmaps/gnome-home.png
+share/pixmaps/gnome-html.png
+share/pixmaps/gnome-image-gif.png
+share/pixmaps/gnome-image-jpeg.png
+share/pixmaps/gnome-irc.png
+share/pixmaps/gnome-laptop.png
+share/pixmaps/gnome-log.png
+share/pixmaps/gnome-logo-icon-transparent.png
+share/pixmaps/gnome-logo-icon.png
+share/pixmaps/gnome-logo-large.png
+share/pixmaps/gnome-mdi.png
+share/pixmaps/gnome-mnemonic.png
+share/pixmaps/gnome-month.png
+share/pixmaps/gnome-mouse.png
+share/pixmaps/gnome-news.png
+share/pixmaps/gnome-note.png
+share/pixmaps/gnome-qeye.png
+share/pixmaps/gnome-set-time.png
+share/pixmaps/gnome-spider.png
+share/pixmaps/gnome-squeak.png
+share/pixmaps/gnome-suse.png
+share/pixmaps/gnome-talk.png
+share/pixmaps/gnome-term-linux.png
+share/pixmaps/gnome-term-linux2.png
+share/pixmaps/gnome-term-night.png
+share/pixmaps/gnome-term-tiger.png
+share/pixmaps/gnome-term.png
+share/pixmaps/gnome-tigert.png
+share/pixmaps/gnome-touristinfo.png
+share/pixmaps/gnome-user-interface.png
+share/pixmaps/gnome-week.png
+share/pixmaps/gnome-windows.png
+share/pixmaps/gnome-word.png
+share/pixmaps/gnome-workspace.png
+share/pixmaps/gnome-xterm.png
+share/pixmaps/gtkvim.png
+share/pixmaps/kterm.xpm
+share/pixmaps/monitor.png
+share/pixmaps/vnterm.xpm
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-desktop
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/lgpl/eu
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 75980c908a2..0cca39ca17a 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/03/22 16:09:27 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/08/21 11:26:47 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -17,7 +17,6 @@ BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/gnome2-pixmaps/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gnome-desktop/patches/patch-ae b/x11/gnome-desktop/patches/patch-ae
deleted file mode 100644
index 0c4c90027ad..00000000000
--- a/x11/gnome-desktop/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/02/26 17:24:55 jmmv Exp $
-
---- pixmaps/Makefile.in.orig	2005-02-14 18:43:18.000000000 +0100
-+++ pixmaps/Makefile.in
-@@ -87,7 +87,7 @@ GNOME_MINOR = @GNOME_MINOR@
- GNOME_PLATFORM = @GNOME_PLATFORM@
- GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@
- GTK_REQUIRED = @GTK_REQUIRED@
--INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_DATA = echo "part of gnome-pixmaps, not installed: "
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@