Split out wget's options into an options.mk.

Migrate WET_USE_SSL to PKG_OPTIONS.wget=ssl (on by default, as previously).

3 files changed, 37 insertions, 25 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 43a39c6b6cd..e585788fea9 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.25 2005/02/09 15:53:50 abs Exp $
+# $NetBSD: mk.conf,v 1.26 2005/02/09 17:51:47 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -2157,11 +2157,6 @@ W3M_USE_UNICODE?=		NO
 # Possible: YES, NO
 # Default: NO
 
-WGET_USE_SSL?=	YES
-# Enable SSL in wget (for https connections)
-# Possible: YES, NO
-# Default: YES
-
 #WDM_MANAGERS?=
 # Is a space-separated list of window managers for x11/wdm to support.
 # Possible: any space-separated list of window managers
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 5b2b4a5f28b..588a2581069 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/02/09 11:42:38 bouyer Exp $
+# $NetBSD: Makefile,v 1.80 2005/02/09 17:51:47 tv Exp $
 
 DISTNAME=	wget-1.9.1
 PKGREVISION=	5
@@ -28,24 +28,7 @@ CONF_FILES=		${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc
 INFO_FILES=		wget.info
 
 .include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		WGET_USE_SSL
-.if !empty(WGET_USE_SSL:M[Yy][Ee][Ss])
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
-.endif
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.wget
-PKG_SUPPORTED_OPTIONS=	inet6
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+.include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wget/options.mk b/net/wget/options.mk
new file mode 100644
index 00000000000..7fa47622382
--- /dev/null
+++ b/net/wget/options.mk
@@ -0,0 +1,34 @@
+# $NetBSD: options.mk,v 1.1 2005/02/09 17:51:47 tv Exp $
+
+# Global and legacy options
+.if defined(WGET_USE_SSL)
+BUILD_DEFS+=		WGET_USE_SSL
+.  if !empty(WGET_USE_SSL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	ssl
+.  endif
+.else
+PKG_DEFAULT_OPTIONS+=	ssl # on by default
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.wget
+PKG_SUPPORTED_OPTIONS=	inet6 ssl
+.include "../../mk/bsd.options.mk"
+
+###
+### Support IPv6
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+###
+### Support SSL
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=--without-ssl
+.endif