svn commit: r304099 - head/net-mgmt/ndoutils
Bryan Drewery
bdrewery at FreeBSD.org
Tue Sep 11 15:11:40 UTC 2012
Author: bdrewery
Date: Tue Sep 11 15:11:39 2012
New Revision: 304099
URL: http://svn.freebsd.org/changeset/ports/304099
Log:
- Convert to new options framework
- Add missing dependency on perl
- Bump PORTREVISION due to added dependency
Approved by: eadler, bapt (mentors, implicit)
Modified:
head/net-mgmt/ndoutils/Makefile
Modified: head/net-mgmt/ndoutils/Makefile
==============================================================================
--- head/net-mgmt/ndoutils/Makefile Tue Sep 11 14:27:22 2012 (r304098)
+++ head/net-mgmt/ndoutils/Makefile Tue Sep 11 15:11:39 2012 (r304099)
@@ -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 o
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}/
CFG_FILES= misccommands ndo2db ndomod
+USE_PERL5= yes
USE_RC_SUBR= ndo2db
SUB_FILES= pkg-message
.include <bsd.port.options.mk>
-.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
More information about the svn-ports-head
mailing list