diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /graphics/glitz | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'graphics/glitz')
| -rw-r--r-- | graphics/glitz/Makefile | 9 | ||||
| -rw-r--r-- | graphics/glitz/PLIST | 14 | ||||
| -rw-r--r-- | graphics/glitz/options.mk | 7 |
3 files changed, 15 insertions, 15 deletions
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile index d8516ce00e3..54254fb302b 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/12/02 22:32:59 jschauma Exp $ +# $NetBSD: Makefile,v 1.24 2008/04/12 22:43:01 jlam Exp $ DISTNAME= glitz-0.5.6 PKGREVISION= 2 @@ -17,11 +17,10 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \ src/glitz.pc.in +PLIST_VARS+= agl .if exists(/System/Library/Frameworks/AGL.framework) -PLIST_SUBST+= AGL="" -CONFIGURE_ENV+= AGL_LIBS="-framework AGL" -.else -PLIST_SUBST+= AGL="@comment " +PLIST.agl= yes +CONFIGURE_ENV+= AGL_LIBS="-framework AGL" .endif .include "options.mk" diff --git a/graphics/glitz/PLIST b/graphics/glitz/PLIST index 2237cc0b24e..6c0f4cb04ad 100644 --- a/graphics/glitz/PLIST +++ b/graphics/glitz/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 2006/07/23 03:42:43 minskim Exp $ -${AGL}include/glitz-agl.h -${X11}include/glitz-glx.h +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:01 jlam Exp $ +${PLIST.agl}include/glitz-agl.h +${PLIST.x11}include/glitz-glx.h include/glitz.h -${AGL}lib/libglitz-agl.la -${X11}lib/libglitz-glx.la +${PLIST.agl}lib/libglitz-agl.la +${PLIST.x11}lib/libglitz-glx.la lib/libglitz.la -${AGL}lib/pkgconfig/glitz-agl.pc -${X11}lib/pkgconfig/glitz-glx.pc +${PLIST.agl}lib/pkgconfig/glitz-agl.pc +${PLIST.x11}lib/pkgconfig/glitz-glx.pc lib/pkgconfig/glitz.pc diff --git a/graphics/glitz/options.mk b/graphics/glitz/options.mk index 739e8709daf..3b736b814f8 100644 --- a/graphics/glitz/options.mk +++ b/graphics/glitz/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2006/11/06 11:28:02 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.glitz PKG_SUPPORTED_OPTIONS= x11 @@ -6,17 +6,18 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + ### ### X11 support ### .if !empty(PKG_OPTIONS:Mx11) LIBS.Darwin+= -lXext -PLIST_SUBST+= X11="" +PLIST.x11= yes .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build # only for configure .include "../../x11/libXt/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-glx -PLIST_SUBST+= X11="@comment " .endif |