From dfec6618b2c1d1c617c668ccd3320757c0b2035c Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 11 Sep 2012 15:11:39 +0000 Subject: [PATCH] - Convert to new options framework - Add missing dependency on perl - Bump PORTREVISION due to added dependency Approved by: eadler, bapt (mentors, implicit) --- net-mgmt/ndoutils/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile index d7c4599bced6..0ebca05acc20 100644 --- a/net-mgmt/ndoutils/Makefile +++ b/net-mgmt/ndoutils/Makefile @@ -7,7 +7,7 @@ PORTNAME= ndoutils PORTVERSION= 1.4b8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION} @@ -16,8 +16,11 @@ COMMENT= Keep Nagios perfdata in MySQL or Postgresql database RUN_DEPENDS= ${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios -OPTIONS= MYSQL "MySQL Backend" on \ - PGSQL "Postgresql Backend" off +OPTIONS_MULTI= BACKEND +OPTIONS_MULTI_BACKEND= MYSQL PGSQL +OPTIONS_DEFAULT= MYSQL +MYSQL_DESC= MySQL backend support +PGSQL_DESC= Postgresql backend support MAKE_JOBS_UNSAFE= yes @@ -27,11 +30,13 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/ndoutils CFG_FILES= misccommands ndo2db ndomod +USE_PERL5= yes USE_RC_SUBR= ndo2db SUB_FILES= pkg-message .include -.if !defined(WITHOUT_MYSQL) + +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL=yes CONFIGURE_ARGS+= --enable-mysql \ --with-mysql-lib=${LOCALBASE}/lib/mysql \ @@ -40,7 +45,7 @@ CONFIGURE_ARGS+= --enable-mysql \ CONFIGURE_ARGS+= --disable-mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL=yes CONFIGURE_ARGS+= --enable-pgsql \ --with-pgsql-lib=${LOCALBASE}/lib/pgsql \ @@ -49,10 +54,6 @@ CONFIGURE_ARGS+= --enable-pgsql \ CONFIGURE_ARGS+= --disable-pgsql .endif -.if defined(WITHOUT_MYSQL) && defined(WITHOUT_PGSQL) -IGNORE= you should define at least 1 of WITH_MYSQL or WITH_PGSQL, WITH_MYSQL=yes is the default -.endif - .if !defined(NOPORTDOCS) PLIST_SUB+= PORTDOCS="" .else