CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "matthew green" <mrg%netbsd.org@localhost>
Date: Sun, 25 Apr 2021 07:51:27 +0000

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Apr 25 07:51:27 UTC 2021

Modified Files:
        pkgsrc/audio/mpg123: options.mk
        pkgsrc/audio/speexdsp: Makefile
        pkgsrc/biology/vsearch: Makefile
        pkgsrc/emulators/libretro-parallel-n64: Makefile
        pkgsrc/games/ioquake3: distinfo
        pkgsrc/games/ioquake3/patches: patch-ac
        pkgsrc/graphics/MesaLib: Makefile
        pkgsrc/graphics/exiv2: distinfo
        pkgsrc/graphics/exiv2/patches: patch-cmake_compilerFlags.cmake
        pkgsrc/graphics/graphviz: distinfo
        pkgsrc/graphics/graphviz/patches: patch-configure
        pkgsrc/lang/clisp: Makefile
        pkgsrc/math/lp_solve: Makefile
        pkgsrc/mk/compiler: gfortran.mk
        pkgsrc/mk/platform: NetBSD.mk
        pkgsrc/multimedia/libaom: Makefile
        pkgsrc/news/nn: Makefile
        pkgsrc/parallel/threadingbuildingblocks: distinfo
        pkgsrc/parallel/threadingbuildingblocks/patches: patch-build-BSD.inc
        pkgsrc/sysutils/dmidecode: Makefile
        pkgsrc/sysutils/estd: Makefile
        pkgsrc/x11/matchbox-panel: Makefile
        pkgsrc/x11/modular-xorg-server: distinfo
        pkgsrc/x11/modular-xorg-server/patches: patch-configure

Log Message:
various fixes for arm64 big endian support.

most of these simply extend matching from "aarch64" to "aarch64eb"
in various forms of code.  most remaining uses in pkgsrc of
"MACHINE_ARCH == aarch64" are because of missing aarch64eb support,
such as most of the binary-bootstrap requiring languages like rust,
go, and java.

no pkg-bump because this shouldn't change packages on systems that
could already build all of these.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/mpg123/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/speexdsp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/biology/vsearch/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-parallel-n64/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/ioquake3/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/ioquake3/patches/patch-ac
cvs rdiff -u -r1.196 -r1.197 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/exiv2/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake
cvs rdiff -u -r1.64 -r1.65 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/graphviz/patches/patch-configure
cvs rdiff -u -r1.116 -r1.117 pkgsrc/lang/clisp/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/lp_solve/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/compiler/gfortran.mk
cvs rdiff -u -r1.64 -r1.65 pkgsrc/mk/platform/NetBSD.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/libaom/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/news/nn/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/parallel/threadingbuildingblocks/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/dmidecode/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/estd/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/matchbox-panel/Makefile
cvs rdiff -u -r1.106 -r1.107 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/x11/modular-xorg-server/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/mpg123/options.mk
diff -u pkgsrc/audio/mpg123/options.mk:1.9 pkgsrc/audio/mpg123/options.mk:1.10
--- pkgsrc/audio/mpg123/options.mk:1.9  Mon Mar 15 18:25:21 2021
+++ pkgsrc/audio/mpg123/options.mk      Sun Apr 25 07:51:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2021/03/15 18:25:21 dholland Exp $
+# $NetBSD: options.mk,v 1.10 2021/04/25 07:51:24 mrg Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mpg123
 PKG_OPTIONS_OPTIONAL_GROUPS=   fpu
@@ -8,7 +8,7 @@ PKG_OPTIONS_GROUP.fpu=          mpg123-with-fpu
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE_CPU} == "aarch64"
 PKG_OPTIONS_GROUP.fpu+=                mpg123-neon64 mpg123-aarch64
 PKG_SUGGESTED_OPTIONS+=                mpg123-aarch64
 .elif ${MACHINE_ARCH} == "powerpc"

Index: pkgsrc/audio/speexdsp/Makefile
diff -u pkgsrc/audio/speexdsp/Makefile:1.4 pkgsrc/audio/speexdsp/Makefile:1.5
--- pkgsrc/audio/speexdsp/Makefile:1.4  Tue Jun 11 11:59:15 2019
+++ pkgsrc/audio/speexdsp/Makefile      Sun Apr 25 07:51:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/06/11 11:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=      speexdsp-1.2.0
 CATEGORIES=    audio
