From e540dadbe3d971a15248933449333d5e179da95f Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Fri, 22 Oct 1999 14:43:06 +0000
Subject: Move the inclusion of bsd.prefs.mk before the first use of any
 variable which may be defined in /etc/mk.conf Use a complicated echo & sed
 combination, rather than hostname -s, which doesn't work on Solaris.

---
 misc/jitterbug/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'misc')

diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 54166384ad7..d257d3c1e9e 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/10/11 13:39:03 wennmach Exp $
+# $NetBSD: Makefile,v 1.3 1999/10/22 14:43:06 agc Exp $
 
 DISTNAME=	jitterbug-1.6.2
 WRKSRC=		${WRKDIR}/${PKGNAME}/source
@@ -11,7 +11,7 @@ HOMEPAGE=	http://jitterbug.samba.org/
 DEPENDS+=	addnerd:../../sysutils/addnerd
 DEPENDS+=	apache-1.3.*:../../www/apache
 
-PLIST_SRC=	${WRKDIR}/PLIST.tmp
+PLIST_SRC=	${WRKDIR}/PLIST-src
 REQ_FILE=	${WRKDIR}/REQ
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
@@ -19,6 +19,8 @@ CONFIGDIR=	${WRKDIR}/${PKGNAME}/config
 DOCSDIR=	${WRKDIR}/${PKGNAME}/docs
 CGIBINDIR=	libexec/cgi-bin
 
+.include "../../mk/bsd.prefs.mk"
+
 JB_PACKAGE?=	test
 
 JB_USER?=	jitter
@@ -34,14 +36,12 @@ JB_LOCALMAIL?=	${JB_PACKAGE}-bugs
 .if !defined(JB_FQHOSTNAME)
 JB_FQHOSTNAME!=	hostname
 .endif
-JB_HOSTNAME!=	hostname -s
+JB_HOSTNAME!=	echo '${JB_FQHOSTNAME}' | sed -e 's|\..*||'
 JB_EMAIL?=	${JB_LOCALMAIL}@${JB_FQHOSTNAME}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
-.include "../../mk/bsd.prefs.mk"
-
 pre-extract:
 .if ${JB_PACKAGE} == "test"
 	@${ECHO}
-- 
cgit v1.2.3