diff options
| author | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
| commit | f81ae835adc78533f22ce227d12d3f56e6076f1a (patch) | |
| tree | 54f5cc64fe8b06d4695748b3d5b9967e8c030117 /graphics | |
| parent | 79084c0d28dd7c904bebb1b7d09f66fa505cfc47 (diff) | |
| download | pkgsrc-f81ae835adc78533f22ce227d12d3f56e6076f1a.tar.gz | |
Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
user settable variable. Set PKG_SUGGESTED_OPTIONS instead. Also,
make use of PKG_OPTIONS_LEGACY_VARS.
Reviewed by wiz.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick/options.mk | 4 | ||||
| -rw-r--r-- | graphics/dia/options.mk | 4 | ||||
| -rw-r--r-- | graphics/freetype2/Makefile | 7 | ||||
| -rw-r--r-- | graphics/magicpoint/Makefile | 6 | ||||
| -rw-r--r-- | graphics/tiff/options.mk | 5 |
5 files changed, 13 insertions, 13 deletions
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 1dc35eb4800..87765944f7f 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2004/12/24 23:42:49 tv Exp $ +# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick -PKG_DEFAULT_OPTIONS= x11 PKG_SUPPORTED_OPTIONS= x11 +PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk index 8a083095abc..c38917a58b3 100644 --- a/graphics/dia/options.mk +++ b/graphics/dia/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.2 2005/01/20 18:49:33 jmmv Exp $ +# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dia #PKG_SUPPORTED_OPTIONS= gnome cairo PKG_SUPPORTED_OPTIONS= gnome -PKG_DEFAULT_OPTIONS= gnome +PKG_SUGGESTED_OPTIONS= gnome .include "../../mk/bsd.options.mk" diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 9b658e4b5d5..32bbece48e8 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/05/31 10:01:37 dillo Exp $ DISTNAME= freetype-2.1.9 PKGNAME= freetype2-2.1.9 @@ -30,11 +30,10 @@ PKGCONFIG_OVERRIDE= builds/unix/freetype2.in .include "../../mk/bsd.prefs.mk" .include "../../mk/compiler.mk" -.if defined(MKTTINTERP) && !empty(MKTTINTERP:M[yY][eE][sS]) -PKG_DEFAULT_OPTIONS+= truetype -.endif PKG_OPTIONS_VAR+= PKG_OPTIONS.freetype2 PKG_SUPPORTED_OPTIONS= truetype +PKG_OPTIONS_LEGACY_VARS+= MKTTINTERP:truetype + .include "../../mk/bsd.options.mk" ### diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index 053c9e6eaf2..efe46a56e9a 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/04/11 21:46:06 tv Exp $ +# $NetBSD: Makefile,v 1.47 2005/05/31 10:01:37 dillo Exp $ DISTNAME= magicpoint-1.10a PKGREVISION= 6 @@ -18,8 +18,8 @@ USE_IMAKE= yes USE_PERL5= build PKG_OPTIONS_VAR= PKG_OPTIONS.magicpoint -PKG_DEFAULT_OPTIONS+= xft2 -PKG_SUPPORTED_OPTIONS+= freetype vflib xft2 +PKG_SUPPORTED_OPTIONS= freetype vflib xft2 +PKG_SUGGESTED_OPTIONS= xft2 .include "../../mk/bsd.options.mk" diff --git a/graphics/tiff/options.mk b/graphics/tiff/options.mk index f56f430744a..67f09cfc3c7 100644 --- a/graphics/tiff/options.mk +++ b/graphics/tiff/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2005/03/23 01:17:45 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tiff PKG_SUPPORTED_OPTIONS= lzw -PKG_DEFAULT_OPTIONS= lzw +PKG_SUGGESTED_OPTIONS= lzw + .include "../../mk/bsd.options.mk" ### |