From yasu@home.utahime.org  Thu Oct 24 06:22:06 2013
Return-Path: <yasu@home.utahime.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 ESMTP id BD4947AB
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <yasu@utahime.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] sysutils/bsdstats: use drill instead of dig on 10.0-BETA1 and after.
X-Send-Pr-Version: 3.113
X-GNATS-Notify: bsdstats@nanoman.ca

>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:    tijl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 24 06:30:03 UTC 2013
>Closed-Date:    Fri Oct 25 17:07:15 CEST 2013
>Last-Modified:  Fri Oct 25 15:10:01 UTC 2013
>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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Oct 24 06:30:12 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183264 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: bsdstats@nanoman.ca
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183264: [PATCH] sysutils/bsdstats: use drill instead of dig on 10.0-BETA1 and after.
Date: Thu, 24 Oct 2013 06:30:11 UT

 Maintainer of sysutils/bsdstats,
 
 Please note that PR ports/183264 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183264
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: "A.J. Kehoe IV (Nanoman)" <bsdstats@nanoman.ca>
To: bug-followup@FreeBSD.org,
 yasu@utahime.org
Cc:  
Subject: Re: ports/183264: [PATCH] sysutils/bsdstats: use drill instead of 
     dig on 10.0-BETA1 and after.
Date: Fri, 25 Oct 2013 04:04:28 -0400 (EDT)

 Edwin Groothuis wrote:
 > Maintainer of sysutils/bsdstats,
 >
 > Please note that PR ports/183264 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183264
 
 This patch worked perfectly on my test system.  Please go ahead and commit
 it.
 
 Thank you for your patch, Yasuhiro!
 
State-Changed-From-To: feedback->open 
State-Changed-By: tijl 
State-Changed-When: Fri Oct 25 11:51:48 CEST 2013 
State-Changed-Why:  
Take. 


Responsible-Changed-From-To: freebsd-ports-bugs->tijl 
Responsible-Changed-By: tijl 
Responsible-Changed-When: Fri Oct 25 11:51:48 CEST 2013 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183264 
State-Changed-From-To: open->closed 
State-Changed-By: tijl 
State-Changed-When: Fri Oct 25 17:06:46 CEST 2013 
State-Changed-Why:  
Committed in r331594. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183264 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183264: commit references a PR
Date: Fri, 25 Oct 2013 15:06:37 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
