From b32b7ebe7e284f58e8635685f7b2406464dff9ad Mon Sep 17 00:00:00 2001
From: jlam <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 <schmonz>.

---
 databases/openldap/Makefile         |  4 +--
 databases/openldap/Makefile.options | 65 -------------------------------------
 databases/openldap/options.mk       | 65 +++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 databases/openldap/Makefile.options
 create mode 100644 databases/openldap/options.mk

(limited to 'databases')

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
-- 
cgit v1.2.3