@@ -14,7 +14,9 @@ GNU_CONFIGURE=                YES
 PKGCONFIG_OVERRIDE=    speexdsp.pc.in
 USE_TOOLS+=            pkg-config
 
-.if ${MACHINE_ARCH} == "aarch64"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_CPU} == "aarch64"
 CONFIGURE_ARGS+=       --disable-neon
 .endif
 

Index: pkgsrc/biology/vsearch/Makefile
diff -u pkgsrc/biology/vsearch/Makefile:1.2 pkgsrc/biology/vsearch/Makefile:1.3
--- pkgsrc/biology/vsearch/Makefile:1.2 Sat May 11 14:27:18 2019
+++ pkgsrc/biology/vsearch/Makefile     Sun Apr 25 07:51:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/05/11 14:27:18 bacon Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=      vsearch-2.13.4
 CATEGORIES=    biology
@@ -11,7 +11,7 @@ COMMENT=      Versatile open-source tool for 
 LICENSE=       gnu-gpl-v3
 
 # Works on powerpc64, but only in little endian mode
-ONLY_FOR_PLATFORM=     *-*-aarch64 *-*-x86_64
+ONLY_FOR_PLATFORM=     *-*-aarch64* *-*-x86_64
 
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            autoconf automake autoreconf gmake

Index: pkgsrc/emulators/libretro-parallel-n64/Makefile
diff -u pkgsrc/emulators/libretro-parallel-n64/Makefile:1.3 pkgsrc/emulators/libretro-parallel-n64/Makefile:1.4
--- pkgsrc/emulators/libretro-parallel-n64/Makefile:1.3 Thu Dec 31 20:04:11 2020
+++ pkgsrc/emulators/libretro-parallel-n64/Makefile     Sun Apr 25 07:51:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/12/31 20:04:11 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=      libretro-parallel-n64-20200528
 CATEGORIES=    emulators
@@ -19,7 +19,7 @@ LIBRETRO_CORE=        parallel_n64
 MAKE_FLAGS+=   WITH_DYNAREC=x86
 .elif ${MACHINE_ARCH} == "x86_64"
 MAKE_FLAGS+=   WITH_DYNAREC=x86_64
-.elif ${MACHINE_ARCH} == "aarch64"
+.elif ${MACHINE_CPU} == "aarch64"
 MAKE_FLAGS+=   WITH_DYNAREC=aarch64
 MAKE_FLAGS+=   HAVE_NEON=0
 CFLAGS+=       -DNO_ASM -DARM_FIX

Index: pkgsrc/games/ioquake3/distinfo
diff -u pkgsrc/games/ioquake3/distinfo:1.8 pkgsrc/games/ioquake3/distinfo:1.9
--- pkgsrc/games/ioquake3/distinfo:1.8  Sat Jan 25 20:13:49 2020
+++ pkgsrc/games/ioquake3/distinfo      Sun Apr 25 07:51:26 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2020/01/25 20:13:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.9 2021/04/25 07:51:26 mrg Exp $
 
 SHA1 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 791bc69ea853ced457134ed4759a76b40cd0e008
 RMD160 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 10c18309b358b0b091073f96c3ddaeb7c1535aa5
 SHA512 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 
