diff options
| author | joerg <joerg@pkgsrc.org> | 2006-04-20 16:28:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-04-20 16:28:54 +0000 |
| commit | ef732ddfb6754d9b59515fc457eeb7362c56fca9 (patch) | |
| tree | 2f6f5a0c9ccb658b0e2556a13d56d0c7772ab689 /graphics/libggi | |
| parent | f3aa5618c761ff177c00ddeaa8f50f2c440a1388 (diff) | |
| download | pkgsrc-ef732ddfb6754d9b59515fc457eeb7362c56fca9.tar.gz | |
Include vgl plugin in PLIST on DragonFly and FreeBSD.
Use conditional comment for dga instead of second PLIST file.
Diffstat (limited to 'graphics/libggi')
| -rw-r--r-- | graphics/libggi/Makefile | 21 | ||||
| -rw-r--r-- | graphics/libggi/PLIST | 5 | ||||
| -rw-r--r-- | graphics/libggi/PLIST.dga | 3 |
3 files changed, 15 insertions, 14 deletions
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index eee9b12c1bf..6dbc103845d 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -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="" 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 --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST index 30f64074d6f..2a57f4e6284 100644 --- a/graphics/libggi/PLIST +++ b/graphics/libggi/PLIST @@ -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 @@ lib/ggi/display/tele.la ${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 --git a/graphics/libggi/PLIST.dga b/graphics/libggi/PLIST.dga deleted file mode 100644 index f84277f45aa..00000000000 --- a/graphics/libggi/PLIST.dga +++ /dev/null @@ -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 |