diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | b1276828b47cd0e050c7db6a6dd702ffc806f96a (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /graphics | |
| parent | 4795460da1a16fd97804c0cfe23df962441269c8 (diff) | |
| download | pkgsrc-b1276828b47cd0e050c7db6a6dd702ffc806f96a.tar.gz | |
Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework. Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.
This fixes PR pkg/26590.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/freetype2/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index efd3f517b7b..f4eb6c235fb 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/08/05 02:51:09 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2004/08/22 19:32:51 jlam Exp $ DISTNAME= freetype-2.1.9 PKGNAME= freetype2-2.1.9 @@ -29,13 +29,8 @@ PKGCONFIG_OVERRIDE= builds/unix/freetype2.in .include "../../mk/bsd.prefs.mk" .include "../../mk/compiler.mk" -# Global and legacy options -.if defined(MKTTINTERP) -. if !defined(PKG_OPTIONS.freetype2) -. if defined(MKTTINTERP) && !empty(MKTTINTERP:M[yY][eE][sS]) -PKG_OPTIONS.freetype2+= truetype -. endif -. endif +.if defined(MKTTINTERP) && !empty(MKTTINTERP:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= truetype .endif PKG_OPTIONS_VAR+= PKG_OPTIONS.freetype2 PKG_SUPPORTED_OPTIONS= truetype |