From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 24 06:30:04 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTP id D9EFFAD7 for ; Thu, 24 Oct 2013 06:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 B75E92CDE for ; Thu, 24 Oct 2013 06:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9O6U4Nb073767 for ; Thu, 24 Oct 2013 06:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9O6U4YM073766; Thu, 24 Oct 2013 06:30:04 GMT (envelope-from gnats) Resent-Date: Thu, 24 Oct 2013 06:30:04 GMT Resent-Message-Id: <201310240630.r9O6U4YM073766@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yasuhiro KIMURA 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 ESMTP id BD4947AB for ; Thu, 24 Oct 2013 06:22:06 +0000 (UTC) (envelope-from yasu@home.utahime.org) Received: from gate.utahime.jp (ipq210.utahime.jp [183.180.29.210]) by mx1.freebsd.org (Postfix) with ESMTP id 8F9922C8D for ; Thu, 24 Oct 2013 06:22:05 +0000 (UTC) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by gate.utahime.jp (Postfix) with ESMTP id BD6A261F9D; Thu, 24 Oct 2013 15:22:04 +0900 (JST) Received: from eastasia.home.utahime.org (localhost [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 9170E4E631; Thu, 24 Oct 2013 15:22:04 +0900 (JST) Received: from rolling-vm-freebsd2.home.utahime.org (rolling-vm-freebsd2.home.utahime.org [192.168.174.54]) by eastasia.home.utahime.org (Postfix) with ESMTP id 6C0914E62F; Thu, 24 Oct 2013 15:22:04 +0900 (JST) Received: by rolling-vm-freebsd2.home.utahime.org (Postfix, from userid 1000) id 524EF1AF16C; Thu, 24 Oct 2013 15:22:04 +0900 (JST) Message-Id: <20131024062204.524EF1AF16C@rolling-vm-freebsd2.home.utahime.org> Date: Thu, 24 Oct 2013 15:22:04 +0900 (JST) From: Yasuhiro KIMURA To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/183264: [PATCH] sysutils/bsdstats: use drill instead of dig on 10.0-BETA1 and after. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Oct 2013 06:30:05 -0000 >Number: 183264 >Category: ports >Synopsis: [PATCH] sysutils/bsdstats: use drill instead of dig on 10.0-BETA1 and after. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Oct 24 06:30:03 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Yasuhiro KIMURA >Release: FreeBSD 10.0-BETA1 amd64 >Organization: >Environment: System: FreeBSD xxxx 10.0-BETA1 FreeBSD 10.0-BETA1 #0 r256770: Sun Oct 20 14:04:52 JST 2013 xxxx amd64 >Description: - Use drill instead of dig on 10.0-BETA1 and after where BIND is removed from base system. - Bump PORTREVISION. >How-To-Repeat: >Fix: --- patch-bsdstats begins here --- Index: Makefile =================================================================== --- Makefile (revision 331453) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= bsdstats PORTVERSION= 5.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils DISTFILES= @@ -13,7 +13,16 @@ NO_BUILD= yes USE_RC_SUBR= bsdstats SUB_FILES= 300.statistics pkg-message +SUB_LIST+= DIG=${DIG} +.include + +.if ${OSVERSION} >= 1000500 +DIG= drill +.else +DIG= dig +.endif + NO_STAGE= yes do-install: ${MKDIR} ${PREFIX}/etc/periodic/monthly @@ -25,4 +34,4 @@ @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.include +.include Index: files/300.statistics.in =================================================================== --- files/300.statistics.in (revision 331453) +++ files/300.statistics.in (working copy) @@ -71,7 +71,7 @@ } 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 --- patch-bsdstats ends here --- >Release-Note: >Audit-Trail: >Unformatted: