Wed Jul 18 20:44:38 2012 UTC ()
security/zkt: Fix DragonFly regression

When this package was updated to version 1.1, it stopped building on
DragonFly.  The main issue is that DragonFly doesn't have bind in its
base.  NetBSD does, so it zkt finds it there, but otherwise it needs
the configuration switch --enable-binutil-path to be used.  This was
added for DragonFly to point at ${PREFIX}/sbin.

zkt requires bind to be installed in order to build.  Unlike other
packages like python, postgresql, and ruby where the mk.conf can
define a version otherwise a default is used, no such mechanism
exists to hand the four separate bind packages (at least I don't know
about one).  So the inclusion of bind99 is a hack I'm not too proud
of, but I don't have a better solution.  With it, it builds in clean
environments like pbulk chroot and Tinderbox.  If an individual user
is building from source, they'll be smart enough to comment out this
include if another version of bind is already installed (zkt will
fail on a bind build conflict).

I suspect DragonFly is rather unique in not having bind in base, so
for now this is left as a DragonFly-specific section.  Something
like net/bind99/builtin.mk could possibly be used to determine if
no builtin bind is available and thus follow DragonFly approach.  I
shall leave it to others to decide.


(marino)
diff -r1.4 -r1.5 pkgsrc/security/zkt/Makefile

cvs diff -r1.4 -r1.5 pkgsrc/security/zkt/Makefile (expand / switch to unified diff)

--- pkgsrc/security/zkt/Makefile 2012/06/16 22:55:25 1.4
+++ pkgsrc/security/zkt/Makefile 2012/07/18 20:44:38 1.5
@@ -1,33 +1,44 @@ @@ -1,33 +1,44 @@
1# $NetBSD: Makefile,v 1.4 2012/06/16 22:55:25 pettai Exp $ 1# $NetBSD: Makefile,v 1.5 2012/07/18 20:44:38 marino Exp $
2# 2#
3 3
4DISTNAME= zkt-1.1.0 4DISTNAME= zkt-1.1.0
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://www.hznet.de/dns/zkt/ 6MASTER_SITES= http://www.hznet.de/dns/zkt/
7 7
8MAINTAINER= pettai@NetBSD.org 8MAINTAINER= pettai@NetBSD.org
9HOMEPAGE= http://www.hznet.de/dns/zkt/ 9HOMEPAGE= http://www.hznet.de/dns/zkt/
10COMMENT= DNSSEC Zone Key Tool 10COMMENT= DNSSEC Zone Key Tool
11LICENSE= original-bsd 11LICENSE= original-bsd
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --enable-configpath=${PKG_SYSCONFDIR}/zkt 16CONFIGURE_ARGS+= --enable-configpath=${PKG_SYSCONFDIR}/zkt
17#CONFIGURE_ARGS+= --enable-configpath=/var/chroot/named/etc 17#CONFIGURE_ARGS+= --enable-configpath=/var/chroot/named/etc
18 18
19INSTALLATION_DIRS= sbin share/doc/zkt ${PKGMANDIR}/man8 etc/zkt 19INSTALLATION_DIRS= sbin share/doc/zkt ${PKGMANDIR}/man8 etc/zkt
20 20
 21# NetBSD has bind in base, util path=/usr/sbin
 22# DragonFly uses pkgsrc bind, so the util path must be explicitly defined
 23# Without any global bind package to point to, pick the latest one and
 24# hope one of the other 3 bind packages isn't already installed because
 25# this one will fail to build due to conflict in that case.
 26.include "../../mk/bsd.prefs.mk"
 27.if ${OPSYS} == "DragonFly"
 28CONFIGURE_ARGS+= --enable-bind_util_path=${PREFIX}/sbin
 29.include "../../net/bind99/buildlink3.mk"
 30.endif
 31
21do-install: 32do-install:
22 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-conf \ 33 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-conf \
23 ${DESTDIR}${PREFIX}/sbin/zkt-conf 34 ${DESTDIR}${PREFIX}/sbin/zkt-conf
24 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-keyman \ 35 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-keyman \
25 ${DESTDIR}${PREFIX}/sbin/zkt-keyman 36 ${DESTDIR}${PREFIX}/sbin/zkt-keyman
26 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-ls \ 37 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-ls \
27 ${DESTDIR}${PREFIX}/sbin/zkt-ls 38 ${DESTDIR}${PREFIX}/sbin/zkt-ls
28 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-signer \ 39 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-signer \
29 ${DESTDIR}${PREFIX}/sbin/zkt-signer 40 ${DESTDIR}${PREFIX}/sbin/zkt-signer
30 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-soaserial \ 41 ${INSTALL_PROGRAM} ${WRKSRC}/zkt-soaserial \
31 ${DESTDIR}${PREFIX}/sbin/zkt-soaserial 42 ${DESTDIR}${PREFIX}/sbin/zkt-soaserial
32 ${INSTALL_MAN} ${WRKSRC}/man/zkt-conf.8 \ 43 ${INSTALL_MAN} ${WRKSRC}/man/zkt-conf.8 \
33 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/zkt-conf.8 44 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/zkt-conf.8