689a0efa6eaf88fcf98616c100df625b77617c55e351455cc25727fea525748855c58e2288f04d86372d392a556f2ef4926e2c808f75e104ac328baa9458c4d1
 Size (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 7691640 bytes
 SHA1 (patch-aa) = b146df4f36fc7f9e0bfece50bd154c24e507dc2f
-SHA1 (patch-ac) = dc32068082c3493eb503811c2577b8fadb2745d3
+SHA1 (patch-ac) = 93f78831bf301a52d2235a004bab7c1d335f3dc0
 SHA1 (patch-code_tools_lcc_cpp_unix.c) = e80699461d92b9a659c88c0f5d66580ecf237f5f

Index: pkgsrc/games/ioquake3/patches/patch-ac
diff -u pkgsrc/games/ioquake3/patches/patch-ac:1.4 pkgsrc/games/ioquake3/patches/patch-ac:1.5
--- pkgsrc/games/ioquake3/patches/patch-ac:1.4  Sat Jan 25 20:13:49 2020
+++ pkgsrc/games/ioquake3/patches/patch-ac      Sun Apr 25 07:51:26 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2020/01/25 20:13:49 jmcneill Exp $
+$NetBSD: patch-ac,v 1.5 2021/04/25 07:51:26 mrg Exp $
 
---- Makefile.orig      2019-12-07 13:16:15.000000000 +0000
-+++ Makefile
-@@ -11,6 +11,13 @@ ifeq ($(COMPILE_PLATFORM),sunos)
+--- Makefile.orig      2019-12-07 05:16:15.000000000 -0800
++++ Makefile   2021-04-24 18:01:14.100897227 -0700
+@@ -11,6 +11,16 @@
    COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/')
  endif
  
@@ -11,12 +11,15 @@ $NetBSD: patch-ac,v 1.4 2020/01/25 20:13
 +  ifeq ($(COMPILE_CPU),aarch64)
 +    COMPILE_ARCH=$(COMPILE_CPU)
 +  endif
++  ifeq ($(COMPILE_CPU),aarch64eb)
++    COMPILE_ARCH=aarch64
++  endif
 +endif
 +
  ifndef BUILD_STANDALONE
    BUILD_STANDALONE =
  endif
-@@ -850,11 +857,38 @@ ifeq ($(PLATFORM),netbsd)
+@@ -850,11 +860,38 @@
  
    BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
  

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.196 pkgsrc/graphics/MesaLib/Makefile:1.197
--- pkgsrc/graphics/MesaLib/Makefile:1.196      Mon Apr 12 12:40:01 2021
+++ pkgsrc/graphics/MesaLib/Makefile    Sun Apr 25 07:51:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2021/04/12 12:40:01 nia Exp $
+# $NetBSD: Makefile,v 1.197 2021/04/25 07:51:26 mrg Exp $
 
 DISTNAME=      mesa-20.0.6
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -57,7 +57,7 @@ MESON_ARGS+=          -Ddri3=false
 .  endif
 PLIST.kms=             yes
 .  if !empty(MACHINE_ARCH:M*arm*) || \
-      ${MACHINE_ARCH} == "aarch64"
+      ${MACHINE_CPU} == "aarch64"
 # ARM Mali Utgard
 GALLIUM_DRIVERS+=      lima
 PLIST.lima=            yes

Index: pkgsrc/graphics/exiv2/distinfo
diff -u pkgsrc/graphics/exiv2/distinfo:1.35 pkgsrc/graphics/exiv2/distinfo:1.36
--- pkgsrc/graphics/exiv2/distinfo:1.35 Tue Oct 20 07:07:23 2020
+++ pkgsrc/graphics/exiv2/distinfo      Sun Apr 25 07:51:26 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.35 2020/10/20 07:07:23 tnn Exp $
+$NetBSD: distinfo,v 1.36 2021/04/25 07:51:26 mrg Exp $
 
 SHA1 (exiv2-0.27.3-Source.tar.gz) = f31a74793ce2cd0161915ed1fbec8e79c31cd54d
 RMD160 (exiv2-0.27.3-Source.tar.gz) = 7e3ce6de75aaf87b46d419f86b4b0fc55f133234
 SHA512 (exiv2-0.27.3-Source.tar.gz) = 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
 Size (exiv2-0.27.3-Source.tar.gz) = 26447901 bytes
-SHA1 (patch-cmake_compilerFlags.cmake) = 5b33099de101b47ac6750bb3e62d2169a13f0a8c
+SHA1 (patch-cmake_compilerFlags.cmake) = 5123ad4273c213e7680288ac3919b6cc5f2748d0
 SHA1 (patch-cmake_config.h.cmake) = b7e0336e5ca55a9df08958a05d8ac2a2c800e836
 SHA1 (patch-contrib_organize_Makefile) = 27348fdb0f80092b6e16f27e3ac1dca988eefe70
 SHA1 (patch-contrib_organize_helpers.cpp) = ec003c826d463b3e7e571ab4c41baffaca1240e9

Index: pkgsrc/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake
diff -u pkgsrc/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake:1.2 pkgsrc/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake:1.3
--- pkgsrc/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake:1.2   Tue Oct 20 07:07:24 2020
+++ pkgsrc/graphics/exiv2/patches/patch-cmake_compilerFlags.cmake       Sun Apr 25 07:51:26 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_compilerFlags.cmake,v 1.2 2020/10/20 07:07:24 tnn Exp $
+$NetBSD: patch-cmake_compilerFlags.cmake,v 1.3 2021/04/25 07:51:26 mrg Exp $
 
 Gcc on some platforms does not support -fcf-protection.
 
@@ -9,7 +9,7 @@ Gcc on some platforms does not support -
          # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
          if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
 -            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
-+            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0 AND NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sparc.*|aarch64"))
++            if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0 AND NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sparc.*|aarch64.*"))
                  add_compile_options(-fstack-clash-protection -fcf-protection)
              endif()
  

Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.64 pkgsrc/graphics/graphviz/distinfo:1.65
--- pkgsrc/graphics/graphviz/distinfo:1.64      Mon Jul 27 20:44:15 2020
+++ pkgsrc/graphics/graphviz/distinfo   Sun Apr 25 07:51:26 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2020/07/27 20:44:15 adam Exp $
+$NetBSD: distinfo,v 1.65 2021/04/25 07:51:26 mrg Exp $
 
 SHA1 (graphviz-2.44.1.tar.gz) = 2cda62953bd84b945c4ae4fe7067da9cb26fc937
 RMD160 (graphviz-2.44.1.tar.gz) = 936275110c362ca17239d8084c452f6d1731cacf
@@ -7,7 +7,7 @@ Size (graphviz-2.44.1.tar.gz) = 34079677
 SHA1 (patch-cmd_gvmap_gvmap.sh) = a6047ffe825cf13271b556ba8c4f3c866d04f5c3
 SHA1 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5
 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
-SHA1 (patch-configure) = ce1f7daf5189dabd236e55c5302918b119a23946
+SHA1 (patch-configure) = cbe042e0c92b5db69b565be9a3a4147b65c9590c
 SHA1 (patch-iffe) = f32c6be65209e57a92c215dee25c5c8334142c03
 SHA1 (patch-lib_gvc_Makefile.in) = f469c2dc53cf9af5b1e86f5da04bf9575685bd41
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = b5b46a1e7dc52f163526c5b8b7e1b893d5500e3c

Index: pkgsrc/graphics/graphviz/patches/patch-configure
diff -u pkgsrc/graphics/graphviz/patches/patch-configure:1.8 pkgsrc/graphics/graphviz/patches/patch-configure:1.9
--- pkgsrc/graphics/graphviz/patches/patch-configure:1.8        Mon Jul 27 20:44:15 2020
+++ pkgsrc/graphics/graphviz/patches/patch-configure    Sun Apr 25 07:51:26 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.8 2020/07/27 20:44:15 adam Exp $
+$NetBSD: patch-configure,v 1.9 2021/04/25 07:51:26 mrg Exp $
 
 1. chunk: fix
 ./configure.lineno: 1: Syntax error: Bad substitution
@@ -33,7 +33,8 @@ last last chunk: fix sed expression not 
 @@ -3387,7 +3394,6 @@ if test -z "$LIBPOSTFIX"; then
      *linux* )
        case "${host_cpu}" in
