pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Packages have no business modifying PKG_DEFAULT_OPTION...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0104e0712a3a
branches: trunk
changeset: 494813:0104e0712a3a
user: dillo <dillo%pkgsrc.org@localhost>
date: Tue May 31 10:01:36 2005 +0000
description:
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:
audio/musicpd/options.mk | 4 ++--
chat/jabberd2/options.mk | 5 +++--
chat/silc-client/options.mk | 5 +++--
chat/silc-server/options.mk | 5 +++--
chat/xchat2/options.mk | 7 ++-----
databases/db4/options.mk | 7 ++-----
databases/openldap/options.mk | 4 ++--
devel/silc-toolkit/options.mk | 5 +++--
emulators/atari800/options.mk | 4 ++--
emulators/gxemul/Makefile | 10 ++++++----
emulators/vice/Makefile | 7 ++-----
games/scummvm/options.mk | 4 ++--
graphics/ImageMagick/options.mk | 4 ++--
graphics/dia/options.mk | 4 ++--
graphics/freetype2/Makefile | 7 +++----
graphics/magicpoint/Makefile | 6 +++---
graphics/tiff/options.mk | 5 +++--
lang/gauche/options.mk | 5 +++--
lang/gawk/Makefile | 7 ++-----
lang/php5/Makefile.php | 20 ++++++++------------
mail/clamav/Makefile | 10 +++-------
mail/cue/Makefile | 9 +++------
mail/cyrus-imapd21/Makefile | 12 ++++--------
mail/dbmail/options.mk | 6 +++---
mail/ezmlm/options.mk | 11 ++++++-----
mail/gld/options.mk | 4 ++--
mail/maildrop/Makefile | 6 +++---
mail/msmtp/options.mk | 4 ++--
mail/mutt-devel/options.mk | 7 ++-----
mail/mutt/options.mk | 7 ++-----
mail/p5-Mail-ClamAV/Makefile | 6 +++---
mail/qmail/options.mk | 11 ++++++-----
mail/qpopper/options.mk | 7 ++-----
mail/sendmail/options.mk | 7 ++-----
mail/ssmtp/options.mk | 4 ++--
mail/teapop/options.mk | 4 ++--
mail/turba/options.mk | 7 ++-----
math/octave-current/options.mk | 4 ++--
math/octave/options.mk | 4 ++--
misc/kdepim3/Makefile | 5 +++--
mk/defaults/obsolete.mk | 6 +++++-
multimedia/ffmpeg/Makefile | 6 +-----
net/arping/options.mk | 7 ++-----
net/djbdns/options.mk | 9 +++++----
net/flow-tools/Makefile | 14 ++++----------
net/libnids/options.mk | 7 ++-----
net/netbsd-tap/options.mk | 4 ++--
net/samba2/options.mk | 9 +++------
net/wget/options.mk | 15 ++++-----------
security/PAM/Makefile | 7 ++-----
security/amavisd-new/Makefile | 7 ++-----
security/courier-authlib/options.mk | 6 ++----
security/cy2-sql/Makefile | 7 ++-----
security/heimdal/Makefile | 8 +++-----
security/ipsec-tools/Makefile | 6 +++---
security/mit-krb5/Makefile | 8 +++-----
security/sudo/options.mk | 5 +++--
shells/bash/Makefile | 12 ++++--------
shells/bash2/Makefile | 13 ++++---------
sysutils/bacula/Makefile.options | 4 ++--
www/apache/Makefile | 12 ++++--------
www/horde3/options.mk | 6 ++----
www/lynx/options.mk | 5 +++--
www/p5-HTML-Mason/Makefile | 4 ++--
www/php4/Makefile.php | 8 ++------
www/screws/options.mk | 4 ++--
x11/kdebase3/Makefile | 5 +++--
x11/xorg-server/options.mk | 5 +++--
68 files changed, 193 insertions(+), 276 deletions(-)
diffs (truncated from 1332 to 300 lines):
diff -r 034cbbf848e0 -r 0104e0712a3a audio/musicpd/options.mk
--- a/audio/musicpd/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/audio/musicpd/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:24 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 ogg
-PKG_DEFAULT_OPTIONS+= aac audiofile flac iconv id3 ogg
+PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 ogg
.include "../../mk/bsd.options.mk"
diff -r 034cbbf848e0 -r 0104e0712a3a chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/chat/jabberd2/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2005/05/24 21:02:53 xtraeme Exp $
+# $NetBSD: options.mk,v 1.8 2005/05/31 10:01:36 dillo Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
PKG_SUPPORTED_OPTIONS= db mysql pgsql ldap PAM
-PKG_DEFAULT_OPTIONS= mysql
+PKG_SUGGESTED_OPTIONS= mysql
+
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql)
diff -r 034cbbf848e0 -r 0104e0712a3a chat/silc-client/options.mk
--- a/chat/silc-client/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/chat/silc-client/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:12:48 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.silc-client
PKG_SUPPORTED_OPTIONS= debug inet6 perl
-PKG_DEFAULT_OPTIONS= inet6 perl
+PKG_SUGGESTED_OPTIONS= inet6 perl
+
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
diff -r 034cbbf848e0 -r 0104e0712a3a chat/silc-server/options.mk
--- a/chat/silc-server/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/chat/silc-server/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:09:43 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.silc-server
PKG_SUPPORTED_OPTIONS= debug inet6
-PKG_DEFAULT_OPTIONS= inet6
+PKG_SUGGESTED_OPTIONS= inet6
+
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
diff -r 034cbbf848e0 -r 0104e0712a3a chat/xchat2/options.mk
--- a/chat/xchat2/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/chat/xchat2/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2005/01/10 20:59:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:36 dillo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xchat2
PKG_SUPPORTED_OPTIONS= inet6 ssl socks
-
-.if !defined(PKG_OPTIONS.xchat2)
-PKG_DEFAULT_OPTIONS+= ssl
-.endif
+PKG_SUGGESTED_OPTIONS= ssl
.include "../../mk/bsd.options.mk"
diff -r 034cbbf848e0 -r 0104e0712a3a databases/db4/options.mk
--- a/databases/db4/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/databases/db4/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2004/12/27 04:27:49 jlam Exp $
-
-.if defined(WITH_JAVA) && !empty(WITH_JAVA:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= java
-.endif
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.db4
PKG_SUPPORTED_OPTIONS= java
+PKG_OPTIONS_LEGACY_VARS+= WITH_JAVA:java
.include "../../mk/bsd.options.mk"
diff -r 034cbbf848e0 -r 0104e0712a3a databases/openldap/options.mk
--- a/databases/openldap/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/databases/openldap/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2005/02/09 15:38:03 cube Exp $
+# $NetBSD: options.mk,v 1.12 2005/05/31 10:01:36 dillo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap
PKG_SUPPORTED_OPTIONS= bdb dynamic kerberos sasl slp
-PKG_DEFAULT_OPTIONS+= bdb
+PKG_SUGGESTED_OPTIONS= bdb
.include "../../mk/bsd.options.mk"
diff -r 034cbbf848e0 -r 0104e0712a3a devel/silc-toolkit/options.mk
--- a/devel/silc-toolkit/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/devel/silc-toolkit/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:45:24 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.silc-toolkit
PKG_SUPPORTED_OPTIONS= debug inet6
-PKG_DEFAULT_OPTIONS= inet6
+PKG_SUGGESTED_OPTIONS= inet6
+
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
diff -r 034cbbf848e0 -r 0104e0712a3a emulators/atari800/options.mk
--- a/emulators/atari800/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/emulators/atari800/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/05/17 15:08:57 adam Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.atari800
-PKG_DEFAULT_OPTIONS= sdl
PKG_SUPPORTED_OPTIONS= sdl x11
+PKG_SUGGESTED_OPTIONS= sdl
.include "../../mk/bsd.options.mk"
diff -r 034cbbf848e0 -r 0104e0712a3a emulators/gxemul/Makefile
--- a/emulators/gxemul/Makefile Tue May 31 09:21:51 2005 +0000
+++ b/emulators/gxemul/Makefile Tue May 31 10:01:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/29 00:59:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/31 10:01:36 dillo Exp $
#
DISTNAME= gxemul-0.3.2
@@ -27,11 +27,13 @@
${INSTALL_DATA} ${WRKSRC}/doc/*.c ${PREFIX}/share/doc/${PKGBASE}
PKG_OPTIONS_VAR= PKG_OPTIONS.gxemul
-PKG_SUPPORTED_OPTIONS= X11
-PKG_DEFAULT_OPTIONS?= X11
+# X11 for legacy purposes. can be removed after 2005Q2
+PKG_SUPPORTED_OPTIONS= X11 x11
+PKG_SUGGESTED_OPTIONS= x11
+
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:MX11)
+.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:MX11)
USE_X11= yes
GLOBAL_LDFLAGS= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
SUBST_CLASSES= x11
diff -r 034cbbf848e0 -r 0104e0712a3a emulators/vice/Makefile
--- a/emulators/vice/Makefile Tue May 31 09:21:51 2005 +0000
+++ b/emulators/vice/Makefile Tue May 31 10:01:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2005/05/31 10:01:36 dillo Exp $
#
DISTNAME= vice-1.16
@@ -31,12 +31,9 @@
.include "../../mk/bsd.prefs.mk"
-.if !empty(VICE_USE_FFMPEG:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= ffmpeg
-.endif
-
PKG_OPTIONS_VAR= PKG_OPTIONS.vice
PKG_SUPPORTED_OPTIONS= esound ffmpeg gnome
+PKG_OPTIONS_LEGACY_VARS+=VICE_USE_FFMPEG:ffmpeg
.include "../../mk/bsd.options.mk"
diff -r 034cbbf848e0 -r 0104e0712a3a games/scummvm/options.mk
--- a/games/scummvm/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/games/scummvm/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/03/31 09:52:26 adam Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.scummvm
-PKG_DEFAULT_OPTIONS= sdl
PKG_SUPPORTED_OPTIONS= sdl x11
+PKG_SUGGESTED_OPTIONS= sdl
.include "../../mk/bsd.options.mk"
diff -r 034cbbf848e0 -r 0104e0712a3a graphics/ImageMagick/options.mk
--- a/graphics/ImageMagick/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/graphics/ImageMagick/options.mk Tue May 31 10:01:36 2005 +0000
@@ -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 -r 034cbbf848e0 -r 0104e0712a3a graphics/dia/options.mk
--- a/graphics/dia/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/graphics/dia/options.mk Tue May 31 10:01:36 2005 +0000
@@ -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 -r 034cbbf848e0 -r 0104e0712a3a graphics/freetype2/Makefile
--- a/graphics/freetype2/Makefile Tue May 31 09:21:51 2005 +0000
+++ b/graphics/freetype2/Makefile Tue May 31 10:01:36 2005 +0000
@@ -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 @@
.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 -r 034cbbf848e0 -r 0104e0712a3a graphics/magicpoint/Makefile
--- a/graphics/magicpoint/Makefile Tue May 31 09:21:51 2005 +0000
+++ b/graphics/magicpoint/Makefile Tue May 31 10:01:36 2005 +0000
@@ -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_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 -r 034cbbf848e0 -r 0104e0712a3a graphics/tiff/options.mk
--- a/graphics/tiff/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/graphics/tiff/options.mk Tue May 31 10:01:36 2005 +0000
@@ -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"
###
diff -r 034cbbf848e0 -r 0104e0712a3a lang/gauche/options.mk
--- a/lang/gauche/options.mk Tue May 31 09:21:51 2005 +0000
+++ b/lang/gauche/options.mk Tue May 31 10:01:36 2005 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2005/03/07 03:16:46 uebayasi Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gauche
PKG_SUPPORTED_OPTIONS= gdbm multibyte
-PKG_DEFAULT_OPTIONS+= gdbm multibyte
Home |
Main Index |
Thread Index |
Old Index