From owner-svn-ports-all@FreeBSD.ORG Fri May 30 05:31:47 2014 Return-Path: Delivered-To: svn-ports-all@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 2CE92684; Fri, 30 May 2014 05:31:47 +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 1A06B200E; Fri, 30 May 2014 05:31:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U5VkCL049200; Fri, 30 May 2014 05:31:46 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4U5Vkev049197; Fri, 30 May 2014 05:31:46 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201405300531.s4U5Vkev049197@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 30 May 2014 05:31:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355780 - in head/net-mgmt/hawk: . 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.18 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: Fri, 30 May 2014 05:31:47 -0000 Author: sunpoet Date: Fri May 30 05:31:46 2014 New Revision: 355780 URL: http://svnweb.freebsd.org/changeset/ports/355780 QAT: https://qat.redports.org/buildarchive/r355780/ Log: - Add LICENSE - Use ETCDIR - Support STAGEDIR - Pass maintainership to submitter - While I'm here: - Use NO_BUILD - Simplify Makefile PR: ports/190311 Submitted by: Muhammad Moinur Rahman <5u623l20@gmail.com> Added: head/net-mgmt/hawk/files/pkg-message.in (contents, props changed) Modified: head/net-mgmt/hawk/Makefile head/net-mgmt/hawk/pkg-plist Modified: head/net-mgmt/hawk/Makefile ============================================================================== --- head/net-mgmt/hawk/Makefile Fri May 30 05:31:39 2014 (r355779) +++ head/net-mgmt/hawk/Makefile Fri May 30 05:31:46 2014 (r355780) @@ -2,69 +2,53 @@ PORTNAME= hawk PORTVERSION= 0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/iphawk/iphawk/Hawk%20${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= 5u623l20@gmail.com COMMENT= Track uptime and DNS status for machines on your networks -RUN_DEPENDS= p5-Net-Netmask>0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \ - p5-Net-Ping-External>0:${PORTSDIR}/net/p5-Net-Ping-External \ - p5-DBI>0:${PORTSDIR}/databases/p5-DBI \ - p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql +LICENSE= GPLv2 + +RUN_DEPENDS= p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \ + p5-Net-Ping-External>=0:${PORTSDIR}/net/p5-Net-Ping-External \ + p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ + p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql USES= perl5 USE_MYSQL= server USE_PHP= mysql WANT_PHP_MOD= yes +NO_BUILD= yes USE_RC_SUBR= hawk SUB_LIST= PERL=${PERL} +SUB_FILES= pkg-message -NO_STAGE= yes -post-patch: - @${SED} -e 's#%%PREFIX%%#${PREFIX}#' \ - ${WRKSRC}/daemon/hawk > ${WRKSRC}/daemon/hawk.sed - @${MV} ${WRKSRC}/daemon/hawk.sed ${WRKSRC}/daemon/hawk - @${SED} -e 's#hawk.conf.inc#${PREFIX}/etc/hawk/php.conf#' \ - ${WRKSRC}/php/hawk.php > ${WRKSRC}/php/hawk.php.sed - @${MV} ${WRKSRC}/php/hawk.php.sed ${WRKSRC}/php/hawk.php +OPTIONS_DEFINE= DOCS -do-build: -# Empty target, nothing to build +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ + ${WRKSRC}/daemon/hawk + @${REINPLACE_CMD} -e 's|hawk.conf.inc|${PREFIX}/etc/hawk/php.conf|' \ + ${WRKSRC}/php/hawk.php do-install: - ${MKDIR} ${PREFIX}/etc/hawk - ${INSTALL_DATA} ${WRKSRC}/daemon/hawk.conf ${PREFIX}/etc/hawk/daemon.conf.sample - ${INSTALL_SCRIPT} ${WRKSRC}/daemon/hawk ${PREFIX}/sbin - ${MKDIR} ${WWWDIR}/images + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/daemon/hawk.conf ${STAGEDIR}${ETCDIR}/daemon.conf.sample + ${INSTALL_SCRIPT} ${WRKSRC}/daemon/hawk ${STAGEDIR}${PREFIX}/sbin + ${MKDIR} ${STAGEDIR}${WWWDIR}/images (for f in ${WRKSRC}/php/images/* ${FILESDIR}/favicon.ico; do \ - ${INSTALL_DATA} $$f ${WWWDIR}/images; \ + ${INSTALL_DATA} $$f ${STAGEDIR}${WWWDIR}/images; \ done) - ${INSTALL_DATA} ${WRKSRC}/php/hawk.php ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/php/hawk.css ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/php/hawk.conf.inc \ - ${PREFIX}/etc/hawk/php.conf.sample -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/create_hawk_db.sql ${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/create_hawk_user.sql ${DOCSDIR} -.endif - -PKGMESSAGE= ${WRKDIR}/pkg-message - -post-install: - @${ECHO} '******************************************************************************' > ${PKGMESSAGE} - @${ECHO} '*** See ${PREFIX}/share/doc/hawk/create_hawk* for instructions on ***' >> ${PKGMESSAGE} - @${ECHO} '*** creating the database and user that the PHP code expects. ***' >> ${PKGMESSAGE} - @${ECHO} '*** ***' >> ${PKGMESSAGE} - @${ECHO} '*** Copy daemon.conf.sample and php.conf.sample to their non-sample ***' >> ${PKGMESSAGE} - @${ECHO} '*** names in ${PREFIX}/etc/hawk, and configure local networks, etc. ***' >> ${PKGMESSAGE} - @${ECHO} '******************************************************************************' >> ${PKGMESSAGE} - - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/php/hawk.php ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/php/hawk.css ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/php/hawk.conf.inc ${STAGEDIR}${ETCDIR}/php.conf.sample + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/create_hawk_db.sql ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/create_hawk_user.sql ${STAGEDIR}${DOCSDIR} .include Added: head/net-mgmt/hawk/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/hawk/files/pkg-message.in Fri May 30 05:31:46 2014 (r355780) @@ -0,0 +1,8 @@ +****************************************************************************** +**** See %%PREFIX%%/share/doc/hawk/create_hawk* for instructions on **** +**** creating the database and user that the PHP code expects. **** +**** **** +**** Copy daemon.conf.sample and php.conf.sample to their non-sample **** +**** names in %%ETCDIR%% and configure local networks, etc. **** +****************************************************************************** + Modified: head/net-mgmt/hawk/pkg-plist ============================================================================== --- head/net-mgmt/hawk/pkg-plist Fri May 30 05:31:39 2014 (r355779) +++ head/net-mgmt/hawk/pkg-plist Fri May 30 05:31:46 2014 (r355780) @@ -1,5 +1,5 @@ -etc/hawk/daemon.conf.sample -etc/hawk/php.conf.sample +%%ETCDIR%%/daemon.conf.sample +%%ETCDIR%%/php.conf.sample sbin/hawk %%WWWDIR%%/images/bluesphere.png %%WWWDIR%%/images/favicon.ico @@ -15,6 +15,6 @@ sbin/hawk %%PORTDOCS%%%%DOCSDIR%%/create_hawk_db.sql %%PORTDOCS%%%%DOCSDIR%%/create_hawk_user.sql %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry etc/hawk +@dirrmtry %%ETCDIR%% @dirrm %%WWWDIR%%/images @dirrm %%WWWDIR%%