summaryrefslogtreecommitdiff
path: root/misc/jitterbug
diff options
context:
space:
mode:
authorwennmach <wennmach>1999-11-03 14:44:30 +0000
committerwennmach <wennmach>1999-11-03 14:44:30 +0000
commit079e634b5e8278df34777367072c7d78a4ad3fd3 (patch)
tree7b6b944772a4c9969167b103f8479390c8836543 /misc/jitterbug
parent7a1b892019f3e05489ccf90c2daaf45b561d95e3 (diff)
downloadpkgsrc-079e634b5e8278df34777367072c7d78a4ad3fd3.tar.gz
Revert to the "host" command (from "nslookup") for looking up fully qualified
host names. Make this fail-safe in case host has no working domain name server. Fixes "make show-downlevel" lossage, mentionned by Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at> in private email.
Diffstat (limited to 'misc/jitterbug')
-rw-r--r--misc/jitterbug/Makefile23
1 files changed, 15 insertions, 8 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 9b3d99c2d27..c29d95a3e5b 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/10/26 16:38:09 wennmach Exp $
+# $NetBSD: Makefile,v 1.5 1999/11/03 14:44:30 wennmach Exp $
DISTNAME= jitterbug-1.6.2
WRKSRC= ${WRKDIR}/${PKGNAME}/source
@@ -21,10 +21,11 @@ CGIBINDIR= libexec/cgi-bin
.include "../../mk/bsd.prefs.mk"
-.if exists(/usr/sbin/nslookup)
-NSLOOKUP= /usr/sbin/nslookup
-.elif exists(/usr/bin/nslookup)
-NSLOOKUP= /usr/bin/nslookup
+HOSTCMD= /usr/bin/false
+.if exists(/usr/sbin/host)
+HOSTCMD= /usr/sbin/host
+.elif exists(/usr/bin/host)
+HOSTCMD= /usr/bin/host
.endif
JB_PACKAGE?= test
@@ -41,8 +42,7 @@ JB_CONFIGDIR= ${JB_USER}/config
JB_LOCALMAIL?= ${JB_PACKAGE}-bugs
.if !defined(JB_FQHOSTNAME)
-JB_HOSTNAME!= /bin/hostname
-JB_FQHOSTNAME!= ${NSLOOKUP} ${JB_HOSTNAME} | /usr/bin/grep Name: | /usr/bin/awk '{ print $$2 }'
+JB_FQHOSTNAME!= (${HOSTCMD} `/bin/hostname` 2>/dev/null || echo totally.unknown.domain) | /usr/bin/awk '{ print $$1; exit }'
.endif
JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME}
@@ -50,6 +50,13 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
pre-extract:
+.if ${JB_FQHOSTNAME} == "totally.unknown.domain"
+ @${ECHO}
+ @${ECHO} "Warning: could not determine your fully qualified host"
+ @${ECHO} " name. Please set the JB_FQHOSTNAME environment"
+ @${ECHO} " variable accordingly and/or fix your name server."
+ @${ECHO} " Building for domain 'totally.unknown.domain'"
+.endif
.if ${JB_PACKAGE} == "test"
@${ECHO}
@${ECHO} "You should define the JB_PACKAGE environment variable:"
@@ -72,7 +79,7 @@ pre-extract:
@${ECHO} "as '\$$JB_LOCALMAIL'@${JB_FQHOSTNAME}"
@${ECHO}
.endif
-.if (${JB_FQHOSTNAME} == ${JB_HOSTNAME})
+.if ${JB_FQHOSTNAME} == ${JB_HOSTNAME}
@${ECHO} "Warning: Could not determine your fully qualified hostname."
@${ECHO} "You must set the JB_FQHOSTNAME environment variable."
@${ECHO}