-         aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 )
+-        aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 )
++        aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 )
 -          LIBPOSTFIX="64"
            INTGOSIZE=64
            ;;

Index: pkgsrc/lang/clisp/Makefile
diff -u pkgsrc/lang/clisp/Makefile:1.116 pkgsrc/lang/clisp/Makefile:1.117
--- pkgsrc/lang/clisp/Makefile:1.116    Sun Mar  8 16:50:19 2020
+++ pkgsrc/lang/clisp/Makefile  Sun Apr 25 07:51:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2020/03/08 16:50:19 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2021/04/25 07:51:24 mrg Exp $
 
 DISTNAME=              clisp-2.49
 PKGREVISION=           27
@@ -13,7 +13,7 @@ LICENSE=              gnu-gpl-v2
 
 # XXX: is this still current?
 BROKEN_ON_PLATFORM+=   *-*-arm
-BROKEN_ON_PLATFORM+=   *-*-aarch64
+BROKEN_ON_PLATFORM+=   *-*-aarch64*
 # makes the bulk build hang under MirBSD
 BROKEN_ON_PLATFORM+=   MirBSD-*-*
 

Index: pkgsrc/math/lp_solve/Makefile
diff -u pkgsrc/math/lp_solve/Makefile:1.13 pkgsrc/math/lp_solve/Makefile:1.14
--- pkgsrc/math/lp_solve/Makefile:1.13  Fri Mar 20 11:58:00 2020
+++ pkgsrc/math/lp_solve/Makefile       Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/03/20 11:58:00 nia Exp $
+# $NetBSD: Makefile,v 1.14 2021/04/25 07:51:25 mrg Exp $
 #
 
 DISTNAME=      lp_solve_5.5.2.3_source
