From owner-svn-ports-all@FreeBSD.ORG Mon Mar 17 01:05:35 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B7159D6; Mon, 17 Mar 2014 01:05:35 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 36D71A24; Mon, 17 Mar 2014 01:05:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2H15Zf4063071; Mon, 17 Mar 2014 01:05:35 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2H15YfX063069; Mon, 17 Mar 2014 01:05:34 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201403170105.s2H15YfX063069@svn.freebsd.org> From: Mark Felder Date: Mon, 17 Mar 2014 01:05:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348440 - in head/net-mgmt/nfsen: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 17 Mar 2014 01:05:35 -0000 Author: feld Date: Mon Mar 17 01:05:34 2014 New Revision: 348440 URL: http://svnweb.freebsd.org/changeset/ports/348440 QAT: https://qat.redports.org/buildarchive/r348440/ Log: Support STAGE Added: head/net-mgmt/nfsen/files/conf.php (contents, props changed) Deleted: head/net-mgmt/nfsen/files/pkg-install.in Modified: head/net-mgmt/nfsen/Makefile Modified: head/net-mgmt/nfsen/Makefile ============================================================================== --- head/net-mgmt/nfsen/Makefile Mon Mar 17 00:16:06 2014 (r348439) +++ head/net-mgmt/nfsen/Makefile Mon Mar 17 01:05:34 2014 (r348440) @@ -23,7 +23,6 @@ USES= iconv shebangfix perl5 USE_PHP= session pcre sockets NO_BUILD= yes PLIST_SUB+= PORTNAME=${PORTNAME} -SUB_FILES= pkg-install USE_RC_SUBR= nfsen perl_OLD_CMD= %%PERL%% SHEBANG_FILES= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend libexec/NfSenRRD.pm \ @@ -39,7 +38,6 @@ SUB_LIST+= "PREFIX=${PREFIX}" SUB_LIST+= "WWWDIR=${WWWDIR}" SUB_LIST+= "PORTNAME=${PORTNAME}" -NO_STAGE= yes post-patch: .for nfsenfile in ${REINPLACE_LIST} @${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/${nfsenfile} @@ -47,27 +45,27 @@ post-patch: .for perlfile in ${SHEBANG_FILES} @${REINPLACE_CMD} "s|perl -w$$|perl|" ${WRKSRC}/${perlfile} .endfor + ${CP} ${FILESDIR}/conf.php ${WRKSRC} + @${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/conf.php do-install: - ${INSTALL} -d ${PREFIX}/var/${PORTNAME}/profiles-data/live - ${INSTALL} -d ${PREFIX}/var/${PORTNAME}/profiles-stat/live - ${INSTALL} -d ${PREFIX}/var/${PORTNAME}/profiles/live - ${INSTALL} -d ${PREFIX}/var/${PORTNAME}/filters - ${INSTALL} -d ${PREFIX}/var/${PORTNAME}/run - ${INSTALL} -d ${PREFIX}/libexec/${PORTNAME}/plugins - ${INSTALL} -d ${WWWDIR}/plugins - (cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${PREFIX}/bin/) - ${INSTALL_DATA} ${WRKSRC}/etc/nfsen-dist.conf ${PREFIX}/etc/ - (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${WWWDIR}/) - (cd ${WRKSRC}/plugins/frontend/ && ${COPYTREE_SHARE} . ${WWWDIR}/plugins/) - (cd ${WRKSRC}/libexec && ${INSTALL_SCRIPT} * ${PREFIX}/libexec/${PORTNAME}/) - (cd ${WRKSRC}/plugins/backend && ${COPYTREE_SHARE} . ${PREFIX}/libexec/${PORTNAME}/plugins/) - ${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/ - ${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${PREFIX}/libexec/${PORTNAME}/ + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-data/live + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-stat/live + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles/live + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/filters + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/run + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins + ${INSTALL} -d ${STAGEDIR}/${WWWDIR}/plugins + (cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/bin/) + ${INSTALL_DATA} ${WRKSRC}/etc/nfsen-dist.conf ${STAGEDIR}/${PREFIX}/etc/ + (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/) + (cd ${WRKSRC}/plugins/frontend/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/) + (cd ${WRKSRC}/libexec && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/) + (cd ${WRKSRC}/plugins/backend && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins/) + ${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/ + ${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/ + ${INSTALL_DATA} ${WRKSRC}/conf.php ${STAGEDIR}/${WWWDIR} @${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary sources "; @${ECHO_MSG} "Then run 'nfsen reconfig' to correctly setup source, RRD, and profile files"; -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include Added: head/net-mgmt/nfsen/files/conf.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nfsen/files/conf.php Mon Mar 17 01:05:34 2014 (r348440) @@ -0,0 +1,8 @@ +