Date: Fri, 25 Oct 2013 15:06:30 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331594 - in head/sysutils/bsdstats: . files Message-ID: <201310251506.r9PF6UTP005709@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Oct 25 15:06:30 2013 New Revision: 331594 URL: http://svnweb.freebsd.org/changeset/ports/331594 Log: - Use drill instead of dig on FreeBSD 10. - Support staging. PR: ports/183264 Submitted by: Yasuhiro KIMURA <yasu@utahime.org> Approved by: "A.J. Kehoe IV (Nanoman)" <bsdstats@nanoman.ca> (maintainer) Modified: head/sysutils/bsdstats/Makefile (contents, props changed) head/sysutils/bsdstats/files/300.statistics.in (contents, props changed) Modified: head/sysutils/bsdstats/Makefile ============================================================================== --- head/sysutils/bsdstats/Makefile Fri Oct 25 15:02:57 2013 (r331593) +++ head/sysutils/bsdstats/Makefile Fri Oct 25 15:06:30 2013 (r331594) @@ -3,7 +3,7 @@ PORTNAME= bsdstats PORTVERSION= 5.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils DISTFILES= @@ -13,16 +13,19 @@ COMMENT= Monthly script for reporting an NO_BUILD= yes USE_RC_SUBR= bsdstats SUB_FILES= 300.statistics pkg-message +SUB_LIST= DIG=${DIG} -NO_STAGE= yes -do-install: - ${MKDIR} ${PREFIX}/etc/periodic/monthly - ${INSTALL_SCRIPT} ${WRKDIR}/300.statistics ${PREFIX}/etc/periodic/monthly -post-install: -.if defined(BATCH) || defined(PACKAGE_BUILDING) - @${CAT} ${PKGMESSAGE} +.include <bsd.port.options.mk> + +.if ${OSVERSION} >= 1000500 +DIG= drill .else - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +DIG= dig .endif +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/monthly + ${INSTALL_SCRIPT} ${WRKDIR}/300.statistics \ + ${STAGEDIR}${PREFIX}/etc/periodic/monthly + .include <bsd.port.mk> Modified: head/sysutils/bsdstats/files/300.statistics.in ============================================================================== --- head/sysutils/bsdstats/files/300.statistics.in Fri Oct 25 15:02:57 2013 (r331593) +++ head/sysutils/bsdstats/files/300.statistics.in Fri Oct 25 15:06:30 2013 (r331594) @@ -71,7 +71,7 @@ do_fetch () { } check_dns () { - if [ `dig bsdstats.org txt | grep TXT | grep UP | wc -l` = 0 ] + if [ `%%DIG%% bsdstats.org txt | grep TXT | grep UP | wc -l` = 0 ] then echo "DNS not reachable, Network Down?" exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310251506.r9PF6UTP005709>