pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Rename Makefile.options to options.mk in the packages ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e54a552db389
branches: trunk
changeset: 479107:e54a552db389
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Aug 05 03:04:33 2004 +0000
description:
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>.
diffstat:
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(-)
diffs (truncated from 1716 to 300 lines):
diff -r 60aa3f04cde9 -r e54a552db389 databases/openldap/Makefile
--- a/databases/openldap/Makefile Thu Aug 05 02:55:50 2004 +0000
+++ b/databases/openldap/Makefile Thu Aug 05 03:04:33 2004 +0000
@@ -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 @@
FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
.include "../../mk/bsd.prefs.mk"
-.include "Makefile.options"
+.include "options.mk"
CPPFLAGS.Darwin+= -DBIND_8_COMPAT
diff -r 60aa3f04cde9 -r e54a552db389 databases/openldap/Makefile.options
--- a/databases/openldap/Makefile.options Thu Aug 05 02:55:50 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 60aa3f04cde9 -r e54a552db389 databases/openldap/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/options.mk Thu Aug 05 03:04:33 2004 +0000
@@ -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 -r 60aa3f04cde9 -r e54a552db389 mail/mutt-devel/Makefile
--- a/mail/mutt-devel/Makefile Thu Aug 05 02:55:50 2004 +0000
+++ b/mail/mutt-devel/Makefile Thu Aug 05 03:04:33 2004 +0000
@@ -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+= --with-exec-shell=/bin/ksh
.endif
-.include "Makefile.options"
+.include "options.mk"
LDFLAGS+= ${_STRIPFLAG_CC}
diff -r 60aa3f04cde9 -r e54a552db389 mail/mutt-devel/Makefile.options
--- a/mail/mutt-devel/Makefile.options Thu Aug 05 02:55:50 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 60aa3f04cde9 -r e54a552db389 mail/mutt-devel/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt-devel/options.mk Thu Aug 05 03:04:33 2004 +0000
@@ -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 -r 60aa3f04cde9 -r e54a552db389 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile Thu Aug 05 02:55:50 2004 +0000
+++ b/mail/postfix-current/Makefile Thu Aug 05 03:04:33 2004 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index