pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Convert to use bsd.options.mk. The relevant options v...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0b19b7ff6ad
branches:  trunk
changeset: 478825:e0b19b7ff6ad
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 30 21:05:41 2004 +0000

description:
Convert to use bsd.options.mk.  The relevant options variable to set
for each package can be determined by invoking:

        make show-var VARNAME=PKG_OPTIONS_VAR

The old options are still supported unless the variable named in
PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf).

diffstat:

 databases/openldap/Makefile               |    6 +-
 databases/openldap/Makefile.options       |   55 +++++-------
 databases/openldap/buildlink3.mk          |   16 ++-
 mail/cyrus-imapd22/Makefile               |   34 ++++++-
 mail/fetchmail/Makefile                   |   55 ++++++++----
 mail/mutt-devel/Makefile.options          |   45 +++------
 mail/postfix/Makefile                     |   12 +-
 mail/postfix/Makefile.options             |   85 +++++++++++++-----
 mk/bsd.pkg.obsolete.mk                    |  114 ++++++++++++++++---------
 net/samba/Makefile                        |   55 +------------
 net/samba/Makefile.options                |   96 ++++++++++++++++++++++
 net/samba/PLIST                           |   10 ++-
 net/samba/PLIST.pam                       |    9 --
 print/cups/Makefile                       |   23 +++-
 print/cups/PLIST                          |    3 +-
 print/cups/PLIST.pam                      |    2 -
 security/PAM/Makefile                     |   20 +++-
 security/cyrus-sasl/Makefile              |   50 ++++++++---
 security/cyrus-sasl/PLIST                 |   80 ++++++++++++++++++
 security/cyrus-sasl/PLIST.common          |   56 -------------
 security/cyrus-sasl/PLIST.krb5            |    6 -
 security/cyrus-sasl/PLIST.plugins         |   21 ----
 security/cyrus-sasl/buildlink3.mk         |    6 +-
 security/cyrus-sasl2/Makefile             |   21 +----
 security/cyrus-sasl2/Makefile.options     |   40 +++++++++
 security/cyrus-sasl2/PLIST                |  129 ++++++++++++++++++++++++++++++
 security/cyrus-sasl2/PLIST.common         |  101 -----------------------
 security/cyrus-sasl2/PLIST.krb5           |    5 -
 security/cyrus-sasl2/PLIST.plugins        |   25 -----
 security/cyrus-saslauthd/Makefile         |   35 +-------
 security/cyrus-saslauthd/Makefile.options |   68 +++++++++++++++
 security/cyrus-saslauthd/PLIST            |    4 +-
 security/cyrus-saslauthd/PLIST.ldap       |    3 -
 security/heimdal/Makefile                 |   33 +++++--
 security/mit-krb5/Makefile                |   18 +++-
 security/openssl/Makefile                 |   17 +++-
 security/sudo/Makefile                    |   15 +++-
 www/apache/Makefile                       |   22 ++++-
 www/lynx/Makefile                         |   59 +------------
 www/lynx/Makefile.options                 |   77 +++++++++++++++++
 www/php4/Makefile.php                     |   23 ++++-
 41 files changed, 949 insertions(+), 605 deletions(-)

diffs (truncated from 2274 to 300 lines):

diff -r 696728d3da1d -r e0b19b7ff6ad databases/openldap/Makefile
--- a/databases/openldap/Makefile       Fri Jul 30 20:59:08 2004 +0000
+++ b/databases/openldap/Makefile       Fri Jul 30 21:05:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2004/07/24 03:32:24 jlam Exp $
+# $NetBSD: Makefile,v 1.80 2004/07/30 21:05:41 jlam Exp $
 
 DISTNAME=              openldap-2.2.13
 SVR4_PKGNAME=          oldap
@@ -36,7 +36,7 @@
 
 # SLAPD options
 CONFIGURE_ARGS+=       --enable-crypt
