pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/xorg-cf-files
Module Name: pkgsrc
Committed By: wiz
Date: Wed Feb 22 07:44:55 UTC 2023
Modified Files:
pkgsrc/x11/xorg-cf-files: Makefile distinfo
pkgsrc/x11/xorg-cf-files/patches: patch-ac patch-ad patch-ae patch-af
patch-ag patch-ai patch-ak
Log Message:
xorg-cf-files: update to 1.0.8.
This package contains the configuration files, platform data, & Makefile
templates for the archaic Imake build tool. This is a minor update to
ship the contributed support for Linux on RISC-V & LoongArch, and
AArch64 on Darwin (MacOS), as well as to fix incompatibility when using
GNU binutils 2.36 and later on FreeBSD, and to correct the setting of
the rarely (never?) used ENCODINGSDIR in site.def.
As before, while we continue to accept patches and publish updates for the
benefit of other packages which still use Imake to build, we have not been
actively maintaining, testing, or adding new OS or platform support for
Imake since 2005. X.Org strongly encourages anyone still using Imake to
move to meson or another modern/maintained build tool.
For example, this release adds support for installing with meson as well
as the traditional GNU autoconf. Please test building with meson and
report any issues you hit to our gitlab issue tracker at:
https://gitlab.freedesktop.org/xorg/util/cf/-/issues
as we plan on removing the autoconf build support in a future release.
Alan Coopersmith (12):
gitlab CI: add a basic build test
Build xz tarballs instead of bzip2
Fix spelling/wording issues
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters
gitlab CI: stop requiring Signed-off-by in commits
More typo fixes
configure.ac: Don't pass through '${FONTROOTDIR}' into site.def
meson: Add option to build with meson
meson: modernize some usage in meson.build & .gitlab-CI.yml
meson: simplify installation of empty *.def files
configure: Switch to XORG_DEFAULT_NOCODE_OPTIONS
xorg-cf-files 1.0.8
Emil Velikov (1):
autogen.sh: use quoted string variables
Marek Szuba (1):
Linux/RISC-V support
Peter Hutterer (1):
autogen.sh: use exec instead of waiting for configure to finish
WANG Xuerui (1):
Add support for Linux/LoongArch
Weijia (1):
Add support for aarch64-darwin
Yasuhiro Kimura (1):
Fix incompatibility issue of GNU binutils 2.36 and later on FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/xorg-cf-files/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/xorg-cf-files/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xorg-cf-files/patches/patch-ac \
pkgsrc/x11/xorg-cf-files/patches/patch-ae
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xorg-cf-files/patches/patch-ad
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xorg-cf-files/patches/patch-af
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xorg-cf-files/patches/patch-ag
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xorg-cf-files/patches/patch-ai
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xorg-cf-files/patches/patch-ak
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/xorg-cf-files/Makefile
diff -u pkgsrc/x11/xorg-cf-files/Makefile:1.41 pkgsrc/x11/xorg-cf-files/Makefile:1.42
--- pkgsrc/x11/xorg-cf-files/Makefile:1.41 Fri Jan 20 22:46:34 2023
+++ pkgsrc/x11/xorg-cf-files/Makefile Wed Feb 22 07:44:55 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2023/01/20 22:46:34 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/02/22 07:44:55 wiz Exp $
-DISTNAME= xorg-cf-files-1.0.7
-PKGREVISION= 2
+DISTNAME= xorg-cf-files-1.0.8
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/}
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://xorg.freedesktop.org/
Index: pkgsrc/x11/xorg-cf-files/distinfo
diff -u pkgsrc/x11/xorg-cf-files/distinfo:1.36 pkgsrc/x11/xorg-cf-files/distinfo:1.37
--- pkgsrc/x11/xorg-cf-files/distinfo:1.36 Fri Jan 20 22:46:34 2023
+++ pkgsrc/x11/xorg-cf-files/distinfo Wed Feb 22 07:44:55 2023
@@ -1,21 +1,20 @@
-$NetBSD: distinfo,v 1.36 2023/01/20 22:46:34 mrg Exp $
+$NetBSD: distinfo,v 1.37 2023/02/22 07:44:55 wiz Exp $
-BLAKE2s (xorg-cf-files-1.0.7.tar.bz2) = 7c971e7951a9369904f766fb5a9e6c78fd07703131e2a042e858e53480f27fd7
-SHA512 (xorg-cf-files-1.0.7.tar.bz2) = 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
-Size (xorg-cf-files-1.0.7.tar.bz2) = 345575 bytes
+BLAKE2s (xorg-cf-files-1.0.8.tar.xz) = e8a410f3363e12daafc5566b665b019177c0bba86dd6f82bdf2073a150199fc8
+SHA512 (xorg-cf-files-1.0.8.tar.xz) = cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9
+Size (xorg-cf-files-1.0.8.tar.xz) = 290280 bytes
SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
SHA1 (patch-aa) = 850672428eec76facfc7862bb9a2a8e1a00ee56d
-SHA1 (patch-ab) = c30b0ac9e661aa76a65877ef7cd4c422a8f0405b
-SHA1 (patch-ac) = e084d790e7713897ba2366145b2088f933aa94e0
-SHA1 (patch-ad) = fcdddf191f676287b7f42e2b16729ed34afc6786
-SHA1 (patch-ae) = d89ea1af22b3d0fab3cc431e3353c9efe4a92264
-SHA1 (patch-af) = 42c0e0738a5ca20c2f7aa09684630093970c1dee
-SHA1 (patch-ag) = b7c07619141df8d8ae718732343fd185098bdafb
+SHA1 (patch-ac) = 2c0864d2a6bcbdeba12ffa4318df6bd80bea1f0e
+SHA1 (patch-ad) = 0a231ebd8b615bf3c8e630f0ebc394619b2c3e23
+SHA1 (patch-ae) = 4f97fba73c5ce7d4d9b402921605bcd9d9975abf
+SHA1 (patch-af) = e158cf3aca506dbc86c35c2a94cec9e47a238308
+SHA1 (patch-ag) = 6c9d9f28f93edf615822c7882bed33b05a2de9f3
SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
-SHA1 (patch-ai) = ec2523615802a89c63d7015089a908133438b812
+SHA1 (patch-ai) = 5725df2f2321363b630171cf9316f97ade9f4b3f
SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
-SHA1 (patch-ak) = ec4e8c30782e3081a84b8c3bd8ab71961a0f13cb
+SHA1 (patch-ak) = 8c683fce8a3a42715ad11d7f917263e48dbf4fba
SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
SHA1 (patch-sv4Lib.rules) = f7ea2b29a8d3f4e866578fc81d0bbb6a3e598bb3
Index: pkgsrc/x11/xorg-cf-files/patches/patch-ac
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ac:1.5 pkgsrc/x11/xorg-cf-files/patches/patch-ac:1.6
--- pkgsrc/x11/xorg-cf-files/patches/patch-ac:1.5 Fri Jan 20 22:46:34 2023
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ac Wed Feb 22 07:44:55 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.5 2023/01/20 22:46:34 mrg Exp $
+$NetBSD: patch-ac,v 1.6 2023/02/22 07:44:55 wiz Exp $
---- linux.cf.orig 2021-08-01 18:00:38.000000000 -0700
-+++ linux.cf 2023-01-18 14:02:08.805022786 -0800
-@@ -90,6 +90,10 @@ XCOMM platform: $XFree86: xc/config/cf/
- # define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion
+--- linux.cf.orig 2023-02-22 02:28:43.000000000 +0000
++++ linux.cf
+@@ -94,6 +94,10 @@ XCOMM platform: $XFree86: xc/config/cf/
+ #define HasGnuAr YES
#endif
+#ifndef HasGnuAr
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.5 2023/01/20 22:46
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
XCOMM binutils: (LinuxBinUtilsMajorVersion)
-@@ -615,10 +619,10 @@ InstallNamedTargetNoClobber(install,file
+@@ -619,10 +623,10 @@ InstallNamedTargetNoClobber(install,file
# if defined (i386Architecture) && ((GccMajorVersion >3) \
|| ((GccMajorVersion == 3) && (GccMinorVersion >= 1)))
# ifndef CcCmd
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.5 2023/01/20 22:46
# endif
# endif
# if defined (Ppc64Architecture)
-@@ -785,7 +789,6 @@ InstallNamedTargetNoClobber(install,file
+@@ -789,7 +793,6 @@ InstallNamedTargetNoClobber(install,file
#define YaccCmd bison -y
#define LexCmd flex -l
#define HasFlex YES
@@ -34,7 +34,7 @@ $NetBSD: patch-ac,v 1.5 2023/01/20 22:46
#define PreProcessCmd CcCmd -E
#define PostIncDir DefaultGccIncludeDir
#define LdCombineFlags -r
-@@ -859,7 +862,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -863,7 +866,7 @@ InstallNamedTargetNoClobber(install,file
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -43,7 +43,7 @@ $NetBSD: patch-ac,v 1.5 2023/01/20 22:46
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -1066,20 +1069,12 @@ InstallNamedTargetNoClobber(install,file
+@@ -1106,20 +1109,12 @@ InstallNamedTargetNoClobber(install,file
#endif
Index: pkgsrc/x11/xorg-cf-files/patches/patch-ae
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ae:1.5 pkgsrc/x11/xorg-cf-files/patches/patch-ae:1.6
--- pkgsrc/x11/xorg-cf-files/patches/patch-ae:1.5 Thu Dec 1 21:14:09 2022
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ae Wed Feb 22 07:44:55 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2022/12/01 21:14:09 jperkin Exp $
+$NetBSD: patch-ae,v 1.6 2023/02/22 07:44:55 wiz Exp $
---- DragonFly.cf.orig 2021-08-02 01:00:38
+--- DragonFly.cf.orig 2023-02-22 02:28:43.000000000 +0000
+++ DragonFly.cf
-@@ -96,12 +96,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+@@ -96,12 +96,12 @@ XCOMM operating system: OSName (OSMajor
#define HasFlex YES
#ifndef CcCmd
@@ -18,14 +18,14 @@ $NetBSD: patch-ae,v 1.5 2022/12/01 21:14
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
-@@ -115,10 +115,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
- # define NoSystemWarn
+@@ -116,10 +116,6 @@ XCOMM operating system: OSName (OSMajor
# endif
# define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions
--#endif
+ #endif
-#ifndef ExtraLibraries
-/* support for multi-byte locales is in libxpg4 rather than libc */
-#define ExtraLibraries -lxpg4
- #endif
+-#endif
#define HasSetUserContext YES
#define HasGetpeereid YES
+ #define HasMTRRSupport YES
Index: pkgsrc/x11/xorg-cf-files/patches/patch-ad
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ad:1.2 pkgsrc/x11/xorg-cf-files/patches/patch-ad:1.3
--- pkgsrc/x11/xorg-cf-files/patches/patch-ad:1.2 Thu Dec 1 21:14:09 2022
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ad Wed Feb 22 07:44:55 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2022/12/01 21:14:09 jperkin Exp $
+$NetBSD: patch-ad,v 1.3 2023/02/22 07:44:55 wiz Exp $
Support aarch64.
---- darwin.cf.orig 2021-08-02 01:00:38
+--- darwin.cf.orig 2023-02-22 02:28:43.000000000 +0000
+++ darwin.cf
-@@ -97,7 +97,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+@@ -97,7 +97,7 @@ XCOMM operating system: OSName (OSMajor
* Turn off to build on raw Darwin systems.
*/
#ifndef DarwinQuartzSupport
@@ -13,7 +13,7 @@ Support aarch64.
#endif
#if DarwinQuartzSupport
-@@ -170,7 +170,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+@@ -170,7 +170,7 @@ XCOMM operating system: OSName (OSMajor
* so we use the 3.1-based version in this case.
*/
#if (GccMajorVersion == 3) && (GccMinorVersion == 3)
@@ -22,7 +22,7 @@ Support aarch64.
#else
# define CppCmd /usr/bin/cpp
#endif
-@@ -184,8 +184,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+@@ -184,8 +184,8 @@ XCOMM operating system: OSName (OSMajor
#endif
/* we have a gcc compatible compiler, but its not called gcc */
@@ -33,7 +33,7 @@ Support aarch64.
/* default flags to pass to cc */
#ifndef DefaultCCOptions
-@@ -213,7 +213,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+@@ -213,7 +213,7 @@ XCOMM operating system: OSName (OSMajor
#ifdef PpcDarwinArchitecture
# define DarwinMachineDefines -D__powerpc__
# if HasGcc3
@@ -42,7 +42,7 @@ Support aarch64.
# else
# define OptimizedCDebugFlags -O2
# endif
-@@ -223,13 +223,22 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+@@ -223,13 +223,22 @@ XCOMM operating system: OSName (OSMajor
#ifdef i386DarwinArchitecture
# define DarwinMachineDefines -D__i386__
# if HasGcc3
@@ -63,6 +63,6 @@ Support aarch64.
+# endif
+# define ByteOrder X_LITTLE_ENDIAN
+#endif
-
#ifdef x86_64DarwinArchitecture
# define DarwinMachineDefines -D__x86_64__
+ # if HasGcc3
Index: pkgsrc/x11/xorg-cf-files/patches/patch-af
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-af:1.10 pkgsrc/x11/xorg-cf-files/patches/patch-af:1.11
--- pkgsrc/x11/xorg-cf-files/patches/patch-af:1.10 Thu Dec 1 21:14:09 2022
+++ pkgsrc/x11/xorg-cf-files/patches/patch-af Wed Feb 22 07:44:55 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.10 2022/12/01 21:14:09 jperkin Exp $
+$NetBSD: patch-af,v 1.11 2023/02/22 07:44:55 wiz Exp $
- Ensure all programs and libraries have a LOCALBASE rpath.
- Disable Solaris64bitSubdir, at least until multi-arch is supported.
- Use pkgsrc CC, CXX, CFLAGS and INSTALL.
---- sun.cf.orig 2021-08-02 01:00:39
+--- sun.cf.orig 2023-02-22 02:28:43.000000000 +0000
+++ sun.cf
-@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
+@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
# endif
# endif
# if OSMinorVersion > 10
@@ -18,19 +18,19 @@ $NetBSD: patch-af,v 1.10 2022/12/01 21:1
# endif
#ifndef LargefileDefines
# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
+@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
# endif
# if HasGcc2
# ifndef CcCmd
-# define CcCmd gcc
+# define CcCmd @@PKGSRC_CC@@
- # endif
++# endif
+# ifndef CppCmd
+# define CppCmd @@PKGSRC_CPP@@
+# endif
+# ifndef CplusplusCmd
+# define CplusplusCmd @@PKGSRC_CXX@@
-+# endif
+ # endif
# ifndef AsCmd
# define AsCmd CcCmd -c -x assembler
# endif
@@ -58,16 +58,16 @@ $NetBSD: patch-af,v 1.10 2022/12/01 21:1
# endif
# endif
# else
-@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
+@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
# endif
#endif
#ifndef Mapfile_NoExData
-# if defined(SparcArchitecture)
+# if defined(SparcArchitecture) || defined(Sparc64Architecture)
- /* SPARC archictecture requires PLT section in .data be executable, so
+ /* SPARC architecture requires PLT section in .data be executable, so
we can only make .bss, not all of .data no-exec on SPARC */
# define Mapfile_NoExData /**/
-@@ -846,7 +846,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac
+@@ -846,7 +846,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
/* ExtraLoadFlags apply to all binaries - programs & libraries */
# ifndef ExtraLoadFlags
@@ -76,7 +76,7 @@ $NetBSD: patch-af,v 1.10 2022/12/01 21:1
# endif
/* ExtraLoadOptions only apply to programs */
# ifndef ExtraLoadOptions
-@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac
+@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
# endif
#endif
Index: pkgsrc/x11/xorg-cf-files/patches/patch-ag
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.8 pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.9
--- pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.8 Thu Dec 1 21:14:09 2022
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ag Wed Feb 22 07:44:55 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.8 2022/12/01 21:14:09 jperkin Exp $
+$NetBSD: patch-ag,v 1.9 2023/02/22 07:44:55 wiz Exp $
Add __ppc64__ and __arm__
Recognize __sun as well as sun
@@ -6,9 +6,9 @@ Add __ia64__
Also recognize __sparc__ apparently now needed for gcc49 on solaris sparc
to avoid -M /usr/lib/ld/map.noexdata which in does not work on SPARC
---- Imake.cf.orig 2021-08-02 01:00:38
+--- Imake.cf.orig 2023-02-22 02:28:43.000000000 +0000
+++ Imake.cf
-@@ -25,14 +25,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
+@@ -25,14 +25,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# define MacroIncludeFile <darwin.cf>
# define MacroFile darwin.cf
# define DarwinArchitecture
@@ -29,7 +29,7 @@ to avoid -M /usr/lib/ld/map.noexdata whi
# ifdef __x86_64__
# define x86_64DarwinArchitecture
# undef __x86_64__
-@@ -255,6 +260,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
+@@ -259,6 +264,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# define AMD64Architecture
# undef __x86_64__
# endif
@@ -40,7 +40,7 @@ to avoid -M /usr/lib/ld/map.noexdata whi
#endif /* NetBSD */
/* Systems based on kernel of NetBSD */
-@@ -352,7 +361,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
+@@ -356,7 +365,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# endif
#endif /* AMOEBA */
@@ -49,14 +49,14 @@ to avoid -M /usr/lib/ld/map.noexdata whi
# define MacroIncludeFile <sun.cf>
# define MacroFile sun.cf
# ifdef SVR4
-@@ -361,6 +370,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
- # endif
- # ifdef sparc
+@@ -367,6 +376,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# undef sparc
-+# define SparcArchitecture
-+# endif
-+# ifdef __sparc__
-+# undef __sparc__
# define SparcArchitecture
# endif
++# ifdef __sparc__
++# undef __sparc__
++# define SparcArchitecture
++# endif
# ifdef __sparcv9
+ # undef __sparcv9
+ # define Sparc64Architecture
Index: pkgsrc/x11/xorg-cf-files/patches/patch-ai
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ai:1.6 pkgsrc/x11/xorg-cf-files/patches/patch-ai:1.7
--- pkgsrc/x11/xorg-cf-files/patches/patch-ai:1.6 Fri Jan 20 22:46:34 2023
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ai Wed Feb 22 07:44:55 2023
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.6 2023/01/20 22:46:34 mrg Exp $
+$NetBSD: patch-ai,v 1.7 2023/02/22 07:44:55 wiz Exp $
---- Imake.tmpl.orig 2021-08-01 18:00:38.000000000 -0700
-+++ Imake.tmpl 2023-01-18 14:02:36.645134759 -0800
+--- Imake.tmpl.orig 2023-02-22 02:28:43.000000000 +0000
++++ Imake.tmpl
@@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir
#ifndef ManPath
#define ManPath ManDirectoryRoot
@@ -33,15 +33,7 @@ $NetBSD: patch-ai,v 1.6 2023/01/20 22:46
#ifndef AppLoadDefs
#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
#endif
-@@ -1078,21 +1072,21 @@ TCLIBDIR = TclLibDir
- #define ArCmdBase ar
- #endif
- #ifndef ArCmd
--#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion
-+#if HasLargeTmp || SystemV4 || HasGnuAr
- #define ArCmd ArCmdBase cq
- #else
- #define ArCmd ArCmdBase clq
+@@ -1085,14 +1079,14 @@ TCLIBDIR = TclLibDir
#endif
#endif
#ifndef ArAddCmd
Index: pkgsrc/x11/xorg-cf-files/patches/patch-ak
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ak:1.3 pkgsrc/x11/xorg-cf-files/patches/patch-ak:1.4
--- pkgsrc/x11/xorg-cf-files/patches/patch-ak:1.3 Thu Dec 1 21:14:09 2022
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ak Wed Feb 22 07:44:55 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.3 2022/12/01 21:14:09 jperkin Exp $
+$NetBSD: patch-ak,v 1.4 2023/02/22 07:44:55 wiz Exp $
The standard says that failing () doesn't stop the shell, even when -e
is set, so () constructs need || exit $? on the end. (Which needs to be
$$? when it's coming from inside make.)
---- Imake.rules.orig 2021-08-02 01:00:38
+--- Imake.rules.orig 2023-02-22 02:28:43.000000000 +0000
+++ Imake.rules
-@@ -534,9 +534,9 @@ -if [ -f program ]; then RemoveFile(Concat(program,~))
+@@ -534,9 +534,9 @@ clean cleantc:: @@\
set +x; \ @@\
else \ @@\
if [ -h dir ]; then \ @@\
@@ -18,7 +18,7 @@ $$? when it's coming from inside make.)
fi
#endif /* MakeDir */
-@@ -545,9 +545,9 @@ -if [ -f program ]; then RemoveFile(Concat(program,~))
+@@ -545,9 +545,9 @@ clean cleantc:: @@\
:; \ @@\
else \ @@\
if [ -h dir ]; then \ @@\
@@ -57,7 +57,7 @@ $$? when it's coming from inside make.)
#endif /* BuildInterfaces */
/*
-@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(I
+@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,l
* (the limit for using source code control systems on files systems with
* short file names).
*/
@@ -70,8 +70,8 @@ $$? when it's coming from inside make.)
@@\
InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
-#endif /* InstallManPageLong */
-
-
+
/*
* InstallManPageAliases - generate rules to install manual page aliases.
*/
@@ -89,8 +89,8 @@ $$? when it's coming from inside make.)
done; \ @@\
RemoveFile($${TMP}))
-#endif /* InstallManPageAliases */
-
-
+
/*
* InstallGenManPageLong - More general rules for installing manual pages --
* doesn't assume MANSUFFIX.
@@ -100,13 +100,13 @@ $$? when it's coming from inside make.)
#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
BuildInstallHtmlManPage(file,dest,suffix) @@\
@@\
-@@ -1322,13 +1318,11 @@ install.man:: file.$(MANNEWSUFFIX) @@\
+@@ -1322,13 +1318,11 @@ install.man:: file.$(MANNEWSUFFIX) @
MakeDir($(DESTDIR)destdir) @@\
$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
$(DESTDIR)destdir/dest.suffix
-#endif /* InstallGenManPageLong */
-
-
+
/*
* InstallGenManPageAliases - general equivalent of InstallManPageAliases
*/
@@ -132,7 +132,7 @@ $$? when it's coming from inside make.)
#define InstallManPageLong(file,destdir,dest) @@\
BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
@@\
-@@ -1356,9 +1349,8 @@ install.man:: file.$(MANNEWSUFFIX) @@\
+@@ -1356,9 +1349,8 @@ install.man:: file.$(MANNEWSUFFIX) @
$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
$(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)
@@ -143,7 +143,7 @@ $$? when it's coming from inside make.)
#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
BuildInstallHtmlManPage(file,dest,suffix) @@\
@@\
-@@ -1370,9 +1362,8 @@ install.man:: file.$(MANNEWSUFFIX) @@\
+@@ -1370,9 +1362,8 @@ install.man:: file.$(MANNEWSUFFIX) @
$(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
$(DESTDIR)destdir/dest.suffix @@\
-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix
@@ -199,7 +199,7 @@ $$? when it's coming from inside make.)
#endif /* CompressManPages */
-@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,aliases)
+@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,a
/*
* InstallManPage - generate rules to install the indicated manual page.
*/
@@ -231,7 +231,7 @@ $$? when it's coming from inside make.)
done
#else
#define InstallHtmlManPageAliases(file,aliases,suffix) /**/
-@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINF
+@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcn
#ifndef MakeNamedTargetSubdir
#define MakeNamedTargetSubdir(dir,flags,subname)\
(cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\
@@ -240,7 +240,7 @@ $$? when it's coming from inside make.)
#endif
/*
-@@ -1692,7 +1678,7 @@ step:: @@\
+@@ -1692,7 +1678,7 @@ InstallNamedTargetNoClobber(install,srcn
step:: @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
echo " cd" dir; cd dir && \ @@\
@@ -288,7 +288,7 @@ $$? when it's coming from inside make.)
#endif
#endif /* LinkBuildSonameLibrary */
-@@ -2713,9 +2702,9 @@ LibraryTargetName(libname): objlist1 objlist2 objlist3
+@@ -2713,9 +2702,9 @@ AllTarget(LibraryTargetName(libname))
@@\
LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS) @@\
RemoveFile($@) @@\
@@ -322,7 +322,7 @@ $$? when it's coming from inside make.)
done
#endif
-@@ -3384,7 +3374,7 @@ step:: @@\
+@@ -3384,7 +3374,7 @@ clean:: @@\
step:: @@\
DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \ @@\
for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\
@@ -331,7 +331,7 @@ $$? when it's coming from inside make.)
done
#endif /* MakeDirectories */
-@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libname.a) @@\
+@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libna
@$(CP) Concat3(libpath,/lib,libname.a) tmp @@\
@(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \ @@\
$(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \ @@\
Home |
Main Index |
Thread Index |
Old Index