[pkgsrc/trunk]: pkgsrc/graphics/libggi Include vgl plugin in PLIST on DragonF...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/686a5b46cb45
branches:  trunk
changeset: 511735:686a5b46cb45
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 20 16:28:54 2006 +0000

description:
Include vgl plugin in PLIST on DragonFly and FreeBSD.
Use conditional comment for dga instead of second PLIST file.

diffstat:

 graphics/libggi/Makefile  |  21 +++++++++++----------
 graphics/libggi/PLIST     |   5 ++++-
 graphics/libggi/PLIST.dga |   3 ---
 3 files changed, 15 insertions(+), 14 deletions(-)

diffs (67 lines):

diff -r 643bc11956ba -r 686a5b46cb45 graphics/libggi/Makefile
--- a/graphics/libggi/Makefile  Thu Apr 20 16:21:01 2006 +0000
+++ b/graphics/libggi/Makefile  Thu Apr 20 16:28:54 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2006/03/04 21:29:49 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/04/20 16:28:54 joerg Exp $
 #
 
 DISTNAME=      libggi-2.1.1.src
 PKGNAME=       ${DISTNAME:S/.src//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ftp://ftp.ggi-project.org/pub/packages/ggi/ggi/v2.1/ \
                http://www.ggi-project.org/ftp/ggi/v2.1/ \
@@ -38,15 +38,16 @@
 PLIST_SUBST+=  COND_TERMINFO=""
 .endif
 
+.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
+PLIST_SUBST+=  COND_LIBVGL=""
+.else
+PLIST_SUBST+=  COND_LIBVGL="@comment "
+.endif
+
 .if exists(${X11BASE}/include/X11/extensions/xf86dga.h)
-#
-# it would be more logical to set PLIST_SRC to PLIST first and then add
-# PLIST.dga to it, but @dirrm lib/ggi/display will fail while processing
-# pkg/PLIST, because the directory still contains files (they are listed in
-# PLIST.dga) and isn't empty, thus can't be removed
-#
-PLIST_SRC=              ${PKGDIR}/PLIST.dga
-PLIST_SRC+=             ${PKGDIR}/PLIST
+PLIST_SUBST+=  COND_XF86DGA=""
+.else
+PLIST_SUBST+=  COND_XF86DGA="@comment "
 .endif
 
 .include "../../devel/ncurses/buildlink3.mk"
diff -r 643bc11956ba -r 686a5b46cb45 graphics/libggi/PLIST
--- a/graphics/libggi/PLIST     Thu Apr 20 16:21:01 2006 +0000
+++ b/graphics/libggi/PLIST     Thu Apr 20 16:28:54 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/04/18 15:54:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/04/20 16:28:54 joerg Exp $
 bin/cube3d
 bin/ggiteleserver
 bin/monitest
@@ -78,7 +78,10 @@
 ${COND_TERMINFO}lib/ggi/display/terminfo.la
 lib/ggi/display/tile.la
 lib/ggi/display/trueemu.la
+${COND_LIBVGL}lib/ggi/display/vgl.la
+${COND_XF86DGA}lib/ggi/display/xf86dga.la
 lib/ggi/helper/helper_x_dbe.la
+${COND_XF86DGA}lib/ggi/helper/helper_x_dga.la
 lib/ggi/helper/helper_x_evi.la
 lib/ggi/helper/helper_x_shm.la
 lib/ggi/helper/helper_x_vidmode.la
diff -r 643bc11956ba -r 686a5b46cb45 graphics/libggi/PLIST.dga
--- a/graphics/libggi/PLIST.dga Thu Apr 20 16:21:01 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.dga,v 1.3 2004/09/22 08:09:35 jlam Exp $
-lib/ggi/display/xf86dga.la
-lib/ggi/helper/helper_x_dga.la