Wed Jan 13 09:34:30 2021 UTC ()
bind: Disable atomic operations on i386 too.


(nia)
diff -r1.35 -r1.36 pkgsrc/net/bind911/Makefile
diff -r1.7 -r1.8 pkgsrc/net/bind916/Makefile
cvs diff -r1.35 -r1.36 pkgsrc/net/bind911/Attic/Makefile (switch to unified diff)

--- pkgsrc/net/bind911/Attic/Makefile 2020/12/19 14:44:15 1.35
+++ pkgsrc/net/bind911/Attic/Makefile 2021/01/13 09:34:30 1.36
@@ -1,86 +1,87 @@ @@ -1,86 +1,87 @@
1# $NetBSD: Makefile,v 1.35 2020/12/19 14:44:15 taca Exp $ 1# $NetBSD: Makefile,v 1.36 2021/01/13 09:34:30 nia Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ 6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
7DISTFILES+= ${DEFAULT_DISTFILES} bind-9.11.25-fixed-man-pages.tar.gz 7DISTFILES+= ${DEFAULT_DISTFILES} bind-9.11.25-fixed-man-pages.tar.gz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.isc.org/software/bind/ 10HOMEPAGE= https://www.isc.org/software/bind/
11COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.11 11COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.11
12LICENSE= mpl-2.0 12LICENSE= mpl-2.0
13 13
14CONFLICTS+= host-[0-9]* 14CONFLICTS+= host-[0-9]*
15 15
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18BIND_VERSION= 9.11.26 18BIND_VERSION= 9.11.26
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22BUILD_DEFS+= BIND_DIR VARBASE 22BUILD_DEFS+= BIND_DIR VARBASE
23 23
24.include "options.mk" 24.include "options.mk"
25 25
26USE_TOOLS+= pax perl pkg-config tar 26USE_TOOLS+= pax perl pkg-config tar
27USE_LIBTOOL= yes 27USE_LIBTOOL= yes
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} 29MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX}
30 30
31CONFIGURE_ARGS+= --with-libtool 31CONFIGURE_ARGS+= --with-libtool
32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
33CONFIGURE_ARGS+= --localstatedir=${VARBASE} 33CONFIGURE_ARGS+= --localstatedir=${VARBASE}
34CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 34CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
35CONFIGURE_ARGS+= --with-python=no 35CONFIGURE_ARGS+= --with-python=no
36CONFIGURE_ARGS+= --with-lmdb=no 36CONFIGURE_ARGS+= --with-lmdb=no
37.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ 37.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
38 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ 38 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
39 !empty(MACHINE_PLATFORM:MNetBSD-*-vax) 39 !empty(MACHINE_PLATFORM:MNetBSD-*-vax) || \
 40 !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
