From owner-svn-ports-all@FreeBSD.ORG Sat Jul 28 14:04:29 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12BAF106566B; Sat, 28 Jul 2012 14:04:29 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F17478FC0C; Sat, 28 Jul 2012 14:04:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6SE4S9F033538; Sat, 28 Jul 2012 14:04:28 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6SE4SCc033535; Sat, 28 Jul 2012 14:04:28 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201207281404.q6SE4SCc033535@svn.freebsd.org> From: Lars Engels Date: Sat, 28 Jul 2012 14:04:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301659 - head/net-mgmt/icinga X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2012 14:04:29 -0000 Author: lme Date: Sat Jul 28 14:04:28 2012 New Revision: 301659 URL: http://svn.freebsd.org/changeset/ports/301659 Log: - Update to 1.7.1 - Change to new OPTIONS framework - Don't depend on specific lib versions Modified: head/net-mgmt/icinga/Makefile (contents, props changed) head/net-mgmt/icinga/distinfo (contents, props changed) Modified: head/net-mgmt/icinga/Makefile ============================================================================== --- head/net-mgmt/icinga/Makefile Sat Jul 28 14:02:13 2012 (r301658) +++ head/net-mgmt/icinga/Makefile Sat Jul 28 14:04:28 2012 (r301659) @@ -6,8 +6,7 @@ # PORTNAME= icinga -PORTVERSION= 1.7.0 -PORTREVISION= 3 +PORTVERSION= 1.7.1 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -16,7 +15,7 @@ COMMENT= Enterprise grade open source mo LICENSE= GPLv2 -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins USE_ICONV= yes @@ -24,14 +23,6 @@ USE_PERL5_BUILD= yes USE_AUTOTOOLS= autoconf libltdl USE_RC_SUBR= icinga -OPTIONS= EMBEDDED_PERL "Enable embedded Perl" on \ - NANOSLEEP "Use nanosleep in event timing" off \ - UNHANDLED_HACK "Display passive checks in unhandled queries" off \ - IDOUTILS "Enable IDOUtils" on \ - PGSQL "Enable support for PostgreSQL" off \ - MYSQL "Depend on MySQL" off \ - APACHE "Depend on Apache and install webconfig" off - GNU_CONFIGURE= yes ICINGAUSER?= icinga @@ -46,8 +37,6 @@ ICINGAWWWDIR?= www/icinga ICINGAHTMURL?= /icinga ICINGACGIURL?= ${ICINGAHTMURL}/cgi-bin -.include - CPPFLAGS+= -I${LOCALBASE}/include -fPIC CFLAGS+= ${CPPFLAGS} @@ -94,7 +83,17 @@ SUB_FILES= pkg-install \ SUB_LIST= PREFIX=${PREFIX} \ ${PLIST_SUB} -.if defined(WITH_EMBEDDED_PERL) +OPTIONS_DEFINE= EMBEDDED_PERL NANOSLEEP UNHANDLED_HACK IDOUTILS PGSQL MYSQL APACHE +OPTIONS_DEFAULT= EMBEDDED_PERL IDOUTILS + +EMBEDDED_PERL_DESC= Enable embedded Perl +NANOSLEEP_DESC= Use nanosleep in event timing +UNHANDLED_HACK_DESC= Display passive checks in unhandled queries +APACHE_DESC= Depend on Apache and install webconfig + +.include + +.if ${PORT_OPTIONS:MEMBEDDED_PERL} USE_PERL5= 5.8.0+ CONFIGURE_ARGS+= --enable-embedded-perl \ --with-perlcache @@ -103,12 +102,12 @@ 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_IDOUTILS) -LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi-drivers +.if ${PORT_OPTIONS:MIDOUTILS} +LIB_DEPENDS+= dbi:${PORTSDIR}/databases/libdbi-drivers CONFIGURE_ARGS+= --enable-idoutils \ --enable-ssl \ --with-dbi-lib=${LOCALBASE}/lib \ @@ -120,16 +119,16 @@ PLIST_SUB+= IDOUTILS="" PLIST_SUB+= IDOUTILS="@comment " .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --enable-pgsql .endif -.if defined(WITH_APACHE) +.if ${PORT_OPTIONS:MAPACHE} USE_APACHE= 22+ CONFIGURE_ARGS+= --with-httpd-conf=${LOCALBASE}/${APACHEETCDIR}/extra INSTALL_TARGET+= install-webconf @@ -142,7 +141,7 @@ post-patch: @${REINPLACE_CMD} -e 's#/bin/ping#/sbin/ping#' ${WRKSRC}/sample-config/cgi.cfg.in @${REINPLACE_CMD} -e 's#Linux#FreeBSD#' ${WRKSRC}/sample-config/icinga.cfg.in @${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' ${WRKSRC}/html/Makefile.in -.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/menu.html.in .endif @@ -165,4 +164,4 @@ post-install: @${CHOWN} ${ICINGAUSER}:${WWWGRP} ${ICINGADIR}/rw @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/net-mgmt/icinga/distinfo ============================================================================== --- head/net-mgmt/icinga/distinfo Sat Jul 28 14:02:13 2012 (r301658) +++ head/net-mgmt/icinga/distinfo Sat Jul 28 14:04:28 2012 (r301659) @@ -1,2 +1,2 @@ -SHA256 (icinga-1.7.0.tar.gz) = e0d033e37bd3c4fb6a35151cc94aae4ca8e730510d9156ea755245728f8acb8b -SIZE (icinga-1.7.0.tar.gz) = 12939198 +SHA256 (icinga-1.7.1.tar.gz) = 86662178fae6a3618340b2d0b0fad5033439556649f79214a9a2331c10c2cab6 +SIZE (icinga-1.7.1.tar.gz) = 12938365