Bug 183264 - [PATCH] sysutils/bsdstats: use drill instead of dig on 10.0-BETA1 and after.
[PATCH] sysutils/bsdstats: use drill instead of dig on 10.0-BETA1 and after.
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Tijl Coosemans
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-10-24 07:30 UTC by Yasuhiro KIMURA
Modified: 2013-10-25 16:10 UTC (History)
0 users

See Also:


Attachments
patch-bsdstats (1.12 KB, text/plain)
2013-10-24 07:30 UTC, Yasuhiro KIMURA
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro KIMURA 2013-10-24 07:30:03 UTC
	
	- Use drill instead of dig on 10.0-BETA1 and after where BIND is
	  removed from base system.
	- Bump PORTREVISION.
Comment 1 Edwin Groothuis freebsd_committer 2013-10-24 07:30:11 UTC
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
Comment 2 Edwin Groothuis freebsd_committer 2013-10-24 07:30:12 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 A.J. Kehoe IV (Nanoman) 2013-10-25 09:04:28 UTC
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!
Comment 4 Tijl Coosemans freebsd_committer 2013-10-25 10:51:48 UTC
State Changed
From-To: feedback->open
Comment 5 Tijl Coosemans freebsd_committer 2013-10-25 10:51:48 UTC
Responsible Changed
From-To: freebsd-ports-bugs->tijl

Take.
Comment 6 dfilter freebsd_committer 2013-10-25 16:06:37 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"
Comment 7 Tijl Coosemans freebsd_committer 2013-10-25 16:06:46 UTC
State Changed
From-To: open->closed

Committed in r331594.