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 (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,96 +1,97 @@ @@ -1,96 +1,97 @@
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
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_OLD_DES_API= yes 16USE_OLD_DES_API= yes
17USE_TOOLS+= gmake perl:run 17USE_TOOLS+= gmake perl:run
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19PKG_CONFIG= yes 19PKG_CONFIG= yes
20 20
21PKG_SYSCONFSUBDIR= netatalk 21PKG_SYSCONFSUBDIR= netatalk
22 22
23EGDIR= ${PREFIX}/share/examples/netatalk 23EGDIR= ${PREFIX}/share/examples/netatalk
24CONF_FILES= ${EGDIR}/afp.conf ${PKG_SYSCONFDIR}/afp.conf 24CONF_FILES= ${EGDIR}/afp.conf ${PKG_SYSCONFDIR}/afp.conf
25CONF_FILES+= ${EGDIR}/extmap.conf ${PKG_SYSCONFDIR}/extmap.conf 25CONF_FILES+= ${EGDIR}/extmap.conf ${PKG_SYSCONFDIR}/extmap.conf
26 26
27RCD_SCRIPTS= netatalk 27RCD_SCRIPTS= netatalk
28RCD_SCRIPT_SRC.netatalk= ${WRKSRC}/distrib/initscripts/rc.netbsd 28RCD_SCRIPT_SRC.netatalk= ${WRKSRC}/distrib/initscripts/rc.netbsd
29SMF_SRCDIR= ${WRKSRC}/distrib/initscripts 29SMF_SRCDIR= ${WRKSRC}/distrib/initscripts
30SMF_METHODS= netatalk_smf 30SMF_METHODS= netatalk_smf
31SMF_MANIFEST= netatalk.xml 31SMF_MANIFEST= netatalk.xml
32 32
33CONFLICTS= netatalk22-[0-9]* netatalk-30-[0-9]* netatalk-[0-9]*  33CONFLICTS= netatalk22-[0-9]* netatalk-30-[0-9]* netatalk-[0-9]*
34CONFLICTS+= netatalk-asun-[0-9]* netatalk-umich-[0-9]* 34CONFLICTS+= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
35 35
36.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
37 37
38BUILD_DEFS+= VARBASE 38BUILD_DEFS+= VARBASE
39OWN_DIRS+= ${VARBASE}/db/netatalk/CNID ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 39OWN_DIRS+= ${VARBASE}/db/netatalk/CNID ${REAL_ROOT_USER} ${REAL_ROOT_GROUP}
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
66SUBST_FILES.paths= distrib/initscripts/Makefile.in 67SUBST_FILES.paths= distrib/initscripts/Makefile.in
67SUBST_SED.paths= -e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\\3," 68SUBST_SED.paths= -e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\\3,"
68 69
69PLIST_VARS+= ea 70PLIST_VARS+= ea
70.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \ 71.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
71 (${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-6].[0-8]*)) 72 (${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-6].[0-8]*))
72PLIST.ea= yes 73PLIST.ea= yes
73.endif 74.endif
74 75
75CONFIGURE_ARGS.NetBSD+= --without-dtrace 76CONFIGURE_ARGS.NetBSD+= --without-dtrace
76 77
77.include "options.mk" 78.include "options.mk"
78 79
79INSTALLATION_DIRS= libexec/psffilters etc/netatalk 80INSTALLATION_DIRS= libexec/psffilters etc/netatalk
80 81
81post-configure: 82post-configure:
82 ${CP} ${FILESDIR}/netatalk_smf.sh ${SMF_SRCDIR} 83 ${CP} ${FILESDIR}/netatalk_smf.sh ${SMF_SRCDIR}
83 84
84.if !empty(PKG_OPTIONS:Mpam) 85.if !empty(PKG_OPTIONS:Mpam)
85post-install: 86post-install:
86 ${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk ${DESTDIR}${EGDIR}/netatalk.pam 87 ${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk ${DESTDIR}${EGDIR}/netatalk.pam
87.endif 88.endif
88 89
89BUILDLINK_API_DEPENDS.libevent+= libevent>=2 90BUILDLINK_API_DEPENDS.libevent+= libevent>=2
90.include "../../devel/libevent/buildlink3.mk" 91.include "../../devel/libevent/buildlink3.mk"
91.include "../../lang/python/application.mk" 92.include "../../lang/python/application.mk"
92.include "../../security/libgcrypt/buildlink3.mk" 93.include "../../security/libgcrypt/buildlink3.mk"
93.include "../../security/openssl/buildlink3.mk" 94.include "../../security/openssl/buildlink3.mk"
94.include "../../security/tcp_wrappers/buildlink3.mk" 95.include "../../security/tcp_wrappers/buildlink3.mk"
95.include "../../databases/db5/buildlink3.mk" 96.include "../../databases/db5/buildlink3.mk"
96.include "../../mk/bsd.pkg.mk" 97.include "../../mk/bsd.pkg.mk"