diff options
-rw-r--r-- | databases/openldap/Makefile | 4 | ||||
-rw-r--r-- | databases/openldap/options.mk (renamed from databases/openldap/Makefile.options) | 2 | ||||
-rw-r--r-- | mail/mutt-devel/Makefile | 4 | ||||
-rw-r--r-- | mail/mutt-devel/options.mk (renamed from mail/mutt-devel/Makefile.options) | 2 | ||||
-rw-r--r-- | mail/postfix-current/Makefile | 8 | ||||
-rw-r--r-- | mail/postfix-current/options.mk (renamed from mail/postfix-current/Makefile.options) | 2 | ||||
-rw-r--r-- | mail/postfix/Makefile | 8 | ||||
-rw-r--r-- | mail/postfix/options.mk (renamed from mail/postfix/Makefile.options) | 2 | ||||
-rw-r--r-- | net/samba/Makefile | 4 | ||||
-rw-r--r-- | net/samba/options.mk (renamed from net/samba/Makefile.options) | 2 | ||||
-rw-r--r-- | security/cyrus-sasl2/Makefile | 4 | ||||
-rw-r--r-- | security/cyrus-sasl2/options.mk (renamed from security/cyrus-sasl2/Makefile.options) | 2 | ||||
-rw-r--r-- | security/cyrus-saslauthd/Makefile | 4 | ||||
-rw-r--r-- | security/cyrus-saslauthd/options.mk (renamed from security/cyrus-saslauthd/Makefile.options) | 2 | ||||
-rw-r--r-- | www/lynx/Makefile | 4 | ||||
-rw-r--r-- | www/lynx/options.mk (renamed from www/lynx/Makefile.options) | 2 |
16 files changed, 28 insertions, 28 deletions
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/options.mk index ae6ad9fcb18..79e87470e15 100644 --- a/databases/openldap/Makefile.options +++ b/databases/openldap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.6 2004/08/04 19:45:02 jlam Exp $ +# $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) 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/options.mk index a5aaf20748e..c5e29fb941a 100644 --- a/mail/mutt-devel/Makefile.options +++ b/mail/mutt-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.4 2004/08/03 11:28:31 sketch Exp $ +# $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) || \ 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/options.mk index 9aa9dd41971..0b6e83b84d1 100644 --- a/mail/postfix-current/Makefile.options +++ b/mail/postfix-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/31 05:53:44 jlam Exp $ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $ # Global and legacy options # 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/options.mk index ebc0a53b606..b184569ee02 100644 --- a/mail/postfix/Makefile.options +++ b/mail/postfix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.9 2004/08/04 20:49:43 jlam Exp $ +# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $ # Global and legacy options # 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/options.mk index daeab7a9a39..318c28c4994 100644 --- a/net/samba/Makefile.options +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:41 jlam Exp $ +# $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) || \ 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/options.mk index a33fbc55c1f..fe2b28c2013 100644 --- a/security/cyrus-sasl2/Makefile.options +++ b/security/cyrus-sasl2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:41 jlam Exp $ +# $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) 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/options.mk index 98f02fa8d4f..85991bed451 100644 --- a/security/cyrus-saslauthd/Makefile.options +++ b/security/cyrus-saslauthd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.2 2004/08/01 19:43:45 jlam Exp $ +# $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) || \ 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/options.mk index 8a2eaf7e2ec..21dde3d76d2 100644 --- a/www/lynx/Makefile.options +++ b/www/lynx/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:42 jlam Exp $ +# $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) |