diff options
| author | dillo <dillo> | 2005-05-31 10:01:36 +0000 |
|---|---|---|
| committer | dillo <dillo> | 2005-05-31 10:01:36 +0000 |
| commit | 3d75323aa5391188ab027b2688faacf8286ace0c (patch) | |
| tree | 54f5cc64fe8b06d4695748b3d5b9967e8c030117 /x11 | |
| parent | 12f654f60a47071640b457d59c5edb54b8757615 (diff) | |
| download | pkgsrc-3d75323aa5391188ab027b2688faacf8286ace0c.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 'x11')
| -rw-r--r-- | x11/kdebase3/Makefile | 5 | ||||
| -rw-r--r-- | x11/xorg-server/options.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 38e0c2795ce..7eacd3bd8e5 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2005/05/22 22:06:28 jlam Exp $ +# $NetBSD: Makefile,v 1.81 2005/05/31 10:01:40 dillo Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 3 @@ -73,9 +73,10 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no PLIST_SRC+= ${PKGDIR}/PLIST -PKG_DEFAULT_OPTIONS+= sasl PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase PKG_SUPPORTED_OPTIONS= sasl samba +PKG_SUGGESTED_OPTIONS= sasl + .include "../../mk/bsd.options.mk" BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 diff --git a/x11/xorg-server/options.mk b/x11/xorg-server/options.mk index bfa3b0303f6..70e6d56ccac 100644 --- a/x11/xorg-server/options.mk +++ b/x11/xorg-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/03/22 14:01:20 adam Exp $ +# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:40 dillo Exp $ _COMMONCARDDRIVERS= apm ark ati chips cirrus cyrix dummy glint i128 mga \ neomagic nv rendition s3 s3virge savage siliconmotion \ @@ -22,7 +22,8 @@ _OSCARDDRIVERS+= ${_LINUXCARDDRIVERS} PKG_OPTIONS_VAR= PKG_OPTIONS.xorg-server PKG_SUPPORTED_OPTIONS= ${_COMMONCARDDRIVERS} ${_OSCARDDRIVERS} -PKG_DEFAULT_OPTIONS= ${PKG_SUPPORTED_OPTIONS} +PKG_SUGGESTED_OPTIONS= ${PKG_SUPPORTED_OPTIONS} + .include "../../mk/bsd.options.mk" .for _drv in ${PKG_OPTIONS} |