-.if !empty(_OPENLDAP_OPTIONS:Msasl)
+.if !empty(PKG_OPTIONS:Msasl)
 CONFIGURE_ARGS+=       --enable-spasswd
 .endif
 CONFIGURE_ARGS+=       --enable-wrappers
@@ -44,7 +44,7 @@
 SLAPD_BACKEND_MODULES= bdb:static dnnsrv hdb ldap ldbm meta            \
                        monitor:static null passwd shell
 .for _mod_ in ${SLAPD_BACKEND_MODULES}
-.  if !empty(_OPENLDAP_OPTIONS:Mdynamic)
+.  if !empty(PKG_OPTIONS:Mdynamic)
 CONFIGURE_ARGS+=       --enable-${_mod_:C/\:.*//}${_mod_:N*\:static:C/.*/=mod/}
 .  else
 CONFIGURE_ARGS+=       --enable-${_mod_:C/\:.*//}
diff -r 696728d3da1d -r e0b19b7ff6ad databases/openldap/Makefile.options
--- a/databases/openldap/Makefile.options       Fri Jul 30 20:59:08 2004 +0000
+++ b/databases/openldap/Makefile.options       Fri Jul 30 21:05:41 2004 +0000
@@ -1,45 +1,29 @@
-# $NetBSD: Makefile.options,v 1.4 2004/07/24 18:37:10 jlam Exp $
-#
-# OPENLDAP_ALL_OPTIONS lists all of the currently-supported optional modules
-# that *may* be built.
-#
-# OPENLDAP_OPTIONS is a list of the modules that *will* be built.
-#
-OPENLDAP_ALL_OPTIONS=  dynamic sasl slp
+# $NetBSD: Makefile.options,v 1.5 2004/07/30 21:05:41 jlam Exp $
 
-.if defined(USE_SASL) || defined(USE_SASL2) || defined(KERBEROS)
-.  if !defined(OPENLDAP_OPTIONS)
-.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-OPENLDAP_OPTIONS+=     sasl
+# Global and legacy options
+.if defined(KERBEROS) || defined(USE_SASL) || defined(USE_SASL2)
+.  if !defined(PKG_OPTIONS.openldap)
+.    if defined(KERBEROS)
+PKG_OPTIONS.openldap+= kerberos
 .    endif
 .    if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-OPENLDAP_OPTIONS+=     sasl
+PKG_OPTIONS.openldap+= sasl
 .    endif
-.    if defined(KERBEROS)
-OPENLDAP_OPTIONS+=     sasl
+.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+PKG_OPTIONS.openldap+= sasl
 .    endif
 .  endif
 .endif
 
-OPENLDAP_OPTIONS?=     # empty
-BUILD_DEFS+=           OPENLDAP_OPTIONS
-
-_OPENLDAP_OPTIONS=             # empty
-.for _opt_ in ${OPENLDAP_OPTIONS}
-.  if empty(_OPENLDAP_OPTIONS:M${_opt_})
-.    if !empty(OPENLDAP_ALL_OPTIONS:M${_opt_})
-_OPENLDAP_OPTIONS+=            ${_opt_}
-.    else
-PKG_FAIL_REASON+=      "\"${_opt_}\" is not a supported Mutt build option."
-.    endif
-.  endif
-.endfor
+PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap
+PKG_SUPPORTED_OPTIONS= dynamic kerberos sasl slp
+.include "../../mk/bsd.options.mk"
 
 ###
 ### Whether to build with dynamically-loadable backend modules.  If not
 ### specified, then link the backend modules statically into slapd.
 ###
-.if !empty(_OPENLDAP_OPTIONS:Mdynamic)
+.if !empty(PKG_OPTIONS:Mdynamic)
 CONFIGURE_ARGS+=       --enable-modules
 PLIST_SUBST+=          DYNAMIC_MOD=
 .else
@@ -47,9 +31,18 @@
 .endif
 
 ###
+### Kerberos authentication is via SASL.
+###
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  if empty(PKG_OPTIONS:Msasl)
+PKG_OPTIONS+=          sasl
+.  endif
+.endif
+
+###
 ### SASL authentication
 ###
-.if !empty(_OPENLDAP_OPTIONS:Msasl)
+.if !empty(PKG_OPTIONS:Msasl)
 .  if !defined(USE_SASL2) && !defined(USE_SASL)
 .    include "../../security/cyrus-sasl2/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-cyrus-sasl
@@ -65,7 +58,7 @@
 ###
 ### SLP (Service Locator Protocol)
 ###
-.if !empty(_OPENLDAP_OPTIONS:Mslp)
+.if !empty(PKG_OPTIONS:Mslp)
 .  include "../../net/openslp/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-slp
 .endif
diff -r 696728d3da1d -r e0b19b7ff6ad databases/openldap/buildlink3.mk
--- a/databases/openldap/buildlink3.mk  Fri Jul 30 20:59:08 2004 +0000
+++ b/databases/openldap/buildlink3.mk  Fri Jul 30 21:05:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/07/24 17:24:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/07/30 21:05:41 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=       ${OPENLDAP_BUILDLINK3_MK}+
@@ -18,10 +18,16 @@
 BUILDLINK_PKGSRCDIR.openldap?=         ../../databases/openldap
 .endif # OPENLDAP_BUILDLINK3_MK
 
-.if defined(USE_SASL2) && (${USE_SASL2} == "YES")
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
-.elif defined(USE_SASL) && (${USE_SASL} == "YES")
-.  include "../../security/cyrus-sasl/buildlink3.mk"
+PKG_OPTIONS.openldap?= ${PKG_DEFAULT_OPTIONS}
+
+.if !empty(PKG_OPTIONS.openldap:Msasl)
+.  if !defined(USE_SASL2) && !defined(USE_SASL)
+.    include "../../security/cyrus-sasl2/buildlink3.mk"
+.  elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+.    include "../../security/cyrus-sasl2/buildlink3.mk"
+.  elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
+.    include "../../security/cyrus-sasl/buildlink3.mk"
+.  endif
 .endif
 .include "../../security/openssl/buildlink3.mk"
 
diff -r 696728d3da1d -r e0b19b7ff6ad mail/cyrus-imapd22/Makefile
--- a/mail/cyrus-imapd22/Makefile       Fri Jul 30 20:59:08 2004 +0000
+++ b/mail/cyrus-imapd22/Makefile       Fri Jul 30 21:05:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/07/29 20:04:02 recht Exp $
+# $NetBSD: Makefile,v 1.18 2004/07/30 21:05:41 jlam Exp $
 
 DISTNAME=      cyrus-imapd-2.2.8
 CATEGORIES=    mail
@@ -49,12 +49,35 @@
 CONFIGURE_ARGS+=       --without-ucdsnmp
 
 .if defined(KERBEROS)
-.  if (${KERBEROS} == 4) && exists(/usr/include/kerberosIV/krb.h)
-PKG_USE_KERBEROS=      yes
+.  if !defined(PKG_OPTIONS.cyrus-imapd)
+.    if defined(KERBEROS)
+.      if ${KERBEROS} == "4"
+PKG_OPTIONS.cyrus-imapd+=      kerberos4
+.      else
+PKG_OPTIONS.cyrus-imapd+=      kerberos
+.      endif
+.    endif
+.  endif
+.endif
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.cyrus-imapd
+PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  if empty(PKG_OPTIONS:Mgssapi)
+PKG_OPTIONS+=  gssapi
+.  endif
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos4)
+.  if exists(/usr/include/kerberosIV/krb.h)
+CRYPTO+=               uses Kerberos encryption code
 CONFIGURE_ARGS+=       --with-auth=krb
 CONFIGURE_ARGS+=       --with-krb=/usr
-.  else
-.    include "../../mk/krb5.buildlink3.mk"
+.  endif
+.elif !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-auth=krb5
 CONFIGURE_ARGS+=       --enable-gssapi=${KRB5BASE}
 CONFIGURE_ARGS+=       --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
@@ -62,7 +85,6 @@
 GSSIMPL.mit-krb5=      mit
 CONFIGURE_ENV+=                COMPILE_ET=${KRB5BASE}/bin/compile_et
 COMERRBASE=            ${KRB5BASE}
-.  endif
 .else
 CONFIGURE_ARGS+=       --with-auth=unix
 CONFIGURE_ARGS+=       --without-krb
diff -r 696728d3da1d -r e0b19b7ff6ad mail/fetchmail/Makefile
--- a/mail/fetchmail/Makefile   Fri Jul 30 20:59:08 2004 +0000
+++ b/mail/fetchmail/Makefile   Fri Jul 30 21:05:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2004/07/22 17:04:28 drochner Exp $
+# $NetBSD: Makefile,v 1.145 2004/07/30 21:05:41 jlam Exp $
 
 DISTNAME=      fetchmail-6.2.5
 PKGREVISION=   2
@@ -26,33 +26,51 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-FETCHMAIL_USE_SSL?=    yes
-BUILD_DEFS+=           FETCHMAIL_USE_SSL
+# Global and legacy options
+.if defined(KERBEROS) && defined(USE_INET6) || defined(FETCHMAIL_USE_SSL)
+.  if !defined(PKG_OPTIONS.fetchmail)
+.    if defined(KERBEROS)
+PKG_OPTIONS.fetchmail+=        kerberos4
+.    endif
+.    if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
+PKG_OPTIONS.fetchmail+=        inet6
+.    endif
+.    if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS])
+PKG_OPTIONS.fetchmail+=        ssl
+.    endif
+.  endif
+.endif
 
