diff options
| author | dholland <dholland@pkgsrc.org> | 2016-03-13 08:38:54 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2016-03-13 08:38:54 +0000 |
| commit | af9dc233707cab10877ff8717c08f6dbb2b827d1 (patch) | |
| tree | 75daad125af8e1041e3813de9ddebac3433af9bc /net | |
| parent | fe4b26c8eb2b6bf7309e96d6debd2fcb870ce525 (diff) | |
| download | pkgsrc-af9dc233707cab10877ff8717c08f6dbb2b827d1.tar.gz | |
Compile in 'localhost' as the log host, instead of extracting the
build machine's hostname and then trying (often incorrectly) to
convert it to a FQDN. I was getting "Host" as the alleged FQDN; the
bulk build tnn@ just posted was getting ";;", which caused the package
to not even compile.
While 'localhost' is hardly an ideal hardwired loghost, it's better
than the possibly-internal-only name of some random package build host
used to build binary packages... even assuming the FQDN extraction
worked. If anyone has any better ideas, let me know. (See pkgsrc-users.)
PKGREVISION -> 12.
Diffstat (limited to 'net')
| -rw-r--r-- | net/nocol/Makefile | 33 | ||||
| -rw-r--r-- | net/nocol/files/answers | 6 |
2 files changed, 18 insertions, 21 deletions
diff --git a/net/nocol/Makefile b/net/nocol/Makefile index 5bf001cf992..ed130c66c15 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2015/06/12 10:50:43 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2016/03/13 08:38:54 dholland Exp $ # DISTNAME= nocol-4.3.1 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= net MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/ @@ -37,22 +37,19 @@ INSTALL_MAKE_FLAGS+= ROOTDIR=${DESTDIR}${PREFIX} \ DATADIR=${DESTDIR}/var/run/data \ MSGSDIR=${DESTDIR}/var/run/msgs -post-patch: - @(hostname=`/bin/hostname`; \ - dir=""; \ - for d in /usr/bin /usr/sbin `${ECHO} $$PATH | ${TR} ':' ' '`; do \ - if [ -x $$d/host ]; then \ - dir=$$d; \ - break; \ - fi \ - done; \ - if [ "X$$dir" = "X" ]; then \ - ${ECHO} "host program not found"; \ - exit 1; \ - fi; \ - fqdn=`$$dir/host $$hostname | ${AWK} '{ print $$1; exit }'`; \ - ${SED} -e 's|@prefix@|${PREFIX}|g' -e "s|@FQDN@|$$fqdn|g" \ - ${FILESDIR}/answers > ${WRKSRC}/answers) +post-extract: + ${CP} ${FILESDIR}/answers ${WRKSRC}/answers + +# XXX This is compiled in as the logging host. Compiling in "localhost" +# lacks a certain something; however, for years it was compiling in the +# name of the build host, or, not infrequently, something entirely +# invalid. +FQDN= localhost + +SUBST_CLASSES+= answers +SUBST_STAGE.answers= pre-configure +SUBST_FILES.answers= answers +SUBST_VARS.answers= PREFIX PKGMANDIR FQDN pre-configure: @${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmp diff --git a/net/nocol/files/answers b/net/nocol/files/answers index bedf6374ce6..b59dac61b28 100644 --- a/net/nocol/files/answers +++ b/net/nocol/files/answers @@ -1,5 +1,5 @@ -@prefix@ -@prefix@/man/mann +@PREFIX@ +@PREFIX@/@PKGMANDIR@/mann n @FQDN@ /usr/bin/mail @@ -8,4 +8,4 @@ root@@FQDN@ cc -O yacc -@prefix@/bin/perl +@PREFIX@/bin/perl |