@@ -28,7 +28,7 @@ SUBST_FILES.dl+=      demo/ccc
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" || \
-       ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64"
+       ${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"
 LPSOLVE_ARCH=  ux64
 .else
 LPSOLVE_ARCH=  ux32

Index: pkgsrc/mk/compiler/gfortran.mk
diff -u pkgsrc/mk/compiler/gfortran.mk:1.16 pkgsrc/mk/compiler/gfortran.mk:1.17
--- pkgsrc/mk/compiler/gfortran.mk:1.16 Tue Oct 20 19:35:07 2020
+++ pkgsrc/mk/compiler/gfortran.mk      Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.16 2020/10/20 19:35:07 tnn Exp $
+# $NetBSD: gfortran.mk,v 1.17 2021/04/25 07:51:25 mrg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,7 +42,7 @@ COMPILER_GFORTRAN_MK= defined
 POSSIBLE_GFORTRAN_VERSION?=    ${CC_VERSION:S/gcc-//:C/.[0-9].[0-9]$//}
 
 # gcc9 doesn't work on NetBSD/aarch64, but gcc10 does.
-.if !empty(POSSIBLE_GFORTRAN_VERSION:M9) && !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
+.if !empty(POSSIBLE_GFORTRAN_VERSION:M9) && !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
 POSSIBLE_GFORTRAN_VERSION=     10
 .endif
 

Index: pkgsrc/mk/platform/NetBSD.mk
diff -u pkgsrc/mk/platform/NetBSD.mk:1.64 pkgsrc/mk/platform/NetBSD.mk:1.65
--- pkgsrc/mk/platform/NetBSD.mk:1.64   Sun Dec 20 20:22:17 2020
+++ pkgsrc/mk/platform/NetBSD.mk        Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.64 2020/12/20 20:22:17 maya Exp $
+# $NetBSD: NetBSD.mk,v 1.65 2021/04/25 07:51:25 mrg Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -137,14 +137,16 @@ _OPSYS_SUPPORTS_FORTIFY=yes
 # Register support for PIE on supported architectures (with GCC)
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "aarch64")
+    (${MACHINE_ARCH} == "aarch64") || \
+    (${MACHINE_ARCH} == "aarch64eb")
 _OPSYS_SUPPORTS_MKPIE= yes
 .endif
 
 # Register support for RELRO on supported architectures
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "aarch64")
+    (${MACHINE_ARCH} == "aarch64") || \
+    (${MACHINE_ARCH} == "aarch64eb")
 _OPSYS_SUPPORTS_RELRO= yes
 .endif
 

Index: pkgsrc/multimedia/libaom/Makefile
diff -u pkgsrc/multimedia/libaom/Makefile:1.10 pkgsrc/multimedia/libaom/Makefile:1.11
--- pkgsrc/multimedia/libaom/Makefile:1.10      Wed Dec 23 15:03:09 2020
+++ pkgsrc/multimedia/libaom/Makefile   Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/12/23 15:03:09 gdt Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/25 07:51:25 mrg Exp $
 
 PKGNAME=       libaom-1.0.0
 PKGREVISION=   3
@@ -38,7 +38,7 @@ CMAKE_ARGS+=  -DENABLE_WERROR:BOOL=OFF
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) \
-  || !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) \
+  || !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) \
   || !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
 CMAKE_ARGS+=   -DCONFIG_RUNTIME_CPU_DETECT=0
 .endif

