summaryrefslogtreecommitdiff
path: root/misc/jitterbug
diff options
context:
space:
mode:
authorsketch <sketch>2009-01-14 12:20:57 +0000
committersketch <sketch>2009-01-14 12:20:57 +0000
commitcaa4cd0e7dab62f3cc6ab7a5e04a34cb72fb1e5f (patch)
tree13b0a31dd106b21cf73981c7c772775ccad07583 /misc/jitterbug
parentc3fd7c4e458a499ba5c658b1c8718d54ba5a1d15 (diff)
downloadpkgsrc-caa4cd0e7dab62f3cc6ab7a5e04a34cb72fb1e5f.tar.gz
Get rid of `hostname -s` in pkgsrc, on Solaris it sets the hostname to "-s".
Diffstat (limited to 'misc/jitterbug')
-rw-r--r--misc/jitterbug/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 90c098651ff..317113244f1 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/06/16 14:39:35 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2009/01/14 12:20:57 sketch Exp $
DISTNAME= jitterbug-1.6.2
PKGREVISION= 2
@@ -29,10 +29,10 @@ JB_CONFIGDIR= ${JB_USER}/config
JB_LOCALMAIL?= ${JB_PACKAGE}-bugs
-JB_HOSTNAME= `hostname -s`
-JB_LONGNAME= `hostname`
+JB_HOSTNAME!= ${UNAME} -n
+JB_SHORTNAME= ${JB_HOSTNAME:C/\..*//}
.if !defined(JB_FQHOSTNAME)
-JB_FQHOSTNAME= ${JB_LONGNAME}
+JB_FQHOSTNAME= ${JB_HOSTNAME}
.endif
JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME}
@@ -64,7 +64,7 @@ FILES_SUBST+= JB_USER=${JB_USER} JB_USERID=${JB_USERID} \
CHGRP=${CHGRP} ID=${ID} TOUCH=${TOUCH} RM=${RM}
pre-extract:
- @(if [ "X${JB_HOSTNAME}" = "X${JB_LONGNAME}" ]; then \
+ @(if [ "X${JB_HOSTNAME}" = "X${JB_SHORTNAME}" ]; then \
${ECHO}; \
${ECHO} "Warning: could not determine your fully qualified host"; \
${ECHO} " name. Please set the JB_FQHOSTNAME environment"; \
@@ -96,7 +96,7 @@ pre-extract:
@${ECHO} " (default='${JB_LOCALMAIL}@${JB_FQHOSTNAME}')"
@${ECHO}
.endif
-.if ${JB_FQHOSTNAME} == ${JB_HOSTNAME}
+.if ${JB_FQHOSTNAME} == ${JB_SHORTNAME}
@${ECHO} "Warning: Could not determine your fully qualified hostname."
@${ECHO} "You must set the JB_FQHOSTNAME environment variable."
@${ECHO}