From b32b7ebe7e284f58e8635685f7b2406464dff9ad Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 5 Aug 2004 03:04:33 +0000 Subject: Rename Makefile.options to options.mk in the packages that I maintain. This follows the example of the mail/dovecot package, as suggested by . --- databases/openldap/Makefile | 4 +- databases/openldap/Makefile.options | 65 ----------- databases/openldap/options.mk | 65 +++++++++++ mail/mutt-devel/Makefile | 4 +- mail/mutt-devel/Makefile.options | 57 ---------- mail/mutt-devel/options.mk | 57 ++++++++++ mail/postfix-current/Makefile | 8 +- mail/postfix-current/Makefile.options | 175 ------------------------------ mail/postfix-current/options.mk | 175 ++++++++++++++++++++++++++++++ mail/postfix/Makefile | 8 +- mail/postfix/Makefile.options | 174 ----------------------------- mail/postfix/options.mk | 174 +++++++++++++++++++++++++++++ net/samba/Makefile | 4 +- net/samba/Makefile.options | 96 ---------------- net/samba/options.mk | 96 ++++++++++++++++ security/cyrus-sasl2/Makefile | 4 +- security/cyrus-sasl2/Makefile.options | 40 ------- security/cyrus-sasl2/options.mk | 40 +++++++ security/cyrus-saslauthd/Makefile | 4 +- security/cyrus-saslauthd/Makefile.options | 65 ----------- security/cyrus-saslauthd/options.mk | 65 +++++++++++ www/lynx/Makefile | 4 +- www/lynx/Makefile.options | 77 ------------- www/lynx/options.mk | 77 +++++++++++++ 24 files changed, 769 insertions(+), 769 deletions(-) delete mode 100644 databases/openldap/Makefile.options create mode 100644 databases/openldap/options.mk delete mode 100644 mail/mutt-devel/Makefile.options create mode 100644 mail/mutt-devel/options.mk delete mode 100644 mail/postfix-current/Makefile.options create mode 100644 mail/postfix-current/options.mk delete mode 100644 mail/postfix/Makefile.options create mode 100644 mail/postfix/options.mk delete mode 100644 net/samba/Makefile.options create mode 100644 net/samba/options.mk delete mode 100644 security/cyrus-sasl2/Makefile.options create mode 100644 security/cyrus-sasl2/options.mk delete mode 100644 security/cyrus-saslauthd/Makefile.options create mode 100644 security/cyrus-saslauthd/options.mk delete mode 100644 www/lynx/Makefile.options create mode 100644 www/lynx/options.mk diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 6b9d9ad14b5..99e3c89df90 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2004/08/04 19:45:02 jlam Exp $ +# $NetBSD: Makefile,v 1.82 2004/08/05 03:04:33 jlam Exp $ DISTNAME= openldap-2.2.13 SVR4_PKGNAME= oldap @@ -26,7 +26,7 @@ OPENLDAP_VARDIR= ${VARBASE}/openldap FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR} .include "../../mk/bsd.prefs.mk" -.include "Makefile.options" +.include "options.mk" CPPFLAGS.Darwin+= -DBIND_8_COMPAT diff --git a/databases/openldap/Makefile.options b/databases/openldap/Makefile.options deleted file mode 100644 index ae6ad9fcb18..00000000000 --- a/databases/openldap/Makefile.options +++ /dev/null @@ -1,65 +0,0 @@ -# $NetBSD: Makefile.options,v 1.6 2004/08/04 19:45:02 jlam Exp $ - -# 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]) -PKG_OPTIONS.openldap+= sasl -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.openldap+= sasl -. endif -. endif -.endif - -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(PKG_OPTIONS:Mdynamic) -. include "../../devel/libtool/buildlink3.mk" -CONFIGURE_ARGS+= --enable-modules -PLIST_SUBST+= DYNAMIC_MOD= -.else -PLIST_SUBST+= DYNAMIC_MOD="@comment " -.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(PKG_OPTIONS:Msasl) -. if !defined(USE_SASL2) && !defined(USE_SASL) -. include "../../security/cyrus-sasl2/buildlink3.mk" -CONFIGURE_ARGS+= --with-cyrus-sasl -. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -. include "../../security/cyrus-sasl2/buildlink3.mk" -CONFIGURE_ARGS+= --with-cyrus-sasl -. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -. include "../../security/cyrus-sasl/buildlink3.mk" -CONFIGURE_ARGS+= --with-cyrus-sasl -. endif -.endif - -### -### SLP (Service Locator Protocol) -### -.if !empty(PKG_OPTIONS:Mslp) -. include "../../net/openslp/buildlink3.mk" -CONFIGURE_ARGS+= --enable-slp -.endif diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk new file mode 100644 index 00000000000..79e87470e15 --- /dev/null +++ b/databases/openldap/options.mk @@ -0,0 +1,65 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $ + +# 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]) +PKG_OPTIONS.openldap+= sasl +. endif +. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +PKG_OPTIONS.openldap+= sasl +. endif +. endif +.endif + +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(PKG_OPTIONS:Mdynamic) +. include "../../devel/libtool/buildlink3.mk" +CONFIGURE_ARGS+= --enable-modules +PLIST_SUBST+= DYNAMIC_MOD= +.else +PLIST_SUBST+= DYNAMIC_MOD="@comment " +.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(PKG_OPTIONS:Msasl) +. if !defined(USE_SASL2) && !defined(USE_SASL) +. include "../../security/cyrus-sasl2/buildlink3.mk" +CONFIGURE_ARGS+= --with-cyrus-sasl +. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +. include "../../security/cyrus-sasl2/buildlink3.mk" +CONFIGURE_ARGS+= --with-cyrus-sasl +. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) +. include "../../security/cyrus-sasl/buildlink3.mk" +CONFIGURE_ARGS+= --with-cyrus-sasl +. endif +.endif + +### +### SLP (Service Locator Protocol) +### +.if !empty(PKG_OPTIONS:Mslp) +. include "../../net/openslp/buildlink3.mk" +CONFIGURE_ARGS+= --enable-slp +.endif diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 44fc7e12d1c..b8d452dc539 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/07/23 15:00:12 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2004/08/05 03:04:33 jlam Exp $ DISTNAME= mutt-1.5.6i PKGNAME= ${DISTNAME:C/i$//} @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --without-wc-funcs CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh .endif -.include "Makefile.options" +.include "options.mk" LDFLAGS+= ${_STRIPFLAG_CC} diff --git a/mail/mutt-devel/Makefile.options b/mail/mutt-devel/Makefile.options deleted file mode 100644 index a5aaf20748e..00000000000 --- a/mail/mutt-devel/Makefile.options +++ /dev/null @@ -1,57 +0,0 @@ -# $NetBSD: Makefile.options,v 1.4 2004/08/03 11:28:31 sketch Exp $ - -# Global and legacy options -.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \ - defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL) -. if !defined(PKG_OPTIONS.mutt) -. if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= slang -. endif -. if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ncurses -. endif -. if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ssl -. endif -. if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= sasl -. endif -. endif -.endif -PKG_OPTIONS.mutt?= ssl - -PKG_OPTIONS_VAR= PKG_OPTIONS.mutt -PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl -.include "../../mk/bsd.options.mk" - -### -### Slang and ncurses -### -.if !empty(PKG_OPTIONS:Mslang) -. include "../../devel/libslang/buildlink3.mk" -CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} -.else -. if !empty(PKG_OPTIONS:Mncurses) -USE_NCURSES= yes -. endif -. include "../../devel/ncurses/buildlink3.mk" -CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} -.endif - -### -### SASLv2 -### -.if !empty(PKG_OPTIONS:Msasl) -. include "../../security/cyrus-sasl2/buildlink3.mk" -CONFIGURE_ARGS+= --with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl} -.endif - -### -### SSL -### -.if !empty(PKG_OPTIONS:Mssl) -. include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} -.else -CONFIGURE_ARGS+= --without-ssl -.endif diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk new file mode 100644 index 00000000000..c5e29fb941a --- /dev/null +++ b/mail/mutt-devel/options.mk @@ -0,0 +1,57 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $ + +# Global and legacy options +.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \ + defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL) +. if !defined(PKG_OPTIONS.mutt) +. if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) +PKG_OPTIONS.mutt+= slang +. endif +. if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) +PKG_OPTIONS.mutt+= ncurses +. endif +. if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) +PKG_OPTIONS.mutt+= ssl +. endif +. if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) +PKG_OPTIONS.mutt+= sasl +. endif +. endif +.endif +PKG_OPTIONS.mutt?= ssl + +PKG_OPTIONS_VAR= PKG_OPTIONS.mutt +PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl +.include "../../mk/bsd.options.mk" + +### +### Slang and ncurses +### +.if !empty(PKG_OPTIONS:Mslang) +. include "../../devel/libslang/buildlink3.mk" +CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} +.else +. if !empty(PKG_OPTIONS:Mncurses) +USE_NCURSES= yes +. endif +. include "../../devel/ncurses/buildlink3.mk" +CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} +.endif + +### +### SASLv2 +### +.if !empty(PKG_OPTIONS:Msasl) +. include "../../security/cyrus-sasl2/buildlink3.mk" +CONFIGURE_ARGS+= --with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl} +.endif + +### +### SSL +### +.if !empty(PKG_OPTIONS:Mssl) +. include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +.else +CONFIGURE_ARGS+= --without-ssl +.endif diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 5ee02d0e406..6529e660da0 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/07/31 05:53:44 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2004/08/05 03:04:33 jlam Exp $ DISTNAME= postfix-2.2-20040628 CATEGORIES= mail @@ -38,10 +38,10 @@ CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\" CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\" CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\" -# Makefile.options appends to CCARGS and AUXLIBS the options needed to -# build Postfix with support for various add-on modules. +# options.mk appends to CCARGS and AUXLIBS the options needed to build +# Postfix with support for various add-on modules. # -.include "Makefile.options" +.include "options.mk" PKG_SYSCONFSUBDIR= postfix LIBEXECDIR= ${PREFIX}/libexec/postfix diff --git a/mail/postfix-current/Makefile.options b/mail/postfix-current/Makefile.options deleted file mode 100644 index 9aa9dd41971..00000000000 --- a/mail/postfix-current/Makefile.options +++ /dev/null @@ -1,175 +0,0 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/31 05:53:44 jlam Exp $ - -# Global and legacy options -# -# XXX Support for the following variables will be removed after the -# XXX pkgsrc-2004Q3 branch is released: -# XXX -# XXX POSTFIX_USE_INET6 POSTFIX_USE_TLS -# XXX POSTFIX_USE_PCRE POSTFIX_USE_MYSQL -# XXX POSTFIX_USE_PGSQL POSTFIX_OPTIONS -# XXX POSTFIX_USE_SASL_AUTH -# -.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \ - defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ - defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ - defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \ - defined(POSTFIX_OPTIONS) -. if !defined(PKG_OPTIONS.postfix) -. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= ldap -. endif -. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= inet6 -. endif -. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= tls -. endif -. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pcre -. endif -. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= mysql -. endif -. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pgsql -. endif -. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(POSTFIX_OPTIONS) -PKG_OPTIONS.postfix= ${POSTFIX_OPTIONS} -. endif -. endif -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.postfix -#PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls -PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl -.include "../../mk/bsd.options.mk" - -# ### -# ### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/) -# ### -# .if !empty(PKG_OPTIONS:Minet6) || !empty(PKG_OPTIONS:Mtls) -# . include "../../security/openssl/buildlink3.mk" -# PATCHFILES+= tls+ipv6-1.25-pf-2.2-20040616.patch.gz -# PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/ -# PATCH_DIST_STRIP= -p1 -# -# CCARGS+= -DHAS_SSL -# AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \ -# -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \ -# -lssl -lcrypto -# -# PLIST_SRC+= ${PKGDIR}/PLIST.tls -# MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls -# .endif - -### -### Support "pcre" map type for regular expressions. -### -.if !empty(PKG_OPTIONS:Mpcre) -. include "../../devel/pcre/buildlink3.mk" -CCARGS+= -DHAS_PCRE -AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \ - -lpcre -.else -CCARGS+= -DNO_PCRE -.endif - -### -### Support LDAP directories for table lookups. -### -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" -CCARGS+= -DHAS_LDAP -AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \ - -lldap -llber -. if ${OPSYS} != "Linux" -. include "../../databases/db4/buildlink3.mk" -CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 -AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \ - -ldb4 -. endif -.endif - -### -### Support using a MySQL database server for table lookups. -### -.if !empty(PKG_OPTIONS:Mmysql4) -. include "../../databases/mysql4-client/buildlink3.mk" -CCARGS+= -DHAS_MYSQL -CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include` -AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs` -.elif !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql-client/buildlink3.mk" -CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql -AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ - -lmysqlclient -lz -lm -.endif - -### -### Support using a PostgreSQL database server for table lookups. -### -.if !empty(PKG_OPTIONS:Mpgsql) -. include "../../mk/pgsql.buildlink3.mk" -. include "../../security/openssl/buildlink3.mk" -CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql -AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ - -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt -lssl -lcrypto -.endif - -### -### SASL support for SMTP authentication. If neither SASLv1 or SASLv2 is -### explicitly specified, then build with SASLv2. -### -.if !empty(PKG_OPTIONS:Msasl) -. if !defined(USE_SASL2) && !defined(USE_SASL) -. include "../../security/cyrus-sasl2/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl2 -PWCHECK_METHOD= auxprop -CCARGS+= -DUSE_SASL2_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl2 -. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -. include "../../security/cyrus-sasl2/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl2 -PWCHECK_METHOD= auxprop -CCARGS+= -DUSE_SASL2_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl2 -. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -. include "../../security/cyrus-sasl/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl -PWCHECK_METHOD= sasldb -CCARGS+= -DUSE_SASL_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl -. endif -PLIST_SRC+= ${PKGDIR}/PLIST.sasl -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl -MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} -MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} -.endif - -.if ${OPSYS} == "Linux" -. include "../../databases/db/buildlink3.mk" -CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2 -AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \ - -ldb2 -.endif diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk new file mode 100644 index 00000000000..0b6e83b84d1 --- /dev/null +++ b/mail/postfix-current/options.mk @@ -0,0 +1,175 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $ + +# Global and legacy options +# +# XXX Support for the following variables will be removed after the +# XXX pkgsrc-2004Q3 branch is released: +# XXX +# XXX POSTFIX_USE_INET6 POSTFIX_USE_TLS +# XXX POSTFIX_USE_PCRE POSTFIX_USE_MYSQL +# XXX POSTFIX_USE_PGSQL POSTFIX_OPTIONS +# XXX POSTFIX_USE_SASL_AUTH +# +.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \ + defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ + defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ + defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \ + defined(POSTFIX_OPTIONS) +. if !defined(PKG_OPTIONS.postfix) +. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= sasl +. endif +. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= sasl +. endif +. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= ldap +. endif +. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= inet6 +. endif +. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= tls +. endif +. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= pcre +. endif +. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= mysql +. endif +. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= pgsql +. endif +. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) +PKG_OPTIONS.postfix+= sasl +. endif +. if defined(POSTFIX_OPTIONS) +PKG_OPTIONS.postfix= ${POSTFIX_OPTIONS} +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.postfix +#PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls +PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl +.include "../../mk/bsd.options.mk" + +# ### +# ### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/) +# ### +# .if !empty(PKG_OPTIONS:Minet6) || !empty(PKG_OPTIONS:Mtls) +# . include "../../security/openssl/buildlink3.mk" +# PATCHFILES+= tls+ipv6-1.25-pf-2.2-20040616.patch.gz +# PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/ +# PATCH_DIST_STRIP= -p1 +# +# CCARGS+= -DHAS_SSL +# AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \ +# -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \ +# -lssl -lcrypto +# +# PLIST_SRC+= ${PKGDIR}/PLIST.tls +# MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls +# .endif + +### +### Support "pcre" map type for regular expressions. +### +.if !empty(PKG_OPTIONS:Mpcre) +. include "../../devel/pcre/buildlink3.mk" +CCARGS+= -DHAS_PCRE +AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \ + -lpcre +.else +CCARGS+= -DNO_PCRE +.endif + +### +### Support LDAP directories for table lookups. +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap/buildlink3.mk" +CCARGS+= -DHAS_LDAP +AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \ + -lldap -llber +. if ${OPSYS} != "Linux" +. include "../../databases/db4/buildlink3.mk" +CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 +AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \ + -ldb4 +. endif +.endif + +### +### Support using a MySQL database server for table lookups. +### +.if !empty(PKG_OPTIONS:Mmysql4) +. include "../../databases/mysql4-client/buildlink3.mk" +CCARGS+= -DHAS_MYSQL +CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include` +AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs` +.elif !empty(PKG_OPTIONS:Mmysql) +. include "../../databases/mysql-client/buildlink3.mk" +CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql +AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ + -lmysqlclient -lz -lm +.endif + +### +### Support using a PostgreSQL database server for table lookups. +### +.if !empty(PKG_OPTIONS:Mpgsql) +. include "../../mk/pgsql.buildlink3.mk" +. include "../../security/openssl/buildlink3.mk" +CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql +AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ + -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt -lssl -lcrypto +.endif + +### +### SASL support for SMTP authentication. If neither SASLv1 or SASLv2 is +### explicitly specified, then build with SASLv2. +### +.if !empty(PKG_OPTIONS:Msasl) +. if !defined(USE_SASL2) && !defined(USE_SASL) +. include "../../security/cyrus-sasl2/buildlink3.mk" +SASLLIBDIR= ${PREFIX}/lib/sasl2 +PWCHECK_METHOD= auxprop +CCARGS+= -DUSE_SASL2_AUTH +AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -lsasl2 +. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +. include "../../security/cyrus-sasl2/buildlink3.mk" +SASLLIBDIR= ${PREFIX}/lib/sasl2 +PWCHECK_METHOD= auxprop +CCARGS+= -DUSE_SASL2_AUTH +AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -lsasl2 +. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) +. include "../../security/cyrus-sasl/buildlink3.mk" +SASLLIBDIR= ${PREFIX}/lib/sasl +PWCHECK_METHOD= sasldb +CCARGS+= -DUSE_SASL_AUTH +AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -lsasl +. endif +PLIST_SRC+= ${PKGDIR}/PLIST.sasl +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl +MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} +.endif + +.if ${OPSYS} == "Linux" +. include "../../databases/db/buildlink3.mk" +CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2 +AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \ + -ldb2 +.endif diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 85ef5348266..60f848e91ed 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.146 2004/07/31 05:22:16 jlam Exp $ +# $NetBSD: Makefile,v 1.147 2004/08/05 03:04:33 jlam Exp $ DISTNAME= postfix-2.1.4 CATEGORIES= mail @@ -41,10 +41,10 @@ CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\" CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\" CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\" -# Makefile.options appends to CCARGS and AUXLIBS the options needed to -# build Postfix with support for various add-on modules. +# options.mk appends to CCARGS and AUXLIBS the options needed to build +# Postfix with support for various add-on modules. # -.include "Makefile.options" +.include "options.mk" PKG_SYSCONFSUBDIR= postfix LIBEXECDIR= ${PREFIX}/libexec/postfix diff --git a/mail/postfix/Makefile.options b/mail/postfix/Makefile.options deleted file mode 100644 index ebc0a53b606..00000000000 --- a/mail/postfix/Makefile.options +++ /dev/null @@ -1,174 +0,0 @@ -# $NetBSD: Makefile.options,v 1.9 2004/08/04 20:49:43 jlam Exp $ - -# Global and legacy options -# -# XXX Support for the following variables will be removed after the -# XXX pkgsrc-2004Q3 branch is released: -# XXX -# XXX POSTFIX_USE_INET6 POSTFIX_USE_TLS -# XXX POSTFIX_USE_PCRE POSTFIX_USE_MYSQL -# XXX POSTFIX_USE_PGSQL POSTFIX_OPTIONS -# XXX POSTFIX_USE_SASL_AUTH -# -.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \ - defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ - defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ - defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \ - defined(POSTFIX_OPTIONS) -. if !defined(PKG_OPTIONS.postfix) -. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= ldap -. endif -. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= inet6 -. endif -. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= tls -. endif -. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pcre -. endif -. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= mysql -. endif -. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pgsql -. endif -. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(POSTFIX_OPTIONS) -PKG_OPTIONS.postfix= ${POSTFIX_OPTIONS} -. endif -. endif -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.postfix -PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls -.include "../../mk/bsd.options.mk" - -### -### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/) -### -.if !empty(PKG_OPTIONS:Minet6) || !empty(PKG_OPTIONS:Mtls) -. include "../../security/openssl/buildlink3.mk" -PATCHFILES+= tls+ipv6-1.25-pf-2.1.4.patch.gz -PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/ -PATCH_DIST_STRIP= -p1 - -CCARGS+= -DHAS_SSL -AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \ - -lssl -lcrypto - -PLIST_SRC+= ${PKGDIR}/PLIST.tls -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls -.endif - -### -### Support "pcre" map type for regular expressions. -### -.if !empty(PKG_OPTIONS:Mpcre) -. include "../../devel/pcre/buildlink3.mk" -CCARGS+= -DHAS_PCRE -AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \ - -lpcre -.else -CCARGS+= -DNO_PCRE -.endif - -### -### Support LDAP directories for table lookups. -### -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" -CCARGS+= -DHAS_LDAP -AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \ - -lldap -llber -. if ${OPSYS} != "Linux" -. include "../../databases/db4/buildlink3.mk" -CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 -AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \ - -ldb4 -. endif -.endif - -### -### Support using a MySQL database server for table lookups. -### -.if !empty(PKG_OPTIONS:Mmysql4) -. include "../../databases/mysql4-client/buildlink3.mk" -CCARGS+= -DHAS_MYSQL -CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include` -AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs` -.elif !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql-client/buildlink3.mk" -CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql -AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ - -lmysqlclient -lz -lm -.endif - -### -### Support using a PostgreSQL database server for table lookups. -### -.if !empty(PKG_OPTIONS:Mpgsql) -. include "../../mk/pgsql.buildlink3.mk" -. include "../../security/openssl/buildlink3.mk" -CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql -AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ - -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt -lssl -lcrypto -.endif - -### -### SASL support for SMTP authentication. If neither SASLv1 or SASLv2 is -### explicitly specified, then build with SASLv2. -### -.if !empty(PKG_OPTIONS:Msasl) -. if !defined(USE_SASL2) && !defined(USE_SASL) -. include "../../security/cyrus-sasl2/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl2 -PWCHECK_METHOD= auxprop -CCARGS+= -DUSE_SASL2_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl2 -. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -. include "../../security/cyrus-sasl2/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl2 -PWCHECK_METHOD= auxprop -CCARGS+= -DUSE_SASL2_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl2 -. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -. include "../../security/cyrus-sasl/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl -PWCHECK_METHOD= sasldb -CCARGS+= -DUSE_SASL_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl -. endif -PLIST_SRC+= ${PKGDIR}/PLIST.sasl -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl -MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} -MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} -.endif - -.if ${OPSYS} == "Linux" -. include "../../databases/db/buildlink3.mk" -CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2 -AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \ - -ldb2 -.endif diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk new file mode 100644 index 00000000000..b184569ee02 --- /dev/null +++ b/mail/postfix/options.mk @@ -0,0 +1,174 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $ + +# Global and legacy options +# +# XXX Support for the following variables will be removed after the +# XXX pkgsrc-2004Q3 branch is released: +# XXX +# XXX POSTFIX_USE_INET6 POSTFIX_USE_TLS +# XXX POSTFIX_USE_PCRE POSTFIX_USE_MYSQL +# XXX POSTFIX_USE_PGSQL POSTFIX_OPTIONS +# XXX POSTFIX_USE_SASL_AUTH +# +.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \ + defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ + defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ + defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \ + defined(POSTFIX_OPTIONS) +. if !defined(PKG_OPTIONS.postfix) +. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= sasl +. endif +. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= sasl +. endif +. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= ldap +. endif +. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= inet6 +. endif +. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= tls +. endif +. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= pcre +. endif +. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= mysql +. endif +. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) +PKG_OPTIONS.postfix+= pgsql +. endif +. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) +PKG_OPTIONS.postfix+= sasl +. endif +. if defined(POSTFIX_OPTIONS) +PKG_OPTIONS.postfix= ${POSTFIX_OPTIONS} +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.postfix +PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls +.include "../../mk/bsd.options.mk" + +### +### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/) +### +.if !empty(PKG_OPTIONS:Minet6) || !empty(PKG_OPTIONS:Mtls) +. include "../../security/openssl/buildlink3.mk" +PATCHFILES+= tls+ipv6-1.25-pf-2.1.4.patch.gz +PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/ +PATCH_DIST_STRIP= -p1 + +CCARGS+= -DHAS_SSL +AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \ + -lssl -lcrypto + +PLIST_SRC+= ${PKGDIR}/PLIST.tls +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls +.endif + +### +### Support "pcre" map type for regular expressions. +### +.if !empty(PKG_OPTIONS:Mpcre) +. include "../../devel/pcre/buildlink3.mk" +CCARGS+= -DHAS_PCRE +AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \ + -lpcre +.else +CCARGS+= -DNO_PCRE +.endif + +### +### Support LDAP directories for table lookups. +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap/buildlink3.mk" +CCARGS+= -DHAS_LDAP +AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \ + -lldap -llber +. if ${OPSYS} != "Linux" +. include "../../databases/db4/buildlink3.mk" +CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 +AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \ + -ldb4 +. endif +.endif + +### +### Support using a MySQL database server for table lookups. +### +.if !empty(PKG_OPTIONS:Mmysql4) +. include "../../databases/mysql4-client/buildlink3.mk" +CCARGS+= -DHAS_MYSQL +CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include` +AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs` +.elif !empty(PKG_OPTIONS:Mmysql) +. include "../../databases/mysql-client/buildlink3.mk" +CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql +AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ + -lmysqlclient -lz -lm +.endif + +### +### Support using a PostgreSQL database server for table lookups. +### +.if !empty(PKG_OPTIONS:Mpgsql) +. include "../../mk/pgsql.buildlink3.mk" +. include "../../security/openssl/buildlink3.mk" +CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql +AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ + -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt -lssl -lcrypto +.endif + +### +### SASL support for SMTP authentication. If neither SASLv1 or SASLv2 is +### explicitly specified, then build with SASLv2. +### +.if !empty(PKG_OPTIONS:Msasl) +. if !defined(USE_SASL2) && !defined(USE_SASL) +. include "../../security/cyrus-sasl2/buildlink3.mk" +SASLLIBDIR= ${PREFIX}/lib/sasl2 +PWCHECK_METHOD= auxprop +CCARGS+= -DUSE_SASL2_AUTH +AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -lsasl2 +. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +. include "../../security/cyrus-sasl2/buildlink3.mk" +SASLLIBDIR= ${PREFIX}/lib/sasl2 +PWCHECK_METHOD= auxprop +CCARGS+= -DUSE_SASL2_AUTH +AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -lsasl2 +. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) +. include "../../security/cyrus-sasl/buildlink3.mk" +SASLLIBDIR= ${PREFIX}/lib/sasl +PWCHECK_METHOD= sasldb +CCARGS+= -DUSE_SASL_AUTH +AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + -lsasl +. endif +PLIST_SRC+= ${PKGDIR}/PLIST.sasl +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl +MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} +.endif + +.if ${OPSYS} == "Linux" +. include "../../databases/db/buildlink3.mk" +CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2 +AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \ + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \ + -ldb2 +.endif diff --git a/net/samba/Makefile b/net/samba/Makefile index 642c302e4a5..ef6f4f68b2a 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.124 2004/07/30 21:05:41 jlam Exp $ +# $NetBSD: Makefile,v 1.125 2004/08/05 03:04:34 jlam Exp $ DISTNAME= samba-3.0.5 CATEGORIES= net @@ -64,7 +64,7 @@ USE_GNU_READLINE= yes .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -.include "Makefile.options" +.include "options.mk" .if !defined(MKTEMP) MKTEMP!= ${TYPE} mktemp 2>&1 | \ diff --git a/net/samba/Makefile.options b/net/samba/Makefile.options deleted file mode 100644 index daeab7a9a39..00000000000 --- a/net/samba/Makefile.options +++ /dev/null @@ -1,96 +0,0 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:41 jlam Exp $ - -# Global and legacy options -.if defined(USE_CUPS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \ - defined(SAMBA_WITH_ADS) || defined(SAMBA_USE_LDAP) || \ - defined(SAMBA_USE_LDAP_COMPAT) -. if !defined(PKG_OPTIONS.samba) -. if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) -PKG_OPTIONS.samba+= cups -. endif -. if defined(USE_PAM) -PKG_OPTIONS.samba+= PAM -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.samba+= ldap -. endif -. if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) -PKG_OPTIONS.samba+= ads -. endif -. if defined(SAMBA_USE_LDAP) -PKG_OPTIONS.samba+= ldap -. endif -. if defined(SAMBA_USE_LDAP_COMPAT) && \ - !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS]) -PKG_OPTIONS.samba+= ldap-compat -. endif -. endif -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.samba -PKG_SUPPORTED_OPTIONS= PAM ads cups ldap ldap-compat -.include "../../mk/bsd.options.mk" - -### -### Support PAM authentication and build smbpass and winbind PAM modules. -### -.if !empty(PKG_OPTIONS:MPAM) -. include "../../security/PAM/module.mk" -CONFIGURE_ARGS+= --with-pam -CONFIGURE_ARGS+= --with-pam_smbpass -PLIST_SUBST+= PAM= -.else -PLIST_SUBST+= PAM="@comment " -.endif - -### -### Allow Samba to join as a member server of an Active Directory domain. -### -.if !empty(PKG_OPTIONS:Mads) -. include "../../mk/krb5.buildlink3.mk" -PKG_OPTIONS+= ldap -CONFIGURE_ARGS+= --with-ads -CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} -.else -CONFIGURE_ARGS+= --without-ads -CONFIGURE_ARGS+= --without-krb5 -.endif - -### -### Native CUPS support for printing -### -.if !empty(PKG_OPTIONS:Mcups) -. include "../../print/cups/buildlink3.mk" -CONFIGURE_ARGS+= --enable-cups -.else -CONFIGURE_ARGS+= --disable-cups -.endif - -### -### Support Samba-2.x LDAP password and account databases. -### -.if !empty(PKG_OPTIONS:Mldap-compat) -PKG_OPTIONS+= ldap -CONFIGURE_ARGS+= --with-ldapsam -.endif - -### -### Support LDAP authentication and storage of Samba account information. -### -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" -CONFIGURE_ARGS+= --with-ldap -.else -CONFIGURE_ARGS+= --without-ldap -.endif - -### -### Only Linux supports smbmount for mounting a Samba share into the -### filesystem. -### -.if ${OPSYS} == "Linux" -CONFIGURE_ARGS+= --with-smbmount -PLIST_SUBST+= SMBMOUNT= -.else -PLIST_SUBST+= SMBMOUNT="@comment " -.endif diff --git a/net/samba/options.mk b/net/samba/options.mk new file mode 100644 index 00000000000..318c28c4994 --- /dev/null +++ b/net/samba/options.mk @@ -0,0 +1,96 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ + +# Global and legacy options +.if defined(USE_CUPS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \ + defined(SAMBA_WITH_ADS) || defined(SAMBA_USE_LDAP) || \ + defined(SAMBA_USE_LDAP_COMPAT) +. if !defined(PKG_OPTIONS.samba) +. if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) +PKG_OPTIONS.samba+= cups +. endif +. if defined(USE_PAM) +PKG_OPTIONS.samba+= PAM +. endif +. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +PKG_OPTIONS.samba+= ldap +. endif +. if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) +PKG_OPTIONS.samba+= ads +. endif +. if defined(SAMBA_USE_LDAP) +PKG_OPTIONS.samba+= ldap +. endif +. if defined(SAMBA_USE_LDAP_COMPAT) && \ + !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS]) +PKG_OPTIONS.samba+= ldap-compat +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.samba +PKG_SUPPORTED_OPTIONS= PAM ads cups ldap ldap-compat +.include "../../mk/bsd.options.mk" + +### +### Support PAM authentication and build smbpass and winbind PAM modules. +### +.if !empty(PKG_OPTIONS:MPAM) +. include "../../security/PAM/module.mk" +CONFIGURE_ARGS+= --with-pam +CONFIGURE_ARGS+= --with-pam_smbpass +PLIST_SUBST+= PAM= +.else +PLIST_SUBST+= PAM="@comment " +.endif + +### +### Allow Samba to join as a member server of an Active Directory domain. +### +.if !empty(PKG_OPTIONS:Mads) +. include "../../mk/krb5.buildlink3.mk" +PKG_OPTIONS+= ldap +CONFIGURE_ARGS+= --with-ads +CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} +.else +CONFIGURE_ARGS+= --without-ads +CONFIGURE_ARGS+= --without-krb5 +.endif + +### +### Native CUPS support for printing +### +.if !empty(PKG_OPTIONS:Mcups) +. include "../../print/cups/buildlink3.mk" +CONFIGURE_ARGS+= --enable-cups +.else +CONFIGURE_ARGS+= --disable-cups +.endif + +### +### Support Samba-2.x LDAP password and account databases. +### +.if !empty(PKG_OPTIONS:Mldap-compat) +PKG_OPTIONS+= ldap +CONFIGURE_ARGS+= --with-ldapsam +.endif + +### +### Support LDAP authentication and storage of Samba account information. +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldap +.else +CONFIGURE_ARGS+= --without-ldap +.endif + +### +### Only Linux supports smbmount for mounting a Samba share into the +### filesystem. +### +.if ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --with-smbmount +PLIST_SUBST+= SMBMOUNT= +.else +PLIST_SUBST+= SMBMOUNT="@comment " +.endif diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 43c90855e1e..d4c8209c103 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/08/04 19:41:06 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2004/08/05 03:04:34 jlam Exp $ .include "Makefile.common" @@ -40,7 +40,7 @@ AUTHDAEMONVAR?= ${VARBASE}/authdaemon CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR} BUILD_DEFS+= AUTHDAEMONVAR -.include "Makefile.options" +.include "options.mk" .if exists(/dev/urandom) SASL_ENTROPY_SOURCE?= /dev/urandom diff --git a/security/cyrus-sasl2/Makefile.options b/security/cyrus-sasl2/Makefile.options deleted file mode 100644 index a33fbc55c1f..00000000000 --- a/security/cyrus-sasl2/Makefile.options +++ /dev/null @@ -1,40 +0,0 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:41 jlam Exp $ - -# Global and legacy options -.if defined(KERBEROS) || defined(SASL_USE_GSSAPI) -. if !defined(PKG_OPTIONS.cyrus-sasl) -. if defined(KERBEROS) -PKG_OPTIONS.cyrus-sasl+= kerberos -. endif -. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-sasl+= gssapi -. endif -. endif -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl -PKG_SUPPORTED_OPTIONS= gssapi kerberos -.include "../../mk/bsd.options.mk" - -### -### Kerberos authentication is via GSSAPI. -### -.if !empty(PKG_OPTIONS:Mkerberos) -. if empty(PKG_OPTIONS:Mgssapi) -PKG_OPTIONS+= gssapi -. endif -.endif - -### -### Authentication via GSSAPI (which supports primarily Kerberos 5) -### -.if !empty(PKG_OPTIONS:Mgssapi) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} -CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} -GSSIMPL.heimdal= heimdal -GSSIMPL.mit-krb5= mit -PLIST_SUBST+= GSSAPI= -.else -PLIST_SUBST+= GSSAPI="@comment " -.endif diff --git a/security/cyrus-sasl2/options.mk b/security/cyrus-sasl2/options.mk new file mode 100644 index 00000000000..fe2b28c2013 --- /dev/null +++ b/security/cyrus-sasl2/options.mk @@ -0,0 +1,40 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ + +# Global and legacy options +.if defined(KERBEROS) || defined(SASL_USE_GSSAPI) +. if !defined(PKG_OPTIONS.cyrus-sasl) +. if defined(KERBEROS) +PKG_OPTIONS.cyrus-sasl+= kerberos +. endif +. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) +PKG_OPTIONS.cyrus-sasl+= gssapi +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl +PKG_SUPPORTED_OPTIONS= gssapi kerberos +.include "../../mk/bsd.options.mk" + +### +### Kerberos authentication is via GSSAPI. +### +.if !empty(PKG_OPTIONS:Mkerberos) +. if empty(PKG_OPTIONS:Mgssapi) +PKG_OPTIONS+= gssapi +. endif +.endif + +### +### Authentication via GSSAPI (which supports primarily Kerberos 5) +### +.if !empty(PKG_OPTIONS:Mgssapi) +. include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} +GSSIMPL.heimdal= heimdal +GSSIMPL.mit-krb5= mit +PLIST_SUBST+= GSSAPI= +.else +PLIST_SUBST+= GSSAPI="@comment " +.endif diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile index ae567792086..7992ba0d017 100644 --- a/security/cyrus-saslauthd/Makefile +++ b/security/cyrus-saslauthd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/08/04 20:08:38 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2004/08/05 03:04:34 jlam Exp $ DISTNAME= cyrus-sasl-2.1.19 PKGNAME= ${DISTNAME:S/sasl/saslauthd/} @@ -32,7 +32,7 @@ FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR} CONFIGURE_ARGS+= --with-saslauthd="${SASLSOCKETDIR}" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} -.include "Makefile.options" +.include "options.mk" USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL diff --git a/security/cyrus-saslauthd/Makefile.options b/security/cyrus-saslauthd/Makefile.options deleted file mode 100644 index 98f02fa8d4f..00000000000 --- a/security/cyrus-saslauthd/Makefile.options +++ /dev/null @@ -1,65 +0,0 @@ -# $NetBSD: Makefile.options,v 1.2 2004/08/01 19:43:45 jlam Exp $ - -# Global and legacy options -.if defined(KERBEROS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \ - defined(SASL_USE_GSSAPI) -. if !defined(PKG_OPTIONS.cyrus-saslauthd) -. if defined(KERBEROS) -PKG_OPTIONS.cyrus-saslauthd+= kerberos -. endif -. if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-saslauthd+= PAM -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-saslauthd+= ldap -. endif -. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-saslauthd+= gssapi -. endif -. endif -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd -PKG_SUPPORTED_OPTIONS= PAM kerberos ldap gssapi -.include "../../mk/bsd.options.mk" - -### -### PAM (Pluggable Authentication Mechanism) -### -.if !empty(PKG_OPTIONS:MPAM) -. include "../../security/PAM/buildlink3.mk" -CONFIGURE_ARGS+= --with-pam=${BUILDLINK_PREFIX.pam} -.endif - -### -### Authentication against information stored in an LDAP directory -### -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" -. include "../../security/cyrus-sasl2/buildlink3.mk" -BUILDLINK_INCDIRS.cyrus-sasl= include/sasl -CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap} -PLIST_SUBST+= LDAP= -.else -PLIST_SUBST+= LDAP="@comment " -.endif - -### -### Kerberos authentication is via GSSAPI. -### -.if !empty(PKG_OPTIONS:Mkerberos) -. if empty(PKG_OPTIONS:Mgssapi) -PKG_OPTIONS+= gssapi -. endif -.endif - -### -### Authentication via GSSAPI (which supports primarily Kerberos 5) -### -.if !empty(PKG_OPTIONS:Mgssapi) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} -CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} -GSSIMPL.heimdal= heimdal -GSSIMPL.mit-krb5= mit -.endif diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk new file mode 100644 index 00000000000..85991bed451 --- /dev/null +++ b/security/cyrus-saslauthd/options.mk @@ -0,0 +1,65 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ + +# Global and legacy options +.if defined(KERBEROS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \ + defined(SASL_USE_GSSAPI) +. if !defined(PKG_OPTIONS.cyrus-saslauthd) +. if defined(KERBEROS) +PKG_OPTIONS.cyrus-saslauthd+= kerberos +. endif +. if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS]) +PKG_OPTIONS.cyrus-saslauthd+= PAM +. endif +. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +PKG_OPTIONS.cyrus-saslauthd+= ldap +. endif +. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) +PKG_OPTIONS.cyrus-saslauthd+= gssapi +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd +PKG_SUPPORTED_OPTIONS= PAM kerberos ldap gssapi +.include "../../mk/bsd.options.mk" + +### +### PAM (Pluggable Authentication Mechanism) +### +.if !empty(PKG_OPTIONS:MPAM) +. include "../../security/PAM/buildlink3.mk" +CONFIGURE_ARGS+= --with-pam=${BUILDLINK_PREFIX.pam} +.endif + +### +### Authentication against information stored in an LDAP directory +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap/buildlink3.mk" +. include "../../security/cyrus-sasl2/buildlink3.mk" +BUILDLINK_INCDIRS.cyrus-sasl= include/sasl +CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap} +PLIST_SUBST+= LDAP= +.else +PLIST_SUBST+= LDAP="@comment " +.endif + +### +### Kerberos authentication is via GSSAPI. +### +.if !empty(PKG_OPTIONS:Mkerberos) +. if empty(PKG_OPTIONS:Mgssapi) +PKG_OPTIONS+= gssapi +. endif +.endif + +### +### Authentication via GSSAPI (which supports primarily Kerberos 5) +### +.if !empty(PKG_OPTIONS:Mgssapi) +. include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} +GSSIMPL.heimdal= heimdal +GSSIMPL.mit-krb5= mit +.endif diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 2776388ec36..796f76ae909 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2004/07/30 21:05:42 jlam Exp $ +# $NetBSD: Makefile,v 1.75 2004/08/05 03:04:34 jlam Exp $ # DISTNAME= lynx2.8.5 @@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --enable-nested-tables CONFIGURE_ARGS+= --enable-prettysrc CONFIGURE_ARGS+= --enable-read-eta -.include "Makefile.options" +.include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/www/lynx/Makefile.options b/www/lynx/Makefile.options deleted file mode 100644 index 8a2eaf7e2ec..00000000000 --- a/www/lynx/Makefile.options +++ /dev/null @@ -1,77 +0,0 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:42 jlam Exp $ - -# Global and legacy options -.if defined(LYNX_SCREEN_LIB) || defined(USE_SOCKS) || defined(USE_INET6) -. if !defined(PKG_OPTIONS.lynx) -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang) -PKG_OPTIONS.lynx+= slang -. endif -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses) -PKG_OPTIONS.lynx+= ncurses -. endif -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses) -PKG_OPTIONS.lynx+= curses -. endif -. if defined(USE_SOCKS) && (${USE_SOCKS} == 4) -PKG_OPTIONS.lynx+= socks4 -. endif -. if defined(USE_SOCKS) && (${USE_SOCKS} == 5) -PKG_OPTIONS.lynx+= socks5 -. endif -. if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.lynx+= inet6 -. endif -. endif -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.lynx -PKG_SUPPORTED_OPTIONS= curses inet6 ncurses slang socks4 socks5 -.include "../../mk/bsd.options.mk" - -### -### We can't compile support for both the "slang" screen library and -### SOCKS support. -### -.if !empty(PKG_OPTIONS:Mslang) && !empty(PKG_OPTIONS:Msocks*) -PKG_FAIL_REASON+= "SOCKS may not be enabled together with the \"slang\"" \ - "screen library. If SOCKS support is desired," \ - "please change ${PKG_OPTIONS_VAR} to include" \ - "\"curses\" or \"ncurses\" instead." -.endif - -### -### Set the screen library to "slang", "ncurses", or plain "curses". -### -.if !empty(PKG_OPTIONS:Mslang) -. include "../../devel/libslang/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Mncurses) -USE_NCURSES= color -. include "../../devel/ncurses/buildlink3.mk" -CONFIGURE_ARGS+= --enable-color-style -.elif !empty(PKG_OPTIONS:Mcurses) -. include "../../mk/curses.buildlink3.mk" -. if !empty(MACHINE_PLATFORM:MNetBSD-1.[56]*-i386) -CONFIGURE_ARGS+= --enable-color-style -. endif -.else -PKG_FAIL_REASON+= "${PKG_OPTIONS_VAR} must contain one of" \ - "one of \"slang\", \"ncurses\", or \"curses\"!" -.endif - -### -### SOCKS support -### -.if !empty(PKG_OPTIONS:Msocks4) -CONFIGURE_ARGS+= --with-socks -. include "../../net/socks4/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Msocks5) -CONFIGURE_ARGS+= --with-socks5 -. include "../../net/socks5/buildlink3.mk" -.endif - -### -### IPv6 support -### -.if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --enable-ipv6 -.endif diff --git a/www/lynx/options.mk b/www/lynx/options.mk new file mode 100644 index 00000000000..21dde3d76d2 --- /dev/null +++ b/www/lynx/options.mk @@ -0,0 +1,77 @@ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ + +# Global and legacy options +.if defined(LYNX_SCREEN_LIB) || defined(USE_SOCKS) || defined(USE_INET6) +. if !defined(PKG_OPTIONS.lynx) +. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang) +PKG_OPTIONS.lynx+= slang +. endif +. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses) +PKG_OPTIONS.lynx+= ncurses +. endif +. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses) +PKG_OPTIONS.lynx+= curses +. endif +. if defined(USE_SOCKS) && (${USE_SOCKS} == 4) +PKG_OPTIONS.lynx+= socks4 +. endif +. if defined(USE_SOCKS) && (${USE_SOCKS} == 5) +PKG_OPTIONS.lynx+= socks5 +. endif +. if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) +PKG_OPTIONS.lynx+= inet6 +. endif +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.lynx +PKG_SUPPORTED_OPTIONS= curses inet6 ncurses slang socks4 socks5 +.include "../../mk/bsd.options.mk" + +### +### We can't compile support for both the "slang" screen library and +### SOCKS support. +### +.if !empty(PKG_OPTIONS:Mslang) && !empty(PKG_OPTIONS:Msocks*) +PKG_FAIL_REASON+= "SOCKS may not be enabled together with the \"slang\"" \ + "screen library. If SOCKS support is desired," \ + "please change ${PKG_OPTIONS_VAR} to include" \ + "\"curses\" or \"ncurses\" instead." +.endif + +### +### Set the screen library to "slang", "ncurses", or plain "curses". +### +.if !empty(PKG_OPTIONS:Mslang) +. include "../../devel/libslang/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Mncurses) +USE_NCURSES= color +. include "../../devel/ncurses/buildlink3.mk" +CONFIGURE_ARGS+= --enable-color-style +.elif !empty(PKG_OPTIONS:Mcurses) +. include "../../mk/curses.buildlink3.mk" +. if !empty(MACHINE_PLATFORM:MNetBSD-1.[56]*-i386) +CONFIGURE_ARGS+= --enable-color-style +. endif +.else +PKG_FAIL_REASON+= "${PKG_OPTIONS_VAR} must contain one of" \ + "one of \"slang\", \"ncurses\", or \"curses\"!" +.endif + +### +### SOCKS support +### +.if !empty(PKG_OPTIONS:Msocks4) +CONFIGURE_ARGS+= --with-socks +. include "../../net/socks4/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Msocks5) +CONFIGURE_ARGS+= --with-socks5 +. include "../../net/socks5/buildlink3.mk" +.endif + +### +### IPv6 support +### +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.endif -- cgit v1.2.3