Index: pkgsrc/news/nn/Makefile
diff -u pkgsrc/news/nn/Makefile:1.52 pkgsrc/news/nn/Makefile:1.53
--- pkgsrc/news/nn/Makefile:1.52        Wed Dec 23 16:28:47 2020
+++ pkgsrc/news/nn/Makefile     Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2020/12/23 16:28:47 mlelstv Exp $
+# $NetBSD: Makefile,v 1.53 2021/04/25 07:51:25 mrg Exp $
 
 DISTNAME=      nn-6.7.3
 PKGREVISION=   5
@@ -33,7 +33,7 @@ SFILE.*=      s-netbsd.h
 MFILE= m-i80386.h
 .elif ${MACHINE_ARCH} == "mipseb"
 MFILE= m-mipsel.h
-.elif ${MACHINE_ARCH} == "aarch64"
+.elif ${MACHINE_CPU} == "aarch64"
 MFILE= m-arm.h
 .else
 MFILE= m-${MACHINE_ARCH}.h

Index: pkgsrc/parallel/threadingbuildingblocks/distinfo
diff -u pkgsrc/parallel/threadingbuildingblocks/distinfo:1.5 pkgsrc/parallel/threadingbuildingblocks/distinfo:1.6
--- pkgsrc/parallel/threadingbuildingblocks/distinfo:1.5        Fri Apr  2 07:59:35 2021
+++ pkgsrc/parallel/threadingbuildingblocks/distinfo    Sun Apr 25 07:51:26 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/04/02 07:59:35 mrg Exp $
+$NetBSD: distinfo,v 1.6 2021/04/25 07:51:26 mrg Exp $
 
 SHA1 (oneTBB-2020.3.tar.gz) = ae543670251a6d667e6f077ecfab0d5bb09b270c
 RMD160 (oneTBB-2020.3.tar.gz) = 1f3918c0dadfcddd2b38f398299de0d8542f11b4
 SHA512 (oneTBB-2020.3.tar.gz) = ea1ffd22c7234d715b8c46a4e51b40719c7a9b8837ab3166f1da5a2c6061167c2be2126b1d74fd361eec6975b8fce0df26829ca2e7af8029edbb52e40f23d630
 Size (oneTBB-2020.3.tar.gz) = 2639737 bytes
-SHA1 (patch-build-BSD.inc) = 218f46a9037d1ec081fc0bcd5c539d93cc5cfd2a
+SHA1 (patch-build-BSD.inc) = 357d7d76f37c88f2849ddf90970989161094ecfb

Index: pkgsrc/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc
diff -u pkgsrc/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc:1.1 pkgsrc/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc:1.2
--- pkgsrc/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc:1.1     Fri Apr  2 07:59:35 2021
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc Sun Apr 25 07:51:26 2021
@@ -1,16 +1,19 @@
-$NetBSD: patch-build-BSD.inc,v 1.1 2021/04/02 07:59:35 mrg Exp $
+$NetBSD: patch-build-BSD.inc,v 1.2 2021/04/25 07:51:26 mrg Exp $
 
 Support arm64.
 
 --- build/BSD.inc.orig 2020-07-10 06:18:01.000000000 -0700
 +++ build/BSD.inc      2021-04-02 00:55:40.143683568 -0700
-@@ -22,6 +22,9 @@
+@@ -22,6 +22,12 @@
          ifeq ($(shell uname -m),amd64)
                  export arch:=intel64
          endif
 +        ifeq ($(shell uname -p),aarch64)
 +                export arch:=arm64
 +        endif
++        ifeq ($(shell uname -p),aarch64eb)
++                export arch:=arm64
++        endif
  endif
  
  ifndef runtime

Index: pkgsrc/sysutils/dmidecode/Makefile
diff -u pkgsrc/sysutils/dmidecode/Makefile:1.34 pkgsrc/sysutils/dmidecode/Makefile:1.35
--- pkgsrc/sysutils/dmidecode/Makefile:1.34     Sat Mar 20 06:44:11 2021
+++ pkgsrc/sysutils/dmidecode/Makefile  Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/03/20 06:44:11 msaitoh Exp $
+# $NetBSD: Makefile,v 1.35 2021/04/25 07:51:25 mrg Exp $
 #
 
 DISTNAME=      dmidecode-3.3
@@ -21,6 +21,6 @@ PATCH_DIST_STRIP=     -p1
 MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 
