diff options
| author | marino <marino@pkgsrc.org> | 2012-07-18 20:44:38 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-07-18 20:44:38 +0000 |
| commit | 7c0149282943af170fd0cd3c22043fbd0aac133d (patch) | |
| tree | 930a45af9f90aa4d58b9cbe086ebdbcdfe083fb0 /security | |
| parent | d7cfa5ef39dd4965ddddd034af3faae0c2279fb4 (diff) | |
| download | pkgsrc-7c0149282943af170fd0cd3c22043fbd0aac133d.tar.gz | |
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.
Diffstat (limited to 'security')
| -rw-r--r-- | security/zkt/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/security/zkt/Makefile b/security/zkt/Makefile index 2b7fb6cb1ea..13d088321ab 100644 --- a/security/zkt/Makefile +++ b/security/zkt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/06/16 22:55:25 pettai Exp $ +# $NetBSD: Makefile,v 1.5 2012/07/18 20:44:38 marino Exp $ # DISTNAME= zkt-1.1.0 @@ -18,6 +18,17 @@ CONFIGURE_ARGS+= --enable-configpath=${PKG_SYSCONFDIR}/zkt INSTALLATION_DIRS= sbin share/doc/zkt ${PKGMANDIR}/man8 etc/zkt +# NetBSD has bind in base, util path=/usr/sbin +# DragonFly uses pkgsrc bind, so the util path must be explicitly defined +# Without any global bind package to point to, pick the latest one and +# hope one of the other 3 bind packages isn't already installed because +# this one will fail to build due to conflict in that case. +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "DragonFly" +CONFIGURE_ARGS+= --enable-bind_util_path=${PREFIX}/sbin +.include "../../net/bind99/buildlink3.mk" +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zkt-conf \ ${DESTDIR}${PREFIX}/sbin/zkt-conf |