[pkgsrc/trunk]: pkgsrc Use bsd.options.mk framework for flow-tools package.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b72ddb691dd
branches:  trunk
changeset: 479258:2b72ddb691dd
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Aug 09 22:37:34 2004 +0000

description:
Use bsd.options.mk framework for flow-tools package.

diffstat:

 mk/bsd.pkg.defaults.mk  |  14 +-------------
 net/flow-tools/Makefile |  29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 24 deletions(-)

diffs (82 lines):

diff -r 4e2ce518cfdf -r 2b72ddb691dd mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Mon Aug 09 21:42:28 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Mon Aug 09 22:37:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.275 2004/08/07 21:03:59 minskim Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.276 2004/08/09 22:37:34 seb Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -917,18 +917,6 @@
 # Possible: YES, NO
 # Default: NO
 
-FLOW_TOOLS_USE_MYSQL?= NO
-# Used by flow-tools to enable support of flow records export
-# into a MySQL database.
-# Possible: YES, NO
-# Default: NO
-
-FLOW_TOOLS_USE_POSTGRESQL?=    NO
-# Used by flow-tools to enable support of flow records export
-# into a PostgreSQL database.
-# Possible: YES, NO
-# Default: NO
-
 #FLUXBOX_USE_XINERAMA?=        NO
 # Compile flukebox with xinerama extensions
 # Possible: YES, NO
diff -r 4e2ce518cfdf -r 2b72ddb691dd net/flow-tools/Makefile
--- a/net/flow-tools/Makefile   Mon Aug 09 21:42:28 2004 +0000
+++ b/net/flow-tools/Makefile   Mon Aug 09 22:37:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/24 22:45:15 recht Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/09 22:37:34 seb Exp $
 
 DISTNAME=      flow-tools-0.67
 CATEGORIES=    net
@@ -15,9 +15,6 @@
 PKG_SYSCONFSUBDIR=     flow-tools
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
-BUILD_DEFS+=   FLOW_TOOLS_USE_MYSQL
-BUILD_DEFS+=   FLOW_TOOLS_USE_POSTGRESQL
-
 EGDIR=         ${PREFIX}/share/examples/flow-tools
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/sym
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/cfg
@@ -30,17 +27,27 @@
 .endfor
 MESSAGE_SUBST+=        EGDIR=${EGDIR}
 
-.include "../../mk/bsd.prefs.mk"
+# legacy options
+.if defined(FLOW_TOOLS_USE_MYSQL) && !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS])
+PKG_OPTIONS.flow-tools+=       mysql
+.endif
+.if defined(FLOW_TOOLS_USE_POSTGRESQL) && !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
+PKG_OPTIONS.flow-tools+=       postgresql
+.endif
 
-# MySQL support
-.if defined(FLOW_TOOLS_USE_MYSQL) && !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS])
-.include "../../databases/mysql-client/buildlink3.mk"
+PKG_OPTIONS_VAR=       PKG_OPTIONS.flow-tools
+PKG_SUPPORTED_OPTIONS= mysql postgresql
+.include "../../mk/bsd.options.mk"
+
+# MySQL support.
+.if !empty(PKG_OPTIONS:Mmysql)
+.  include "../../databases/mysql-client/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
 .endif
 
-# Postgresql support
-.if defined(FLOW_TOOLS_USE_POSTGRESQL) && !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
-.include "../../mk/pgsql.buildlink3.mk"
+# PostgreSQL support.
+.if !empty(PKG_OPTIONS:Mpostgresql)
+.  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-pgsql=${PGSQL_PREFIX}
 .endif