[pkgsrc/trunk]: pkgsrc Move jwhois to the package options framework.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31edd3017fcb
branches:  trunk
changeset: 500205:31edd3017fcb
user:      agc <agc%pkgsrc.org@localhost>
date:      Mon Oct 03 21:18:55 2005 +0000

description:
Move jwhois to the package options framework.

With thanks to Thomas Klausner for clueing me in - all mistakes are mine.

diffstat:

 mk/defaults/mk.conf             |   7 +------
 mk/defaults/options.description |   1 +
 net/jwhois/Makefile             |  12 ++----------
 net/jwhois/options.mk           |  15 +++++++++++++++
 4 files changed, 19 insertions(+), 16 deletions(-)

diffs (77 lines):

diff -r 9cd5fb7670ee -r 31edd3017fcb mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Mon Oct 03 21:15:17 2005 +0000
+++ b/mk/defaults/mk.conf       Mon Oct 03 21:18:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.78 2005/08/13 11:25:14 dillo Exp $
+# $NetBSD: mk.conf,v 1.79 2005/10/03 21:18:55 agc Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1145,11 +1145,6 @@
 # Possible: any directory
 # Default: ${JAVA_HOME}/jsdk
 
-#JWHOIS_ENABLE_CACHE=
-# Enable cache option in net/jwhois package.
-# Possible: defined or not defined.
-# Default: not defined.
-
 #KERBEROS=
 # Used in many packages to specify use of a Kerberos (or compatible)
 # subsystem.  Requires Kerberos libraries in /usr/lib.
diff -r 9cd5fb7670ee -r 31edd3017fcb mk/defaults/options.description
--- a/mk/defaults/options.description   Mon Oct 03 21:15:17 2005 +0000
+++ b/mk/defaults/options.description   Mon Oct 03 21:18:55 2005 +0000
@@ -132,6 +132,7 @@
 java   
 jpeg                   Enable JPEG support.
 jpilot 
+jwhois                 Enable cache support.
 kde    
 kerberos               Enable Kerberos support.
 kerberos4              Enable Kerberos4 support.
diff -r 9cd5fb7670ee -r 31edd3017fcb net/jwhois/Makefile
--- a/net/jwhois/Makefile       Mon Oct 03 21:15:17 2005 +0000
+++ b/net/jwhois/Makefile       Mon Oct 03 21:18:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/05/24 07:43:07 kleink Exp $
+# $NetBSD: Makefile,v 1.55 2005/10/03 21:18:55 agc Exp $
 #
 
 DISTNAME=              jwhois-3.2.2
@@ -20,15 +20,7 @@
 
 INFO_FILES=            jwhois.info
 
-BUILD_DEFS+=           JWHOIS_ENABLE_CACHE
-
-.if defined(JWHOIS_ENABLE_CACHE)
-CONFIGURE_ARGS+=       --with-cache
-CONF_FILES_PERMS=      /dev/null /${VARBASE}/db/jwhois.db      \
-                       ${ROOT_USER} nogroup 0666
-.else
-CONFIGURE_ARGS+=       --without-cache
-.endif
+.include "options.mk"
 
 EGDIR=                 ${PREFIX}/share/examples/jwhois
 CONF_FILES=            ${EGDIR}/jwhois.conf.default    \
diff -r 9cd5fb7670ee -r 31edd3017fcb net/jwhois/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/jwhois/options.mk     Mon Oct 03 21:18:55 2005 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2005/10/03 21:18:55 agc Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.jwhois
+PKG_SUPPORTED_OPTIONS= jwhois-enable-cache
+PKG_OPTIONS_LEGACY_VARS=JWHOIS_ENABLE_CACHE:jwhois-enable-cache
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjwhois-enable-cache)
+CONFIGURE_ARGS+=       --with-cache
+CONF_FILES_PERMS=      /dev/null /${VARBASE}/db/jwhois.db      \
+                       ${ROOT_USER} nogroup 0666
+.else
+CONFIGURE_ARGS+=       --without-cache
+.endif