Move some of the bitmaps into an independent PLIST and conditionally

include it when X11_TYPE!= xorg. I gave up trying to find out when they
are installed. Bump revision.

3 files changed, 28 insertions, 22 deletions

diff --git a/x11/xpmicons/Makefile b/x11/xpmicons/Makefile
index 5dc8b117d4f..d0b6ae2951c 100644
--- a/x11/xpmicons/Makefile
+++ b/x11/xpmicons/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/09/02 19:30:45 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/24 16:20:43 joerg Exp $
 
 DISTNAME=	xpmicons-1.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://www.plig.org/xwinman/ \
 		ftp://ftp.cit.gu.edu.au/pub/AIcons/ \
@@ -26,6 +26,10 @@ INSTALLATION_DIRS=	include/X11/bitmaps include/X11/pixmaps
 
 .include "../../mk/x11.buildlink3.mk"
 
+.if ${X11_TYPE} != "xorg"
+PLIST_SRC+=	PLIST.icons
+.endif
+
 post-extract:
 	find ${WRKSRC} -type d -name .xvpics -exec rm -rf {} \; -prune
 
diff --git a/x11/xpmicons/PLIST b/x11/xpmicons/PLIST
index d9d0e2964b8..27f1ebee117 100644
--- a/x11/xpmicons/PLIST
+++ b/x11/xpmicons/PLIST
@@ -1,36 +1,24 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/02 19:30:45 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/10/24 16:20:43 joerg Exp $
 include/X11/bitmaps/app.xbm
 include/X11/bitmaps/app_mask.xbm
-include/X11/bitmaps/card.xbm
 include/X11/bitmaps/cursor.xbm
 include/X11/bitmaps/cursor_big.xbm
 include/X11/bitmaps/dir.xbm
 include/X11/bitmaps/dir_mask.xbm
-include/X11/bitmaps/down.xbm
 include/X11/bitmaps/file.xbm
 include/X11/bitmaps/file_mask.xbm
 include/X11/bitmaps/files.xbm
 include/X11/bitmaps/files_mask.xbm
 include/X11/bitmaps/grey.xbm
 include/X11/bitmaps/grey_mask.xbm
-include/X11/bitmaps/keyboard.xbm
-include/X11/bitmaps/left.xbm
 include/X11/bitmaps/link.xbm
 include/X11/bitmaps/link_mask.xbm
 include/X11/bitmaps/mime.xbm
 include/X11/bitmaps/mime_mask.xbm
-include/X11/bitmaps/monitor.xbm
-include/X11/bitmaps/mouse.xbm
-include/X11/bitmaps/narrower.xbm
-include/X11/bitmaps/right.xbm
-include/X11/bitmaps/shorter.xbm
-include/X11/bitmaps/taller.xbm
 include/X11/bitmaps/text.xbm
 include/X11/bitmaps/text_mask.xbm
-include/X11/bitmaps/up.xbm
 include/X11/bitmaps/url.xbm
 include/X11/bitmaps/url_mask.xbm
-include/X11/bitmaps/wider.xbm
 include/X11/bitmaps/xfm_blackhole.xbm
 include/X11/bitmaps/xfm_cline.xbm
 include/X11/bitmaps/xfm_dir.xbm
@@ -1673,7 +1661,6 @@ include/X11/pixmaps/capital.xpm
 include/X11/pixmaps/car.xpm
 include/X11/pixmaps/car_repair.xpm
 include/X11/pixmaps/car_repair_3d.xpm
-include/X11/pixmaps/card.xpm
 include/X11/pixmaps/card_deck.xpm
 include/X11/pixmaps/card_king.xpm
 include/X11/pixmaps/cards.xpm
@@ -1793,7 +1780,6 @@ include/X11/pixmaps/compressed.xpm
 include/X11/pixmaps/compressed2.xpm
 include/X11/pixmaps/compressed2_3d.xpm
 include/X11/pixmaps/compressed_3d.xpm
-include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/computer_clock.xpm
 include/X11/pixmaps/computer_clock_3d.xpm
 include/X11/pixmaps/con2.xpm
@@ -1863,8 +1849,6 @@ include/X11/pixmaps/demi.dir.xpm
 include/X11/pixmaps/demi.opendir.xpm
 include/X11/pixmaps/denmark.xpm
 include/X11/pixmaps/denmark_3d.xpm
-include/X11/pixmaps/deny-always.xpm
-include/X11/pixmaps/deny.xpm
 include/X11/pixmaps/desk.xpm
 include/X11/pixmaps/desk2.xpm
 include/X11/pixmaps/desk2_3d.xpm
@@ -2807,7 +2791,6 @@ include/X11/pixmaps/localapps.opendir.xpm
 include/X11/pixmaps/lock.xpm
 include/X11/pixmaps/lockBox.xpm
 include/X11/pixmaps/lock_dir.xpm
-include/X11/pixmaps/logo.xpm
 include/X11/pixmaps/logoff_3d.xpm
 include/X11/pixmaps/loulou.xpm
 include/X11/pixmaps/lucien.xpm
@@ -3853,8 +3836,6 @@ include/X11/pixmaps/pencil_3d.xpm
 include/X11/pixmaps/penguin.xpm
 include/X11/pixmaps/pepsi.xpm
 include/X11/pixmaps/pequin.xpm
-include/X11/pixmaps/permit-always.xpm
-include/X11/pixmaps/permit.xpm
 include/X11/pixmaps/pest.next.xpm
 include/X11/pixmaps/peter.xpm
 include/X11/pixmaps/pfordx.xpm
diff --git a/x11/xpmicons/PLIST.icons b/x11/xpmicons/PLIST.icons
new file mode 100644
index 00000000000..9e7721fa221
--- /dev/null
+++ b/x11/xpmicons/PLIST.icons
@@ -0,0 +1,21 @@
+@comment $NetBSD: PLIST.icons,v 1.1 2006/10/24 16:20:43 joerg Exp $
+include/X11/bitmaps/card.xbm
+include/X11/pixmaps/deny.xpm
+include/X11/bitmaps/down.xbm
+include/X11/bitmaps/keyboard.xbm
+include/X11/bitmaps/left.xbm
+include/X11/bitmaps/monitor.xbm
+include/X11/bitmaps/mouse.xbm
+include/X11/bitmaps/narrower.xbm
+include/X11/bitmaps/right.xbm
+include/X11/bitmaps/shorter.xbm
+include/X11/bitmaps/taller.xbm
+include/X11/bitmaps/up.xbm
+include/X11/bitmaps/wider.xbm
+include/X11/pixmaps/card.xpm
+include/X11/pixmaps/computer.xpm
+include/X11/pixmaps/deny-always.xpm
+include/X11/pixmaps/deny.xpm
+include/X11/pixmaps/logo.xpm
+include/X11/pixmaps/permit-always.xpm
+include/X11/pixmaps/permit.xpm