diff options
| author | obache <obache@pkgsrc.org> | 2007-06-16 14:39:28 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2007-06-16 14:39:28 +0000 |
| commit | 0c7f58ff82a1b767ef5086afa806bd7529b81d55 (patch) | |
| tree | 03ac6af206ed1ea6ea98b13a314f03ca6be54882 /x11/xpmicons | |
| parent | 8c716983c136242bd74df704003c6469dfb4901f (diff) | |
| download | pkgsrc-0c7f58ff82a1b767ef5086afa806bd7529b81d55.tar.gz | |
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 (limited to 'x11/xpmicons')
| -rw-r--r-- | x11/xpmicons/Makefile | 10 | ||||
| -rw-r--r-- | x11/xpmicons/PLIST.icons | 21 |
2 files changed, 2 insertions, 29 deletions
diff --git a/x11/xpmicons/Makefile b/x11/xpmicons/Makefile index f2a63cd4d49..b3d3e7e178e 100644 --- a/x11/xpmicons/Makefile +++ b/x11/xpmicons/Makefile @@ -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 @@ NO_BUILD= yes 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 --git a/x11/xpmicons/PLIST.icons b/x11/xpmicons/PLIST.icons deleted file mode 100644 index 9e7721fa221..00000000000 --- a/x11/xpmicons/PLIST.icons +++ /dev/null @@ -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 |