Date: Thu, 24 Oct 2013 15:22:04 +0900 (JST) From: Yasuhiro KIMURA <yasu@utahime.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/183264: [PATCH] sysutils/bsdstats: use drill instead of dig on 10.0-BETA1 and after. Message-ID: <20131024062204.524EF1AF16C@rolling-vm-freebsd2.home.utahime.org> Resent-Message-ID: <201310240630.r9O6U4YM073766@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131024062204.524EF1AF16C>