diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /x11/modular-xorg-server | |
| parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
| download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'x11/modular-xorg-server')
| -rw-r--r-- | x11/modular-xorg-server/PLIST | 6 | ||||
| -rw-r--r-- | x11/modular-xorg-server/options.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 71b30975fb7..1e24e46034b 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/03/29 17:54:40 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:15 jlam Exp $ bin/X bin/Xnest bin/Xorg @@ -1084,11 +1084,11 @@ lib/X11/xserver/zh_TW.big5 lib/X11/xserver/zh_TW.euctw lib/X11/xserver/zh_TW.utf8 lib/pkgconfig/xorg-server.pc -${USE_DRI}lib/xorg/modules/extensions/libGLcore.la +${PLIST.dri}lib/xorg/modules/extensions/libGLcore.la lib/xorg/modules/extensions/libdbe.la lib/xorg/modules/extensions/libdri.la lib/xorg/modules/extensions/libextmod.la -${USE_DRI}lib/xorg/modules/extensions/libglx.la +${PLIST.dri}lib/xorg/modules/extensions/libglx.la lib/xorg/modules/extensions/librecord.la lib/xorg/modules/extensions/libxtrap.la lib/xorg/modules/fonts/libfreetype.la diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 274128551a1..726e23e8955 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/12/08 09:23:16 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:15 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server PKG_SUPPORTED_OPTIONS= dri inet6 @@ -11,6 +11,7 @@ PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable PKG_OPTIONS.xorg-server us .include "../../mk/bsd.options.mk" +PLIST_VARS+= dri .if !empty(PKG_OPTIONS:Mdri) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= MesaLib-6.5.2.tar.bz2 @@ -28,14 +29,13 @@ CONFIGURE_ENV+= GLX_DEFINES=${GLX_DEFINES:M*:Q} # the newer ones. #BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1 #BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1 -PLIST_SUBST+= USE_DRI="" +PLIST.dri= yes dri-post-extract: ${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL .else CONFIGURE_ARGS+= --disable-glx -PLIST_SUBST+= USE_DRI="@comment " dri-post-extract: @${DO_NADA} |