[pkgsrc/trunk]: pkgsrc/mail/fetchmail Move options-handling into a separate f...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3a600a8b4c3c
branches:  trunk
changeset: 479101:3a600a8b4c3c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 05 02:31:24 2004 +0000

description:
Move options-handling into a separate file and document each option.

diffstat:

 mail/fetchmail/Makefile   |  48 +++----------------------------------------
 mail/fetchmail/options.mk |  51 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 44 deletions(-)

diffs (125 lines):

diff -r c22286997daf -r 3a600a8b4c3c mail/fetchmail/Makefile
--- a/mail/fetchmail/Makefile   Thu Aug 05 02:22:19 2004 +0000
+++ b/mail/fetchmail/Makefile   Thu Aug 05 02:31:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2004/07/30 21:05:41 jlam Exp $
+# $NetBSD: Makefile,v 1.146 2004/08/05 02:31:24 jlam Exp $
 
 DISTNAME=      fetchmail-6.2.5
 PKGREVISION=   2
@@ -14,57 +14,17 @@
 
 BUILD_USES_MSGFMT=     yes
 
+.include "../../mk/bsd.prefs.mk"
+
 USE_BUILDLINK3=                yes
 USE_PKGINSTALL=                yes
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-hesiod
 USE_TBL=               yes
-
-BUILD_DEFS+=           USE_INET6
 LDFLAGS+=              ${CFLAGS}
 
-.include "../../mk/bsd.prefs.mk"
-
-# Global and legacy options
-.if defined(KERBEROS) && defined(USE_INET6) || defined(FETCHMAIL_USE_SSL)
-.  if !defined(PKG_OPTIONS.fetchmail)
-.    if defined(KERBEROS)
-PKG_OPTIONS.fetchmail+=        kerberos4
-.    endif
-.    if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_OPTIONS.fetchmail+=        inet6
-.    endif
-.    if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS])
-PKG_OPTIONS.fetchmail+=        ssl
-.    endif
-.  endif
-.endif
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.fetchmail
-PKG_SUPPORTED_OPTIONS= inet6 kerberos4 ssl
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-inet6
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos4)
-CRYPTO+=               uses Kerberos encryption code
-CONFIGURE_ARGS+=       --with-kerberos=yes
-.  if empty(MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386)
-REPLACE_KERBEROS_LIBS= # defined
-.  endif
-.else
-CONFIGURE_ARGS+=       --with-kerberos=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-ssl=${SSLBASE}
-.else
-CONFIGURE_ARGS+=       --without-ssl
-.endif
+.include "options.mk"
 
 DOCDIR=                ${PREFIX}/share/doc/fetchmail
 RCD_SCRIPTS=   fetchmail
diff -r c22286997daf -r 3a600a8b4c3c mail/fetchmail/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/fetchmail/options.mk Thu Aug 05 02:31:24 2004 +0000
@@ -0,0 +1,51 @@
+# $NetBSD: options.mk,v 1.1 2004/08/05 02:31:24 jlam Exp $
+
+# Global and legacy options
+.if defined(KERBEROS) && defined(USE_INET6) || defined(FETCHMAIL_USE_SSL)
+.  if !defined(PKG_OPTIONS.fetchmail)
+.    if defined(KERBEROS)
+PKG_OPTIONS.fetchmail+=        kerberos4
+.    endif
+.    if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
+PKG_OPTIONS.fetchmail+=        inet6
+.    endif
+.    if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS])
+PKG_OPTIONS.fetchmail+=        ssl
+.    endif
+.  endif
+.endif
+PKG_OPTIONS.fetchmail?=        inet6 ssl
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.fetchmail
+PKG_SUPPORTED_OPTIONS= inet6 kerberos4 ssl
+.include "../../mk/bsd.options.mk"
+
+###
+### IPv6 support.
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-inet6
+.endif
+
+###
+### KPOP (POP3 + Kerberos 4) support.
+###
+.if !empty(PKG_OPTIONS:Mkerberos4)
+CRYPTO+=               uses Kerberos encryption code
+CONFIGURE_ARGS+=       --with-kerberos=yes
+.  if empty(MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386)
+REPLACE_KERBEROS_LIBS= yes
+.  endif
+.else
+CONFIGURE_ARGS+=       --with-kerberos=no
+.endif
+
+###
+### Support POP3 and IMAP over SSL.
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=       --without-ssl
+.endif