diff options
| author | agc <agc> | 1999-12-17 11:11:10 +0000 |
|---|---|---|
| committer | agc <agc> | 1999-12-17 11:11:10 +0000 |
| commit | 91ab3b1fab4b849b190976cc35735d046fcd602e (patch) | |
| tree | 7dcc458ffdac0bdf1fd25cccf7cd7f66e25588ed /misc/jitterbug | |
| parent | e8c42c66f47d5c4b0a61a499151a855676c4b0b5 (diff) | |
| download | pkgsrc-91ab3b1fab4b849b190976cc35735d046fcd602e.tar.gz | |
Correct the addnerd dependency by adding a version number for this
package. Pointed out by David Brownlee.
Diffstat (limited to 'misc/jitterbug')
| -rw-r--r-- | misc/jitterbug/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index c29d95a3e5b..2617fcaaa1d 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/11/03 14:44:30 wennmach Exp $ +# $NetBSD: Makefile,v 1.6 1999/12/17 11:11:10 agc Exp $ DISTNAME= jitterbug-1.6.2 WRKSRC= ${WRKDIR}/${PKGNAME}/source @@ -8,7 +8,7 @@ MASTER_SITES= ftp://jitterbug.samba.org/pub/jitterbug/ MAINTAINER= wennmach@netbsd.org HOMEPAGE= http://jitterbug.samba.org/ -DEPENDS+= addnerd:../../sysutils/addnerd +DEPENDS+= addnerd-1.6:../../sysutils/addnerd DEPENDS+= apache-1.3.*:../../www/apache PLIST_SRC= ${WRKDIR}/PLIST-src @@ -42,7 +42,12 @@ JB_CONFIGDIR= ${JB_USER}/config JB_LOCALMAIL?= ${JB_PACKAGE}-bugs .if !defined(JB_FQHOSTNAME) +<<<<<<< Makefile +JB_HOSTNAME!= /bin/hostname +JB_FQHOSTNAME!= ${NSLOOKUP} ${JB_HOSTNAME} | /usr/bin/awk '/^Name: / { print $$2; exit }' +======= JB_FQHOSTNAME!= (${HOSTCMD} `/bin/hostname` 2>/dev/null || echo totally.unknown.domain) | /usr/bin/awk '{ print $$1; exit }' +>>>>>>> 1.5 .endif JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME} |