svn commit: r319898 - in head/net-mgmt: nagios-devel nagios-portaudit pandorafms_agent pandorafms_console pandorafms_server weathermap
Baptiste Daroussin
bapt at FreeBSD.org
Tue Jun 4 19:13:33 UTC 2013
Author: bapt
Date: Tue Jun 4 19:13:31 2013
New Revision: 319898
URL: http://svnweb.freebsd.org/changeset/ports/319898
Log:
Convert to new options framework
Modified:
head/net-mgmt/nagios-devel/Makefile
head/net-mgmt/nagios-portaudit/Makefile
head/net-mgmt/pandorafms_agent/Makefile
head/net-mgmt/pandorafms_console/Makefile
head/net-mgmt/pandorafms_server/Makefile
head/net-mgmt/weathermap/Makefile
Modified: head/net-mgmt/nagios-devel/Makefile
==============================================================================
--- head/net-mgmt/nagios-devel/Makefile Tue Jun 4 19:05:00 2013 (r319897)
+++ head/net-mgmt/nagios-devel/Makefile Tue Jun 4 19:13:31 2013 (r319898)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: nagios-devel
-# Date created: 14 July 2007
-# Whom: Jarrod Sayers <jarrod at netleader.com.au>
-#
+# Created by: Jarrod Sayers <jarrod at netleader.com.au>
# $FreeBSD$
-#
PORTNAME= nagios
DISTVERSIONPREFIX=HEAD-
@@ -30,10 +26,11 @@ CONFLICTS= nagios-[123].*
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX:C/-$//}
-OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \
- NANOSLEEP "Use nanosleep in event timing" off \
- EVENT_BROKER "Enable event broker functionality" off \
- UNHANDLED_HACK "Display passive checks in unhandled queries" off
+OPTIONS_DEFINE= EMBEDDED_PERL NANOSLEEP EVENT_BROKER UNHANDLED_HACK
+EMBEDDED_PERL_DESC= Embedded Perl
+NANOSLEEP_DESC= Use nanosleep in event timing
+EVENT_BROKER_DESC= Event broker functionality
+UNHANDLED_HACK_DESC= Display passive checks in unhandled queries
GNU_CONFIGURE= yes
WANT_PHP_MOD= yes
@@ -95,7 +92,7 @@ SUB_LIST= PREFIX=${PREFIX} \
USE_PHP= yes
-.if defined(WITH_EMBEDDED_PERL)
+.if ${PORT_OPTIONS:MEMBEDDED_PERL}
USE_PERL5= yes
CONFIGURE_ARGS+= --enable-embedded-perl \
--with-perlcache
@@ -104,18 +101,18 @@ PLIST_SUB+= EMBEDDED_PERL=""
PLIST_SUB+= EMBEDDED_PERL="@comment "
.endif
-.if defined(WITH_NANOSLEEP)
+.if ${PORT_OPTIONS:MNANOSLEEP}
CONFIGURE_ARGS+= --enable-nanosleep
.endif
-.if defined(WITH_EVENT_BROKER)
+.if ${PORT_OPTIONS:MEVENT_BROKER}
CONFIGURE_ARGS+= --enable-event-broker
.else
CONFIGURE_ARGS+= --disable-event-broker
.endif
post-patch:
-.if defined(WITH_UNHANDLED_HACK)
+.if ${PORT_OPTIONS:MUNHANDLED_HACK}
@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
.endif
Modified: head/net-mgmt/nagios-portaudit/Makefile
==============================================================================
--- head/net-mgmt/nagios-portaudit/Makefile Tue Jun 4 19:05:00 2013 (r319897)
+++ head/net-mgmt/nagios-portaudit/Makefile Tue Jun 4 19:13:31 2013 (r319898)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: nagios-portaudit
-# Date created: 19 August 2008
-# Whom: rea-fbsd at codelabs.ru
-#
+# Created by: rea-fbsd at codelabs.ru
# $FreeBSD$
-#
PORTNAME= portaudit
PORTVERSION= 1.0
@@ -17,9 +13,11 @@ DISTNAME= check_portaudit-${PORTVERSION}
MAINTAINER= rea at FreeBSD.org
COMMENT= Nagios plug-in to get portaudit/portupgrade status
-OPTIONS= PORTAUDIT "Enable portaudit check" ON \
- PORTUPGRADE "Enable portupgrade check" ON \
- PORTUPGRADE_DEVEL "Use portupgrade-devel" OFF
+OPTIONS_DEFINE= PORTAUDIT PORTUPGRADE PORTUPGRADE_DEVEL
+OPTIONS_DEFAULT= PORTAUDIT PORTUPGRADE
+PORTAUDIT_DESC= Enable portaudit check
+PORTUPGRADE_DESC= Enable portupgrade check
+PORTUPGRADE_DEVEL_DESC= Use portupgrade-devel
USE_PERL5= yes
NO_WRKSUBDIR= yes
@@ -27,23 +25,23 @@ NO_BUILD= yes
.include <bsd.port.pre.mk>
-.if !defined(WITH_PORTUPGRADE) && !defined(WITH_PORTAUDIT) && !defined(WITH_PORTAUDIT_DEVEL)
+.if ! ${PORT_OPTIONS:MPORTUPGRADE} && ! ${PORT_OPTIONS:MPORTAUDIT} && ! ${PORT_OPTIONS:MPORTAUDIT_DEVEL}
IGNORE= unusable without portupgrade and portaudit
.endif
-.if defined(WITH_PORTUPGRADE) && defined(WITH_PORTUPGRADE_DEVEL)
+.if ${PORT_OPTIONS:MPORTUPGRADE} && ${PORT_OPTIONS:MPORTUPGRADE_DEVEL}
IGNORE= choose either portupgrade or portupgrade-devel, not both
.endif
-.if defined(WITH_PORTAUDIT)
+.if ${PORT_OPTIONS:MPORTAUDIT}
RUN_DEPENDS+= portaudit:${PORTSDIR}/ports-mgmt/portaudit
.endif
-.if defined(WITH_PORTUPGRADE)
+.if ${PORT_OPTIONS:MPORTUPGRADE}
RUN_DEPENDS+= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
.endif
-.if defined(WITH_PORTUPGRADE_DEVEL)
+.if ${PORT_OPTIONS:MPORTUPGRADE_DEVEL}
RUN_DEPENDS+= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade-devel
.endif
Modified: head/net-mgmt/pandorafms_agent/Makefile
==============================================================================
--- head/net-mgmt/pandorafms_agent/Makefile Tue Jun 4 19:05:00 2013 (r319897)
+++ head/net-mgmt/pandorafms_agent/Makefile Tue Jun 4 19:13:31 2013 (r319898)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pandorafms_agent
-# Date created: 2011-11-22
-# Whom: KIKUCHI Koichiro <koichiro at rworks.jp>
-#
+# Created by: KIKUCHI Koichiro <koichiro at rworks.jp>
# $FreeBSD$
-#
PORTNAME= pandora_agent
PORTVERSION= ${PANDORA_VERSION}
@@ -16,7 +12,9 @@ COMMENT= Pandora FMS agent, Perl version
LICENSE= ${PANDORA_LICENSE}
LICENSE_FILE= ${PANDORA_LICENSE_FILE}
-OPTIONS= TENTACLE_SERVER "Install tentalce_server" on
+OPTIONS_DEFINE= TENTACLE_SERVER
+OPTIONS_DEFAULT= TENTACLE_SERVER
+TENTACLE_SERVER_DESC= Install tentalce_server
USE_PERL5= yes
SUB_LIST+= PERL="${PERL}"
@@ -33,7 +31,7 @@ PORTDOCS+= README
.include <bsd.port.pre.mk>
-.if defined(WITH_TENTACLE_SERVER)
+.if ${PORT_OPTIONS:MTENTACLE_SERVER}
CONFLICTS= pandora_server-4*
PLIST_SUB+= TENTACLE_SERVER=""
.else
@@ -41,7 +39,7 @@ PLIST_SUB+= TENTACLE_SERVER="@comment "
.endif
post-patch:
-.if !defined(WITH_TENTACLE_SERVER)
+.if ! ${PORT_OPTIONS:MTENTACLE_SERVER}
@${REINPLACE_CMD} \
-e '/TENTACLE_SERVER/s/^/#/' \
${WRKSRC}/pandora_agent_installer
@@ -77,7 +75,7 @@ do-install:
@cd ${WRKSRC} && ${SH} pandora_agent_installer --force-install
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for x in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${x} ${DOCSDIR}
Modified: head/net-mgmt/pandorafms_console/Makefile
==============================================================================
--- head/net-mgmt/pandorafms_console/Makefile Tue Jun 4 19:05:00 2013 (r319897)
+++ head/net-mgmt/pandorafms_console/Makefile Tue Jun 4 19:13:31 2013 (r319898)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pandorafms_console
-# Date created: 2011-11-21
-# Whom: KIKUCHI Koichiro <koichiro at rworks.jp>
-#
+# Created by: KIKUCHI Koichiro <koichiro at rworks.jp>
# $FreeBSD$
-#
PORTNAME= pandora_console
PORTVERSION= ${PANDORA_VERSION}
@@ -18,7 +14,8 @@ LICENSE_FILE= ${PANDORA_LICENSE_FILE}
RUN_DEPENDS= ${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz
-OPTIONS= PGSQL "Use PostgreSQL backend (experimental)" off
+OPTIONS_DEFINE= PGSQL
+PGSQL_DESC= Use PostgreSQL backend (experimental)
USE_APACHE_RUN= 22+
USE_PHP= curl gd gettext json ldap mbstring mysql snmp session \
@@ -32,7 +29,7 @@ SUB_LIST+= APACHEETCDIR=${PREFIX}/${APAC
.include <bsd.port.pre.mk>
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
@@ -52,7 +49,7 @@ do-install:
@cd ${WRKSRC} && ${SH} pandora_console_install --force-install
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for x in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${x} ${DOCSDIR}
Modified: head/net-mgmt/pandorafms_server/Makefile
==============================================================================
--- head/net-mgmt/pandorafms_server/Makefile Tue Jun 4 19:05:00 2013 (r319897)
+++ head/net-mgmt/pandorafms_server/Makefile Tue Jun 4 19:13:31 2013 (r319898)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pandorafms_server
-# Date created: 2011-11-22
-# Whom: KIKUCHI Koichiro <koichiro at rworks.jp>
-#
+# Created by: KIKUCHI Koichiro <koichiro at rworks.jp>
# $FreeBSD$
-#
PORTNAME= pandora_server
PORTVERSION= ${PANDORA_VERSION}
@@ -38,11 +34,13 @@ RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/datab
${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \
p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
-OPTIONS= TENTACLE "Install tentacle_server" on \
- XPROBE "Install xprobe" on \
- PGSQL "Use PostgreSQL backend (experimental)" off \
- ORACLE "Use Oracle backend (experimental)" off \
- EXTRAS "Extra dependencies for util scripts" on
+OPTIONS_DEFINE= TENTACLE XPROBE PGSQL ORACLE EXTRAS
+OPTIONS_DEFAULT= TENTACLE XPROBE EXTRAS
+TENTACLE_DESC= Install tentacle_server
+XPROBE_DESC= Install xprobe
+PGSQL_DESC= Use PostgreSQL backend (experimental)
+ORACLE_DESC= Use Oracle backend (experimental)
+EXTRAS_DESC= Extra dependencies for util scripts
PERL_CONFIGURE= yes
SUB_LIST+= PERL="${PERL}"
@@ -66,23 +64,23 @@ PORTDOCS+= README
.include <bsd.port.pre.mk>
-.if defined(WITHOUT_TENTACLE)
+.if ! ${PORT_OPTIONS:MTENTACLE}
PLIST_SUB+= TENTACLE="@comment "
.else
PLIST_SUB+= TENTACLE=""
USE_RC_SUBR+= tentacle_server
MAN1+= tentacle_server.1
.endif
-.if defined(WITH_XPROBE)
+.if ${PORT_OPTIONS:MXPROBE}
RUN_DEPENDS+= ${LOCALBASE}/bin/xprobe2:${PORTSDIR}/net/xprobe
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
-.if defined(WITH_ORACLE)
+.if ${PORT_OPTIONS:MORACLE}
RUN_DEPENDS+= p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle
.endif
-.if defined(WITH_EXTRAS)
+.if ${PORT_OPTIONS:MEXTRAS}
# plugin/bgp_pluin.pl
RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
# plugin/multicast.pl
@@ -124,7 +122,7 @@ post-patch:
`${GREP} -rl /usr/bin/perl ${WRKSRC} | ${GREP} -v pandora_server_installer`
post-install:
-.if defined(WITH_TENTACLE)
+.if ${PORT_OPTIONS:MTENTACLE}
@cd ${WRKSRC} && ${SH} pandora_server_installer --install
.else
@cd ${WRKSRC} && ${SH} pandora_server_installer --install --no-tentacle
Modified: head/net-mgmt/weathermap/Makefile
==============================================================================
--- head/net-mgmt/weathermap/Makefile Tue Jun 4 19:05:00 2013 (r319897)
+++ head/net-mgmt/weathermap/Makefile Tue Jun 4 19:13:31 2013 (r319898)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: weathermap
-# Date created: 2007-05-03
-# Whom: Felippe de Meirelles Motta <lippe at freebsdbrasil.com.br>
-#
+# Created by: Felippe de Meirelles Motta <lippe at freebsdbrasil.com.br>
# $FreeBSD$
-#
PORTNAME= weathermap
PORTVERSION= 1.1.1
@@ -21,7 +17,8 @@ RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphi
NO_BUILD= yes
USE_PERL5= yes
-OPTIONS= WGET "Enable WGET support" OFF
+OPTIONS_DEFINE= WGET
+WGET_DESC= WGET support
PORTDOCS= README LICENSE INSTALL
@@ -32,7 +29,7 @@ SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
-.if defined(WITH_WGET)
+.if ${PORT_OPTIONS:MWGET}
RUN_DEPENDS+= wget:${PORTSDIR}/ftp/wget
.endif
@@ -49,7 +46,7 @@ do-install:
@${INSTALL_DATA} ${WRKSRC}/example/weathermap.conf ${PREFIX}/etc/weathermap/weathermap.sample.conf
@[ -f ${PREFIX}/etc/weathermap/weathermap.conf ] || \
${INSTALL_DATA} ${WRKSRC}/example/weathermap.conf ${PREFIX}/etc/weathermap/weathermap.conf
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
More information about the svn-ports-all
mailing list