Tue Mar 21 10:26:26 2017 UTC ()
Explicitly disable mysql, so it's not detected if mysql-config is found.

Addresses build problem reported by Louis Guillaume <louis@zabrico.com>
on pkgsrc-users.


(wiz)
diff -r1.1 -r1.2 pkgsrc/net/netatalk3/Makefile

cvs diff -r1.1 -r1.2 pkgsrc/net/netatalk3/Makefile (expand / switch to unified diff)

--- pkgsrc/net/netatalk3/Makefile 2016/11/07 00:45:30 1.1
+++ pkgsrc/net/netatalk3/Makefile 2017/03/21 10:26:26 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2016/11/07 00:45:30 christos Exp $ 1# $NetBSD: Makefile,v 1.2 2017/03/21 10:26:26 wiz Exp $
2 2
3DISTNAME= netatalk-3.1.7 3DISTNAME= netatalk-3.1.7
4PKGNAME= ${DISTNAME:C/-/3-/} 4PKGNAME= ${DISTNAME:C/-/3-/}
5#PKGREVISION= 7 5#PKGREVISION= 7
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= hauke@NetBSD.org 10MAINTAINER= hauke@NetBSD.org
11HOMEPAGE= http://netatalk.sourceforge.net/ 11HOMEPAGE= http://netatalk.sourceforge.net/
12COMMENT= Netatalk AFP file services 12COMMENT= Netatalk AFP file services
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -40,26 +40,27 @@ OWN_DIRS+= ${VARBASE}/db/netatalk/CNID  @@ -40,26 +40,27 @@ OWN_DIRS+= ${VARBASE}/db/netatalk/CNID
40 40
41CONFIGURE_ARGS+= --enable-overwrite 41CONFIGURE_ARGS+= --enable-overwrite
42CONFIGURE_ARGS+= --enable-quota 42CONFIGURE_ARGS+= --enable-quota
43CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk 43CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk
44CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk 44CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk
45CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR} 45CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR}
46CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg 46CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg
47CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db 47CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db
48CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams 48CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams
49CONFIGURE_ARGS+= --with-bdb=${BUILDLINK_PREFIX.db5} 49CONFIGURE_ARGS+= --with-bdb=${BUILDLINK_PREFIX.db5}
50CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} 50CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
51CONFIGURE_ARGS+= --with-libevent-header=${BUILDLINK_PREFIX.libevent}/include 51CONFIGURE_ARGS+= --with-libevent-header=${BUILDLINK_PREFIX.libevent}/include
52CONFIGURE_ARGS+= --with-libevent-lib=${BUILDLINK_PREFIX.libevent}/lib 52CONFIGURE_ARGS+= --with-libevent-lib=${BUILDLINK_PREFIX.libevent}/lib
 53CONFIGURE_ARGS+= --without-mysql-config
53CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} 54CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
54 55
55# Upstream bug, was supposed to be fixed in 3.0.8? 56# Upstream bug, was supposed to be fixed in 3.0.8?
56CFLAGS.SunOS+= -I/usr/include/kerberosv5 57CFLAGS.SunOS+= -I/usr/include/kerberosv5
57 58
58MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg 59MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg
59 60
60REPLACE_PYTHON+= contrib/shell_utils/afpstats 61REPLACE_PYTHON+= contrib/shell_utils/afpstats
61REPLACE_PYTHON+= libevent/event_rpcgen.py 62REPLACE_PYTHON+= libevent/event_rpcgen.py
62 63
63SUBST_CLASSES+= paths 64SUBST_CLASSES+= paths
64SUBST_MESSAGE.paths= Fixing hardcoded paths. 65SUBST_MESSAGE.paths= Fixing hardcoded paths.
65SUBST_STAGE.paths= pre-configure 66SUBST_STAGE.paths= pre-configure