40CONFIGURE_ARGS+= --disable-atomic 41CONFIGURE_ARGS+= --disable-atomic
41.endif 42.endif
42.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" 43.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != ""
43CONFIGURE_ARGS+= --disable-threads 44CONFIGURE_ARGS+= --disable-threads
44.endif 45.endif
45CONFIGURE_ARGS.DragonFly+= --disable-kqueue 46CONFIGURE_ARGS.DragonFly+= --disable-kqueue
46 47
47PKG_GROUPS_VARS+= BIND_GROUP 48PKG_GROUPS_VARS+= BIND_GROUP
48PKG_USERS_VARS= BIND_USER 49PKG_USERS_VARS= BIND_USER
49 50
50PKG_GROUPS= ${BIND_GROUP} 51PKG_GROUPS= ${BIND_GROUP}
51PKG_USERS= ${BIND_USER}:${BIND_GROUP} 52PKG_USERS= ${BIND_USER}:${BIND_GROUP}
52 53
53PKG_GECOS.${BIND_USER}= Named pseudo-user 54PKG_GECOS.${BIND_USER}= Named pseudo-user
54PKG_HOME.${BIND_USER}= ${BIND_DIR} 55PKG_HOME.${BIND_USER}= ${BIND_DIR}
55 56
56DOCS= CHANGES HISTORY OPTIONS README 57DOCS= CHANGES HISTORY OPTIONS README
57 58
58FILES_SUBST+= BIND_GROUP=${BIND_GROUP} \ 59FILES_SUBST+= BIND_GROUP=${BIND_GROUP} \
59 BIND_USER=${BIND_USER} PAX=${PAX:Q} \ 60 BIND_USER=${BIND_USER} PAX=${PAX:Q} \
60 SSLBASE=${SSLBASE} 61 SSLBASE=${SSLBASE}
61MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} 62MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
62 63
63DOCDIR= share/doc/bind9 64DOCDIR= share/doc/bind9
64 65
65RCD_SCRIPTS= lwresd named9 66RCD_SCRIPTS= lwresd named9
66SMF_METHODS= named 67SMF_METHODS= named
67 68
68INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bind9 69INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bind9
69CONF_FILES+= share/examples/bind9/bind.keys \ 70CONF_FILES+= share/examples/bind9/bind.keys \
70 ${PKG_SYSCONFDIR}/bind.keys 71 ${PKG_SYSCONFDIR}/bind.keys
71 72
72INSTALLATION_DIRS+= ${DOCDIR} ${DOCDIR}/arm 73INSTALLATION_DIRS+= ${DOCDIR} ${DOCDIR}/arm
73 74
74post-extract: 75post-extract:
75 cd ${WRKDIR} && \ 76 cd ${WRKDIR} && \
76 ${TAR} -xzf ${DISTDIR}/bind-9.11.25-fixed-man-pages.tar.gz 77 ${TAR} -xzf ${DISTDIR}/bind-9.11.25-fixed-man-pages.tar.gz
77 78
78post-install: 79post-install:
79.for f in ${DOCS} 80.for f in ${DOCS}
80 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR} 81 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
81.endfor 82.endfor
82 ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm 83 ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
83 84
84.include "../../devel/zlib/buildlink3.mk" 85.include "../../devel/zlib/buildlink3.mk"
85.include "../../security/openssl/buildlink3.mk" 86.include "../../security/openssl/buildlink3.mk"
86.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/net/bind916/Makefile (switch to unified diff)

--- pkgsrc/net/bind916/Makefile 2020/12/19 16:41:36 1.7
+++ pkgsrc/net/bind916/Makefile 2021/01/13 09:34:30 1.8
@@ -1,87 +1,88 @@ @@ -1,87 +1,88 @@
1# $NetBSD: Makefile,v 1.7 2020/12/19 16:41:36 taca Exp $ 1# $NetBSD: Makefile,v 1.8 2021/01/13 09:34:30 nia Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ 6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.isc.org/software/bind/ 10HOMEPAGE= https://www.isc.org/software/bind/
11COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14 11COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14
12LICENSE= mpl-2.0 12LICENSE= mpl-2.0
13 13
14CONFLICTS+= host-[0-9]* 14CONFLICTS+= host-[0-9]*
15 15
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18BIND_VERSION= 9.16.10 18BIND_VERSION= 9.16.10
19 19
20BUILD_DEFS+= BIND_DIR VARBASE 20BUILD_DEFS+= BIND_DIR VARBASE
21 21
22.include "options.mk" 22.include "options.mk"
23 23
24USE_TOOLS+= autoconf pax perl pkg-config 24USE_TOOLS+= autoconf pax perl pkg-config
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27CHECK_FILES_SKIP= bin/tests/system/system-test-driver.sh 27CHECK_FILES_SKIP= bin/tests/system/system-test-driver.sh
28MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} 28MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX}
29 29
30.if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h) 30.if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h)
31CONFIGURE_ARGS+= --disable-linux-caps 31CONFIGURE_ARGS+= --disable-linux-caps
32.endif 32.endif
33 33
34CONFIGURE_ARGS+= --with-libtool 34CONFIGURE_ARGS+= --with-libtool
35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
36CONFIGURE_ARGS+= --localstatedir=${VARBASE} 36CONFIGURE_ARGS+= --localstatedir=${VARBASE}
37CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 37CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
38CONFIGURE_ARGS+= --with-python=no 38CONFIGURE_ARGS+= --with-python=no
39.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ 39.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
40 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ 40 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
41 !empty(MACHINE_PLATFORM:MNetBSD-*-vax) 41 !empty(MACHINE_PLATFORM:MNetBSD-*-vax) || \
 42 !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
