[pkgsrc/trunk]: pkgsrc/x11/xpmicons Fixed PLIST when X11_TYPE=native. No need...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09d8a0c5046a
branches:  trunk
changeset: 530134:09d8a0c5046a
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jun 16 14:39:28 2007 +0000

description:
Fixed PLIST when X11_TYPE=native. No need PLIST.icons trick anymore.
Bump PKGREVISION.

PLIST.icons was made based on PR 34178,
But entries noted in PLIST.icons were mis-installed from ${WRKDIR}/.buildlink
directory, which contained x11 headers, also *.xbm and *.xpm files.

Depending on x11 had been removed since rev 1.17 of Makefile.
Installed from ${WRKSRC}/.* directories is avoided since rev 1.19 of Makefile.

diffstat:

 x11/xpmicons/Makefile    |  10 ++--------
 x11/xpmicons/PLIST.icons |  21 ---------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diffs (51 lines):

diff -r 7ed2cfdc500f -r 09d8a0c5046a x11/xpmicons/Makefile
--- a/x11/xpmicons/Makefile     Sat Jun 16 14:34:17 2007 +0000
+++ b/x11/xpmicons/Makefile     Sat Jun 16 14:39:28 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/02/15 14:54:39 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2007/06/16 14:39:28 obache Exp $
 
 DISTNAME=      xpmicons-1.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    x11
 MASTER_SITES=  http://www.plig.org/xwinman/ \
                ftp://ftp.cit.gu.edu.au/pub/AIcons/ \
@@ -24,12 +24,6 @@
 
 INSTALLATION_DIRS=     include/X11/bitmaps include/X11/pixmaps
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} != "xorg" && ${X11_TYPE} != "modular"
-PLIST_SRC=     PLIST PLIST.icons
-.endif
-
 post-extract:
        find ${WRKSRC} -type d -name .xvpics -print | ${XARGS} rm -rf
 
diff -r 7ed2cfdc500f -r 09d8a0c5046a x11/xpmicons/PLIST.icons
--- a/x11/xpmicons/PLIST.icons  Sat Jun 16 14:34:17 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-@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