Merge remote-tracking branch 'netbsd/trunk' into joyent/release/trunk

TritonDataCenter · Jul 31, 2022 · 4d967c8 · 4d967c8
2 parents ad5b16f + df47e0e
commit 4d967c8
Show file tree

Hide file tree

Showing 20 changed files with 1,811 additions and 1,863 deletions.
diff --git a/devel/p5-Moose/DESCR b/devel/p5-Moose/DESCR
@@ -1,9 +1,9 @@
-Moose is an extension of the Perl 5 object system.
-The main goal of Moose is to make Perl 5 Object Oriented programming
-easier, more consistent and less tedious. With Moose you can to
-think more about what you want to do and less about the mechanics
-of OOP.
-Additionally, Moose is built on top of Class::MOP, which is a
-metaclass system for Perl 5. This means that Moose not only makes
-building normal Perl 5 objects better, but it provides the power
-of metaclass programming as well.
+Moose is an extension of the Perl 5 object system. The main goal of
+Moose is to make Perl 5 Object Oriented programming easier, more
+consistent and less tedious. With Moose you can think more about what
+you want to do and less about the mechanics of OOP.
+
+Additionally, Moose is built on top of Class::MOP, which is a metaclass
+system for Perl 5. This means that Moose not only makes building normal
+Perl 5 objects better, but it provides the power of metaclass
+programming as well.
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.124 2022/06/28 11:32:51 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2022/07/30 06:49:04 rillig Exp $
 
 DISTNAME=	Moose-2.2201
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
 

diff --git a/devel/py-build/Makefile b/devel/py-build/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/06/23 07:26:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/07/30 20:21:32 tnn Exp $
 
 DISTNAME=	build-0.8.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,7 +23,8 @@ USE_PKG_RESOURCES=	yes
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYPKGPREFIX} == "py37"
-DEPENDS+=	${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
+#DEPENDS+=	${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
+BROKEN+=		"circular dependency"
 .endif
 
 post-install:

diff --git a/doc/CHANGES-2022 b/doc/CHANGES-2022
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.3598 2022/07/30 01:22:38 tnn Exp $
+$NetBSD: CHANGES-2022,v 1.3604 2022/07/30 16:14:29 he Exp $
 
 Changes to the packages collection and infrastructure in 2022:
 
@@ -5377,9 +5377,14 @@ Changes to the packages collection and infrastructure in 2022:
 	Updated www/py-uvicorn to 0.18.2 [adam 2022-07-29]
 	Updated devel/cmake to 3.23.3 [adam 2022-07-29]
 	Updated finance/py-braintree to 4.16.0 [adam 2022-07-29]
-	Added u-boot-pinecube version 2022.04 [thorpej 2022-07-29]
+	Added sysutils/u-boot-pinecube version 2022.04 [thorpej 2022-07-29]
 	Updated x11/gtk4 to 4.6.6 [wiz 2022-07-29]
 	Added devel/libadwaita version 1.0.5 [wiz 2022-07-29]
 	Updated devel/libadwaita to 1.1.3 [wiz 2022-07-29]
 	Updated security/mit-krb5 to 1.19.3 [jperkin 2022-07-29]
 	Updated time/ntpsec to 1.2.1 [tnn 2022-07-30]
+	Updated pkgtools/lintpkgsrc to 4.99 [rillig 2022-07-30]
+	Updated time/ruby-tzinfo1 to 1.2.10 [taca 2022-07-30]
+	Updated time/ruby-tzinfo to 2.0.5 [taca 2022-07-30]
+	Updated security/pear-Crypt_GPG to 1.6.7nb1 [taca 2022-07-30]
+	Updated math/py-scipy to 1.8.1nb3 [he 2022-07-30]
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2022/06/28 11:34:45 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2022/07/30 16:13:47 he Exp $
 
 DISTNAME=	scipy-1.8.1
-PKGREVISION=	2
+PKGREVISION=	3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scipy/}

diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.36 2022/05/27 16:59:50 tnn Exp $
+$NetBSD: distinfo,v 1.37 2022/07/30 16:13:47 he Exp $
 
 BLAKE2s (scipy-1.8.1.tar.gz) = 364d6645a49d897429094a406e6073e124c1ebca01f4be63ebe401b660d8df38
 SHA512 (scipy-1.8.1.tar.gz) = f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
 Size (scipy-1.8.1.tar.gz) = 38196215 bytes
 SHA1 (patch-scipy_spatial_ckdtree_src_ckdtree__decl.h) = ad0e4a79af2a3b0667e61f205f5b8453ea440498
 SHA1 (patch-scipy_special___logit.h) = c729c2b73de00cad4c9ad834a79b80dea7b05af3
 SHA1 (patch-scipy_special___round.h) = bc05a935e6423ce8395450ad3b30e88826939422
+SHA1 (patch-scipy_stats__unuran_setup.py) = 9839f589fdfe7f1f74e84f32526a2ce96a28d04a
diff --git a/math/py-scipy/patches/patch-scipy_stats__unuran_setup.py b/math/py-scipy/patches/patch-scipy_stats__unuran_setup.py
@@ -0,0 +1,16 @@
+$NetBSD: patch-scipy_stats__unuran_setup.py,v 1.1 2022/07/30 16:13:48 he Exp $
+
+On NetBSD/powerpc, you can't build with _ISOC99_SOURCE defined,
+the include of <ieeefp.h> deep down in the python headers will fail
+with undefined types.
+
+--- ./scipy/stats/_unuran/setup.py.orig	2022-05-16 12:36:53.864307900 +0000
++++ ./scipy/stats/_unuran/setup.py
+@@ -95,7 +95,6 @@ def configuration(parent_package="", top
+         ("UNUR_ENABLE_INFO", "1"),
+         ("VERSION", '"%s"' % UNURAN_VERSION),
+         ("HAVE_CONFIG_H", "1"),
+-        ("_ISOC99_SOURCE", "1"),
+     ]
+
+     UNURAN_DIRS = [
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile
@@ -1,31 +1,26 @@
-# $NetBSD: Makefile,v 1.39 2022/06/28 11:35:24 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2022/07/30 16:20:18 rillig Exp $
 
-PKGNAME=	lintpkgsrc-4.98
-PKGREVISION=	1
+PKGNAME=	lintpkgsrc-4.99
 CATEGORIES=	pkgtools
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://www.NetBSD.org/Documentation/pkgsrc/
+HOMEPAGE=	https://www.NetBSD.org/docs/pkgsrc/
 COMMENT=	Sanity checks on the complete pkgsrc tree
 
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
+TEST_DEPENDS+=	p5-Capture-Tiny>=0:../../devel/p5-Capture-Tiny
 CONFLICTS+=	pkglint<4.82
 
 USE_TOOLS+=	perl:run
 
 WRKSRC=		${WRKDIR}
-NO_BUILD=	yes
 USE_LANGUAGES=	# none
 AUTO_MKDIRS=	yes
 
 SUBST_CLASSES+=		lp
 SUBST_STAGE.lp=		post-configure
 SUBST_FILES.lp+=	lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl
-.if defined(BATCH)
-SUBST_SED.lp+=		-e 's;@PKGSRCDIR@;/usr/pkgsrc;g'
-.else
-SUBST_VARS.lp+=		PKGSRCDIR
-.endif
+SUBST_SED.lp+=		-e 's;@PKGSRCDIR@;${BATCH:D/usr/pkgsrc:U${PKGSRCDIR}};g'
 SUBST_VARS.lp+=		MAKE
 SUBST_VARS.lp+=		PERL5
 SUBST_VARS.lp+=		PKG_SYSCONFDIR
@@ -34,7 +29,16 @@ SUBST_VARS.lp+=		PREFIX
 .include "../../mk/bsd.prefs.mk"
 
 do-extract:
-	cd ${FILESDIR} && cp lintpkgsrc.* ${WRKSRC}/
+	cd ${FILESDIR} && cp -R lintpkgsrc.* t ${WRKSRC}/
+
+do-build:
+	# Nothing
+
+do-test:
+	${RUN} cd ${WRKSRC}/t;						\
+	for test in ./*.t; do						\
+		perl "$$test";						\
+	done
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc.pl ${DESTDIR}${PREFIX}/bin/lintpkgsrc