-ONLY_FOR_PLATFORM=     *-*-i386 *-*-x86_64 *-*-aarch64
+ONLY_FOR_PLATFORM=     *-*-i386 *-*-x86_64 *-*-aarch64*
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/estd/Makefile
diff -u pkgsrc/sysutils/estd/Makefile:1.37 pkgsrc/sysutils/estd/Makefile:1.38
--- pkgsrc/sysutils/estd/Makefile:1.37  Wed Apr 29 19:47:46 2020
+++ pkgsrc/sysutils/estd/Makefile       Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/04/29 19:47:46 maya Exp $
+# $NetBSD: Makefile,v 1.38 2021/04/25 07:51:25 mrg Exp $
 
 DISTNAME=      estd-r11
 PKGNAME=       estd-0.11
@@ -21,7 +21,7 @@ ONLY_FOR_PLATFORM=    NetBSD-*-i386 \
                        NetBSD-*-powerpc \
                        NetBSD-*-mips64el \
                        NetBSD-*-earm* NetBSD-*-arm* \
-                       NetBSD-*-aarch64
+                       NetBSD-*-aarch64*
 
 RCD_SCRIPTS=           estd
 RCD_SCRIPT_SRC.estd=   ${WRKSRC}/estd.sh

Index: pkgsrc/x11/matchbox-panel/Makefile
diff -u pkgsrc/x11/matchbox-panel/Makefile:1.35 pkgsrc/x11/matchbox-panel/Makefile:1.36
--- pkgsrc/x11/matchbox-panel/Makefile:1.35     Mon Aug 17 20:20:30 2020
+++ pkgsrc/x11/matchbox-panel/Makefile  Sun Apr 25 07:51:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/08/17 20:20:30 leot Exp $
+# $NetBSD: Makefile,v 1.36 2021/04/25 07:51:25 mrg Exp $
 #
 
 DISTNAME=              matchbox-panel-0.9.2
@@ -30,7 +30,7 @@ MAKE_ENV+=            PKGLOCALEDIR=${PKGLOCALEDIR}
 PLIST_VARS=            apm
 .if ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS" || \
     (${OPSYS} == "NetBSD" && \
-      (${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64"))
+      (${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"))
 # Nada
 .else
 PLIST.apm=             yes

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.106 pkgsrc/x11/modular-xorg-server/distinfo:1.107
--- pkgsrc/x11/modular-xorg-server/distinfo:1.106       Tue Apr 13 18:46:55 2021
+++ pkgsrc/x11/modular-xorg-server/distinfo     Sun Apr 25 07:51:27 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.106 2021/04/13 18:46:55 wiz Exp $
+$NetBSD: distinfo,v 1.107 2021/04/25 07:51:27 mrg Exp $
 
 SHA1 (xorg-server-1.20.11.tar.bz2) = 86ae4add5719e6026a569f5559d51e8707171d5d
 RMD160 (xorg-server-1.20.11.tar.bz2) = 9b451d5523e9384df37e0e91f52d843090590d23
 SHA512 (xorg-server-1.20.11.tar.bz2) = 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
 Size (xorg-server-1.20.11.tar.bz2) = 6476116 bytes
-SHA1 (patch-configure) = ce2c732c3d8493445744a927a25b9cd3b45880f8
+SHA1 (patch-configure) = 4c2d439e622ec14ec2f8a3a2f556c67e60259f82
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92

Index: pkgsrc/x11/modular-xorg-server/patches/patch-configure
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.5 pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.6
--- pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.5  Wed Feb  5 20:18:27 2020
+++ pkgsrc/x11/modular-xorg-server/patches/patch-configure      Sun Apr 25 07:51:27 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2020/02/05 20:18:27 tnn Exp $
+$NetBSD: patch-configure,v 1.6 2021/04/25 07:51:27 mrg Exp $
 
 Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
 (c.f. patch-hw_xfree86_os-support_bsd_i386.c)
@@ -12,7 +12,7 @@ for netbsd, force pass pthread configure
        GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
        ;;
 -  arm*)
-+  *arm*|aarch64)
++  *arm*|aarch64*)
        ARM_VIDEO=yes
        DEFAULT_INT10="stub"
        ;;

Follow-Ups:
- Re: CVS commit: pkgsrc
  - From: Jonathan Perkin

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/zzuf
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: Re: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index