From c21e3b668c68cdd14d7791ca02f8bb26171c0ca8 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
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>.

---
 mail/mutt-devel/Makefile         |  4 +--
 mail/mutt-devel/Makefile.options | 57 ----------------------------------------
 mail/mutt-devel/options.mk       | 57 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 mail/mutt-devel/Makefile.options
 create mode 100644 mail/mutt-devel/options.mk

(limited to 'mail/mutt-devel')

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