-.if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS])
+PKG_OPTIONS_VAR=       PKG_OPTIONS.fetchmail
+PKG_SUPPORTED_OPTIONS= inet6 kerberos4 ssl
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-inet6
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos4)
+CRYPTO+=               uses Kerberos encryption code
+CONFIGURE_ARGS+=       --with-kerberos=yes
+.  if empty(MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386)
+REPLACE_KERBEROS_LIBS= # defined
+.  endif
+.else
+CONFIGURE_ARGS+=       --with-kerberos=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-ssl=${SSLBASE}
 .else
 CONFIGURE_ARGS+=       --without-ssl
 .endif
 
-.if defined(KERBEROS)
-PKG_USE_KERBEROS=      yes
-CONFIGURE_ARGS+=       --with-kerberos=yes
-.  if ${MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386} == ""
-REPLACE_KERBEROS_LIBS= # defined
-.  endif
-.else
-CONFIGURE_ARGS+=       --with-kerberos=no
-.endif
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-CONFIGURE_ARGS+=       --enable-inet6
-.endif
-
 DOCDIR=                ${PREFIX}/share/doc/fetchmail
 RCD_SCRIPTS=   fetchmail
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+
 post-extract:
        @${RM} -f ${WRKSRC}/intl/libintl.h
 .if ${OPSYS} == "NetBSD"
@@ -86,5 +104,4 @@
                ${INSTALL_DATA} $$file ${DOCDIR};                       \
        done
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 696728d3da1d -r e0b19b7ff6ad mail/mutt-devel/Makefile.options
--- a/mail/mutt-devel/Makefile.options  Fri Jul 30 20:59:08 2004 +0000
+++ b/mail/mutt-devel/Makefile.options  Fri Jul 30 21:05:41 2004 +0000
@@ -1,52 +1,37 @@
-# $NetBSD: Makefile.options,v 1.2 2004/07/23 15:00:12 jlam Exp $
-#
-# MUTT_ALL_OPTIONS lists all of the currently-supported optional modules
-# that may be built into Mutt.
-#
-# MUTT_OPTIONS is a list of the modules that will be built into Mutt.
-#



Home | Main Index | Thread Index | Old Index