42CONFIGURE_ARGS+= --disable-atomic 43CONFIGURE_ARGS+= --disable-atomic
43.endif 44.endif
44CONFIGURE_ARGS.DragonFly+= --disable-kqueue 45CONFIGURE_ARGS.DragonFly+= --disable-kqueue
45CONFIGURE_ARGS.SunOS+= --disable-epoll 46CONFIGURE_ARGS.SunOS+= --disable-epoll
46 47
47BUILDLINK_TRANSFORM.SunOS+= rm:-zrelax=transtls 48BUILDLINK_TRANSFORM.SunOS+= rm:-zrelax=transtls
48 49
49PKG_GROUPS_VARS+= BIND_GROUP 50PKG_GROUPS_VARS+= BIND_GROUP
50PKG_USERS_VARS= BIND_USER 51PKG_USERS_VARS= BIND_USER
51 52
52PKG_GROUPS= ${BIND_GROUP} 53PKG_GROUPS= ${BIND_GROUP}
53PKG_USERS= ${BIND_USER}:${BIND_GROUP} 54PKG_USERS= ${BIND_USER}:${BIND_GROUP}
54 55
55PKG_GECOS.${BIND_USER}= Named pseudo-user 56PKG_GECOS.${BIND_USER}= Named pseudo-user
56PKG_HOME.${BIND_USER}= ${BIND_DIR} 57PKG_HOME.${BIND_USER}= ${BIND_DIR}
57 58
58DOCS= CHANGES HISTORY OPTIONS README 59DOCS= CHANGES HISTORY OPTIONS README
59 60
60FILES_SUBST+= BIND_GROUP=${BIND_GROUP} \ 61FILES_SUBST+= BIND_GROUP=${BIND_GROUP} \
61 BIND_USER=${BIND_USER} PAX=${PAX:Q} \ 62 BIND_USER=${BIND_USER} PAX=${PAX:Q} \
62 SSLBASE=${SSLBASE} 63 SSLBASE=${SSLBASE}
63MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} 64MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
64 65
65DOCDIR= share/doc/bind9 66DOCDIR= share/doc/bind9
66 67
67RCD_SCRIPTS= named9 68RCD_SCRIPTS= named9
68SMF_METHODS= named 69SMF_METHODS= named
69 70
70INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bind9 71INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bind9
71CONF_FILES+= share/examples/bind9/bind.keys \ 72CONF_FILES+= share/examples/bind9/bind.keys \
72 ${PKG_SYSCONFDIR}/bind.keys 73 ${PKG_SYSCONFDIR}/bind.keys
73 74
74INSTALLATION_DIRS+= ${DOCDIR} 75INSTALLATION_DIRS+= ${DOCDIR}
75 76
76pre-configure: 77pre-configure:
77 cd ${WRKSRC} && autoconf -f 78 cd ${WRKSRC} && autoconf -f
78 79
79post-install: 80post-install:
80.for f in ${DOCS} 81.for f in ${DOCS}
81 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR} 82 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
82.endfor 83.endfor
83 84
84.include "../../security/openssl/buildlink3.mk" 85.include "../../security/openssl/buildlink3.mk"
85.include "../../devel/libuv/buildlink3.mk" 86.include "../../devel/libuv/buildlink3.mk"
86.include "../../devel/zlib/buildlink3.mk" 87.include "../../devel/zlib/buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"