From owner-svn-ports-head@FreeBSD.ORG Sun Jul 20 19:21:26 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AADE0104; Sun, 20 Jul 2014 19:21:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 980BC231E; Sun, 20 Jul 2014 19:21:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6KJLQiK021705; Sun, 20 Jul 2014 19:21:26 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6KJLQaQ021703; Sun, 20 Jul 2014 19:21:26 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201407201921.s6KJLQaQ021703@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sun, 20 Jul 2014 19:21:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362355 - in head/net-mgmt/nagiosql: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2014 19:21:26 -0000 Author: danilo Date: Sun Jul 20 19:21:25 2014 New Revision: 362355 URL: http://svnweb.freebsd.org/changeset/ports/362355 QAT: https://qat.redports.org/buildarchive/r362355/ Log: - Add stage support - Convert USE_BZIP2 to USES - Use options helpers - Remove SSH2 option Approved by: portmgr (blanket) Deleted: head/net-mgmt/nagiosql/files/pkg-install.in Modified: head/net-mgmt/nagiosql/Makefile head/net-mgmt/nagiosql/pkg-plist Modified: head/net-mgmt/nagiosql/Makefile ============================================================================== --- head/net-mgmt/nagiosql/Makefile Sun Jul 20 19:20:50 2014 (r362354) +++ head/net-mgmt/nagiosql/Makefile Sun Jul 20 19:21:25 2014 (r362355) @@ -17,9 +17,8 @@ LICENSE= GPLv2 RUN_DEPENDS= nagios:${PORTSDIR}/net-mgmt/nagios \ ${PEARDIR}/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT -USE_BZIP2= yes USE_MYSQL= yes -USES= gettext +USES= gettext tar:bzip2 USE_PHP= mysql filter gettext session simplexml WANT_PHP_WEB= yes @@ -30,30 +29,17 @@ NAGIOSUSER?= nagios NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}32 -SUB_FILES= pkg-message pkg-install -SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NAGIOSUSER=${NAGIOSUSER} +SUB_FILES= pkg-message +PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NAGIOSUSER=${NAGIOSUSER} PEARDIR?= ${LOCALBASE}/share/pear -OPTIONS_DEFINE= CURL FTP SSH2 +OPTIONS_DEFINE= CURL FTP CURL_DESC= Configure with cURL support FTP_DESC= Configure with FTP support -SSH2_DESC= Configure with SSH2 support -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MCURL} -USE_PHP+= curl -.endif - -.if ${PORT_OPTIONS:MFTP} -USE_PHP+= ftp -.endif - -.if ${PORT_OPTIONS:MSSH2} -USE_PHP+= ssh2 -.endif +CURL_USE= PHP=curl +FTP_USE= PHP=ftp post-patch: ${REINPLACE_CMD} -e "s|\'/etc/nagiosql/|\'${ETCDIR}/|g" \ @@ -71,12 +57,15 @@ post-patch: ${WRKSRC}/install/install.php do-install: - @${MKDIR} ${WWWDIR} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} "! ( -name *\.orig -o -name *\.bak )") - @${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/config - -post-install: - @${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${WWWDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR}/ssh + @${MKDIR} ${STAGEDIR}${ETCDIR}/hosts + @${MKDIR} ${STAGEDIR}${ETCDIR}/services + @${MKDIR} ${STAGEDIR}${ETCDIR}/backup + @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/hosts + @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/services + @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/ssh + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.orig -o -name *\.bak )") .include Modified: head/net-mgmt/nagiosql/pkg-plist ============================================================================== --- head/net-mgmt/nagiosql/pkg-plist Sun Jul 20 19:20:50 2014 (r362354) +++ head/net-mgmt/nagiosql/pkg-plist Sun Jul 20 19:21:25 2014 (r362355) @@ -487,9 +487,16 @@ @dirrm %%WWWDIR%%/config/locale/da_DK/LC_MESSAGES @dirrm %%WWWDIR%%/config/locale/da_DK @dirrm %%WWWDIR%%/config/locale +@owner %%WWWOWN%% +@group %%WWWGRP%% @dirrmtry %%WWWDIR%%/config +@group +@owner @dirrm %%WWWDIR%%/admin @dirrmtry %%WWWDIR%% +@mode 750 +@owner %%WWWOWN%% +@group %%NAGIOSUSER%% @dirrmtry %%ETCDIR%%/ssh @dirrmtry %%ETCDIR%%/services @dirrmtry %%ETCDIR%%/hosts @@ -498,3 +505,6 @@ @dirrmtry %%ETCDIR%%/backup/hosts @dirrmtry %%ETCDIR%%/backup @dirrmtry %%ETCDIR%% +@mode +@owner +@group