diff options
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 14 | ||||
| -rw-r--r-- | net/flow-tools/Makefile | 29 |
2 files changed, 19 insertions, 24 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index a5f62a21dd0..d41ffbe1d1a 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -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 @@ EZMLM_IDX_USE_PGSQL?= NO # 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 --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index 17ba4107020..fec3e3ee40b 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -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 @@ USE_PKGINSTALL= YES 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 @@ SUPPORT_FILES+= ${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_} .endfor MESSAGE_SUBST+= EGDIR=${EGDIR} -.include "../../mk/bsd.prefs.mk" - -# MySQL support +# legacy options .if defined(FLOW_TOOLS_USE_MYSQL) && !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS]) -.include "../../databases/mysql-client/buildlink3.mk" +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 + +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 |