 @@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.33 2021/10/26 11:34:54 nia Exp $
+$NetBSD: distinfo,v 1.34 2022/12/01 21:14:08 jperkin 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
 SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
 SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
 SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
-SHA1 (patch-aa) = 795f9f2db4627cbb1ff9e54dfd4e5b7d3cc495f0
+SHA1 (patch-aa) = a5edc4de740bc20f173a8deaa0d0a68f06955a08
 SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
-SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
+SHA1 (patch-ad) = fcdddf191f676287b7f42e2b16729ed34afc6786
-SHA1 (patch-ae) = 7f39d7b26f8b85529af0b9550ee213ed08aaddde
+SHA1 (patch-ae) = d89ea1af22b3d0fab3cc431e3353c9efe4a92264
-SHA1 (patch-af) = 27ee42892b9a3f53e43891ca0caec0301c849c85
+SHA1 (patch-af) = 42c0e0738a5ca20c2f7aa09684630093970c1dee
-SHA1 (patch-ag) = d06e660d887fa457d13ac9e9e9469e20995c95c2
+SHA1 (patch-ag) = b7c07619141df8d8ae718732343fd185098bdafb
 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
-SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449
+SHA1 (patch-ai) = fd846dba8f2e90ebf039cba68f35ceb6351c19a6
 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
-SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9
+SHA1 (patch-ak) = ec4e8c30782e3081a84b8c3bd8ab71961a0f13cb
 SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
 SHA1 (patch-sv4Lib.rules) = f7ea2b29a8d3f4e866578fc81d0bbb6a3e598bb3

 @@ -1,51 +1,51 @@
-$NetBSD: patch-aa,v 1.4 2015/12/27 11:31:54 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2022/12/01 21:14:09 jperkin Exp $
---- NetBSD.cf.orig	2009-10-16 21:45:42.000000000 +0000
+--- NetBSD.cf.orig	2021-08-02 01:00:38
 +++ NetBSD.cf
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
        (OSMajorVersion == 2 && OSMinorVersion < 99) || \
        (OSMajorVersion < 2))
 -#  define LibraryMTDefines	-DUSE_NBSD_THREADLIB
 +#  define LibraryMTDefines	@@NETBSD_THREADLIB@@
  # endif
  # define SystemMTDefines	-D_REENTRANT
  # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #define MkdirHierCmd		mkdir -p
  #undef CcCmd
 -#define CcCmd 			gcc
 +#define CcCmd 			@@PKGSRC_CC@@
  #ifndef DefaultCCOptions
  #if defined(UseInstalled)
  #define DefaultCCOptions 	/**/
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #endif
  #endif
 -#define CppCmd			cpp
 +#define CppCmd			@@PKGSRC_CPP@@
  #define StandardCppOptions	-traditional
  #define StandardCppDefines	/**/
  #define PreProcessCmd   	CcCmd -E
-@@ -199,6 +199,8 @@
+@@ -199,6 +199,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #  ifndef DoLoadableServer
  #  define DoLoadableServer	YES
  #  endif
 +#elif defined(ia64Architecture) || defined(AMD64Architecture)
 +#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
  #else
  #  ifndef DoLoadableServer
  #  define DoLoadableServer	NO
-@@ -344,6 +346,10 @@
+@@ -342,6 +344,10 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
   */
  #ifndef HasPerl
  #define HasPerl			NO
  #endif
 +#if defined(AMD64Architecture)
 +# define HasMTRRBuiltin                YES
 +#endif
++
 +#if defined(AMD64Architecture)
 +# define HasMTRRBuiltin                YES
  #endif
  /*
   * NetBSD doesn't have gperf in default system
   * you may override this in host.def if you installed perl from the packages

 @@ -1,31 +1,31 @@
-$NetBSD: patch-ae,v 1.4 2015/07/15 17:21:10 dholland Exp $
+$NetBSD: patch-ae,v 1.5 2022/12/01 21:14:09 jperkin Exp $
---- DragonFly.cf.orig	2010-05-16 12:38:48.000000000 +0200
+--- DragonFly.cf.orig	2021-08-02 01:00:38
-+++ DragonFly.cf	2010-05-16 12:41:18.000000000 +0200
++++ DragonFly.cf
-@@ -96,12 +96,12 @@
+@@ -96,12 +96,12 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #define HasFlex                  YES
  #ifndef CcCmd
 -# define CcCmd                   cc
 +# define CcCmd                   @@PKGSRC_CC@@
  #endif
  #ifndef CplusplusCmd
 -# define CplusplusCmd            c++
 +# define CplusplusCmd            @@PKGSRC_CXX@@
  #endif
 -#define CppCmd                   /usr/bin/cpp
 +#define CppCmd                   @@PKGSRC_CPP@@
  #define PreProcessCmd            CppCmd
  #define StandardCppOptions       -traditional
  #define StandardCppDefines       /**/
-@@ -116,10 +116,6 @@
+@@ -115,10 +115,6 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #   define NoSystemWarn
  # 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

 @@ -1,51 +1,68 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2022/12/01 21:14:09 jperkin Exp $
---- darwin.cf.orig	2005-12-06 11:18:05.000000000 +0100
+Support aarch64.
 +++ darwin.cf	2005-12-06 11:20:10.000000000 +0100
-@@ -97,7 +97,7 @@
+--- darwin.cf.orig	2021-08-02 01:00:38
 +++ darwin.cf
@@ -97,7 +97,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
   * Turn off to build on raw Darwin systems.
   */
  #ifndef DarwinQuartzSupport
 -# define DarwinQuartzSupport    YES
 +# define DarwinQuartzSupport    @@DARWIN_USE_QUARTZ@@
  #endif
  #if DarwinQuartzSupport
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
   * so we use the 3.1-based version in this case.
   */
  #if (GccMajorVersion == 3) && (GccMinorVersion == 3)
 -# define CppCmd                 /usr/bin/cpp3
 +# define CppCmd                 /usr/bin/cpp
  #else
  # define CppCmd                 /usr/bin/cpp
  #endif
-@@ -184,8 +184,8 @@
+@@ -184,8 +184,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #endif
  /* we have a gcc compatible compiler, but its not called gcc */
 -#define CcCmd                   /usr/bin/cc
 -#define CplusplusCmd            /usr/bin/c++
 +#define CcCmd                   @@PKGSRC_CC@@
 +#define CplusplusCmd            @@PKGSRC_CXX@@
  /* default flags to pass to cc */
  #ifndef DefaultCCOptions
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #ifdef PpcDarwinArchitecture
  # define DarwinMachineDefines   -D__powerpc__
  # if HasGcc3
 -#  define OptimizedCDebugFlags  -Os
 +#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
  # else
  #  define OptimizedCDebugFlags  -O2
  # endif
-@@ -223,7 +223,7 @@
+@@ -223,13 +223,22 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #ifdef i386DarwinArchitecture
  # define DarwinMachineDefines   -D__i386__
  # if HasGcc3
 -#  define OptimizedCDebugFlags  -Os
 +#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
  # else
  #  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
  # endif
  # define ByteOrder              X_LITTLE_ENDIAN
  #endif /* i386DarwinArchitecture */
 +#ifdef aarch64DarwinArchitecture
 +# define DarwinMachineDefines   -D__aarch64__
 +# if HasGcc3
 +#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
 +# else
 +#  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
 +# endif
 +# define ByteOrder              X_LITTLE_ENDIAN
 +#endif
  #ifdef x86_64DarwinArchitecture
  # define DarwinMachineDefines   -D__x86_64__

 @@ -1,46 +1,46 @@
-$NetBSD: patch-af,v 1.9 2016/09/20 16:37:24 jperkin Exp $
+$NetBSD: patch-af,v 1.10 2022/12/01 21:14:09 jperkin 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	2015-12-22 01:28:02.000000000 +0000
+--- sun.cf.orig	2021-08-02 01:00:39
 +++ sun.cf
-@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
  #  endif
  # endif
  # if OSMinorVersion > 10
 -#  define InstallCmd	    /usr/gnu/bin/install
 +#  define InstallCmd	    @@INSTALL@@
  # elif OSMinorVersion > 3
 -#  define InstallCmd	    /usr/ucb/install
 +#  define InstallCmd	    @@INSTALL@@
  # endif
  #ifndef LargefileDefines
  # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
  # 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
  #  ifndef OptimizedCDebugFlags
 -#   ifdef i386Architecture
 -#    define OptimizedCDebugFlags DefaultGcc2i386Opt
 -#   elif defined(AMD64Architecture)
 -#    define OptimizedCDebugFlags DefaultGcc2AMD64Opt
 -#   else
 -#    define OptimizedCDebugFlags -O2
 -#   endif
 +#   define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
  #  endif
 @@ -48,40 +48,40 @@ $NetBSD: patch-af,v 1.9 2016/09/20 16:37
 -#   if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
 +#   if OSMajorVersion == 5 && OSMinorVersion > 6 && OSMinorVersion < 8 && defined(i386Architecture)
      /* This is to work around what appears to be a PIC bug in some gcc/egcs
         versions that shows up with the Solaris 7/x86 <ctype.h>. */
  #    define SharedLibraryLdCmd $(LD)
  #    define SharedLibraryLoadFlags -G -z textwarn
  #   else
  #    define SharedLibraryLdCmd $(CC)
 -#    define SharedLibraryLoadFlags -shared -z text
 +#    define SharedLibraryLoadFlags -shared -z text RpathLoadFlags
  #   endif
  #  endif
  # else
-@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
  # endif
  #endif
  #ifndef Mapfile_NoExData
 -# if defined(SparcArchitecture)
 +# if defined(SparcArchitecture) || defined(Sparc64Architecture)
  /* SPARC archictecture 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 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -846,7 +846,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac
  MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
  /* ExtraLoadFlags apply to all binaries - programs & libraries */
  # ifndef ExtraLoadFlags
 -#  define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
 +#  define ExtraLoadFlags RpathLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
  # endif
  /* ExtraLoadOptions only apply to programs */
  # ifndef ExtraLoadOptions
-@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
+@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac
  # endif
  #endif
 -#ifdef Solaris64bitSubdir
 +#ifdef NotYetSolaris64bitSubdir
  # define LibDirName Concat3(lib,/,Solaris64bitSubdir)
  #endif

 @@ -1,53 +1,62 @@
-$NetBSD: patch-ag,v 1.7 2017/01/06 21:12:39 tez Exp $
+$NetBSD: patch-ag,v 1.8 2022/12/01 21:14:09 jperkin Exp $
 Add __ppc64__ and __arm__
 Recognize __sun as well as sun
 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	2015-12-22 01:28:02.000000000 +0000
+--- Imake.cf.orig	2021-08-02 01:00:38
 +++ Imake.cf
-@@ -25,9 +25,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+@@ -25,14 +25,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
  # define MacroIncludeFile <darwin.cf>
  # define MacroFile darwin.cf
  # define DarwinArchitecture
 -# ifdef __ppc__
 +# if defined __ppc__ || defined __ppc64__
  #  define PpcDarwinArchitecture
  #  undef __ppc__
 +#  undef __ppc64__
  # endif
  # ifdef __i386__
  #  define i386DarwinArchitecture
-@@ -255,6 +256,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+ #  undef __i386__
  # endif
 +# ifdef __aarch64__
 +#  define aarch64DarwinArchitecture
 +#  undef __aarch64__
 +# endif
  # 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
  #  define AMD64Architecture
  #  undef __x86_64__
  # endif
 +# ifdef __ia64__
 +#  define ia64Architecture
 +#  undef __ia64__
 +# endif
  #endif /* NetBSD */
  /* Systems based on kernel of NetBSD */
-@@ -352,7 +357,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+@@ -352,7 +361,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
  # endif
  #endif /* AMOEBA */
 -#ifdef sun
 +#if defined(sun) || defined(__sun)
  # define MacroIncludeFile <sun.cf>
  # define MacroFile sun.cf
  # ifdef SVR4
-@@ -363,6 +368,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+@@ -361,6 +370,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
  #  undef sparc
  #  define SparcArchitecture
  # endif
-+# ifdef __sparc__
+ # ifdef sparc
-+#  undef __sparc__
+ #  undef sparc
 +#  define SparcArchitecture
 +# endif
 +# ifdef __sparc__
 +#  undef __sparc__
  #  define SparcArchitecture
  # endif
  # ifdef __sparcv9
  #  undef __sparcv9
  #  define Sparc64Architecture

 @@ -1,16 +1,16 @@
-$NetBSD: patch-ai,v 1.3 2012/04/12 14:01:17 hans Exp $
+$NetBSD: patch-ai,v 1.4 2022/12/01 21:14:09 jperkin Exp $
---- Imake.tmpl.orig	2009-10-16 21:45:42.000000000 +0000
+--- Imake.tmpl.orig	2021-08-02 01:00:38
 +++ Imake.tmpl
 @@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir
  #ifndef ManPath
  #define ManPath ManDirectoryRoot
  #endif
 -#ifndef ManSourcePath
 +#undef ManSourcePath
  #define ManSourcePath $(MANPATH)/man
 -#endif
 -#ifndef ManDir
 +#undef ManDir
  #define ManDir $(MANSOURCEPATH)$(MANSUFFIX)
 -#endif
 @@ -83,24 +83,24 @@ $NetBSD: patch-ai,v 1.3 2012/04/12 14:01
 -#endif
 -#endif
 -#ifndef AdminManSuffix
 -#if SystemV || SystemV4
 -#define AdminManSuffix	1m		/* use just one tab or cpp will die */
 -#else
 +#undef AdminManSuffix
  #define AdminManSuffix	8		/* use just one tab or cpp will die */
 -#endif
 -#endif
  #ifndef ExpandManNames
  #if SystemV
  #define ExpandManNames NO
-@@ -2049,6 +2021,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
+@@ -2048,6 +2020,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
       INSTMANFLAGS = InstManFlags	/* install flags for man pages */
       INSTDATFLAGS = InstDatFlags	/* install flags for data files */
      INSTKMEMFLAGS = InstKmemFlags	/* install flags for /dev/kmem progs */
++
 +#ifdef RealProjectRoot
 +REALPROJECTROOT = RealProjectRoot
 +#endif
  #ifdef ProjectRoot
        PROJECTROOT = ProjectRoot
  #endif

 @@ -1,34 +1,34 @@
-$NetBSD: patch-ak,v 1.2 2012/03/19 12:34:24 joerg Exp $
+$NetBSD: patch-ak,v 1.3 2022/12/01 21:14:09 jperkin 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	2009-10-16 21:45:42.000000000 +0000
+--- Imake.rules.orig	2021-08-02 01:00:38
 +++ Imake.rules
-@@ -534,9 +534,9 @@ clean cleantc::								@@\
+@@ -534,9 +534,9 @@ -if [ -f program ]; then RemoveFile(Concat(program,~))
  		set +x; \						@@\
  	else \								@@\
  		if [ -h dir ]; then \					@@\
 -			(set -x; rm -f dir); \				@@\
 +			(set -x; rm -f dir) || exit $$?; \		@@\
  		fi; \							@@\
 -		(set -x; $(MKDIRHIER) dir); \				@@\
 +		(set -x; $(MKDIRHIER) dir) || exit $$?; \		@@\
  	fi
  #endif /* MakeDir */
-@@ -545,9 +545,9 @@ clean cleantc::								@@\
+@@ -545,9 +545,9 @@ -if [ -f program ]; then RemoveFile(Concat(program,~))
  		:; \							@@\
  	else \								@@\
  		if [ -h dir ]; then \					@@\
 -			(set -x; rm -f dir); \				@@\
 +			(set -x; rm -f dir) || exit $$?; \		@@\
  		fi; \							@@\
 -		(set -x; $(MKDIRHIER) dir); \				@@\
 +		(set -x; $(MKDIRHIER) dir) || exit $$?; \		@@\
  	fi
  #endif /* MakeDirInline */
 @@ -571,7 +571,7 @@ includes:: srclist							@@\
  	@(set -x; cd $(BUILDINCDIR) && for i in srclist; do \		@@\
 @@ -47,113 +47,113 @@ $$? when it's coming from inside make.)
 +	done) || exit $$?
  #endif /* BuildIncludes */
  /*
 @@ -604,7 +604,7 @@ interfaces::								@@\
  	@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \	@@\
  		RemoveFile($$i); \					@@\
  		$(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \	@@\
 -	done)
 +	done) || exit $$?
  #endif /* BuildInterfaces */
  /*
-@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,l
+@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(I
   * (the limit for using source code control systems on files systems with
   * short file names).
   */
 -#ifndef InstallManPageLong
 +#undef InstallManPageLong
  #define	InstallManPageLong(file,destdir,dest)				@@\
  BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
  									@@\
  CppManTarget(file,$(EXTRAMANDEFS))					@@\
  									@@\
  InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
 -#endif /* InstallManPageLong */
+-
  /*
   * InstallManPageAliases - generate rules to install manual page aliases.
   */
 -#ifndef InstallManPageAliases
 +#undef InstallManPageAliases
  #define	InstallManPageAliases(file,destdir,aliases)			@@\
  InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
  									@@\
 @@ -1302,17 +1300,15 @@ install.man::								@@\
  	RemoveFile($${TMP}); \						@@\
  	echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \	@@\
  	for i in aliases; do (set -x; \					@@\
 -	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\
 +	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)) || exit $$?; \ @@\
  	done; \								@@\
  	RemoveFile($${TMP}))
 -#endif /* InstallManPageAliases */
+-
  /*
   * InstallGenManPageLong - More general rules for installing manual pages --
   * doesn't assume MANSUFFIX.
   */
 -#ifndef InstallGenManPageLong
 +#undef InstallGenManPageLong
  #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
   */
 -#ifndef InstallGenManPageAliases
 +#undef InstallGenManPageAliases
  #define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
  InstallHtmlManPageAliases(file,aliases,suffix)				@@\
  									@@\
 @@ -1337,14 +1331,13 @@ install.man::								@@\
  	RemoveFile($${TMP}); \						@@\
  	echo .so `basename destdir`/file.suffix > $${TMP}; \		@@\
  	for i in aliases; do (set -x; \					@@\
 -	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\
 +	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix) || exit $$?; \ @@\
  	done; \								@@\
  	RemoveFile($${TMP}))
 -#endif /* InstallGenManPageAliases */
  #else /* CompressManPages */
 -#ifndef InstallManPageLong
 +#undef InstallManPageLong
  #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)
 -#endif
 -#ifndef InstallGenManPageLong
 +#undef InstallGenManPageLong
  #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
 -#endif
 -#ifndef InstallMultipleMan
 +#undef InstallMultipleMan
  #define InstallMultipleMan(list,dest)					@@\
  install.man:: list							@@\
  	MakeDir($(DESTDIR)dest)						@@\
 @@ -1385,39 +1376,35 @@ install.man:: list							@@\
  		  $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \		@@\
  		$(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\
 @@ -189,27 +189,27 @@ $$? when it's coming from inside make.)
  /*
   * InstallGenManPageAliases - install soft links for aliases.
   */
 -#ifndef InstallGenManPageAliases
 +#undef InstallGenManPageAliases
  #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
  InstallHtmlManPageAliases(file,aliases,suffix)				@@\
  									@@\
  InstallManPageAliasesBase(file,destdir,aliases)
 -#endif
  #endif /* CompressManPages */
-@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,a
+@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,aliases)
  /*
   * InstallManPage - generate rules to install the indicated manual page.
   */
 -#ifndef InstallManPage
 +#undef InstallManPage
  #define	InstallManPage(file,destdir)					@@\
  InstallManPageLong(file,destdir,file)
 -#endif /* InstallManPage */
  /*
   * InstallGenManPage - general equivalent of InstallManPage
   */
 @@ -221,36 +221,36 @@ $$? when it's coming from inside make.)
  /*
 @@ -1499,7 +1484,8 @@ install.man:: file.suffix.html						@@\
  	for i in aliases; do (set -x; \					@@\
  	  RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \		@@\
  	  (cd $(DESTDIR)$(DOCHTMLDIR); \				@@\
 -	    $(LN) file.$$SUF.html $$i.$$SUF.html)); \			@@\
 +	    $(LN) file.$$SUF.html $$i.$$SUF.html) || exit $$? \		@@\
 +	) || exit $$?; \						@@\
  	done
  #else
  #define InstallHtmlManPageAliases(file,aliases,suffix) /**/
-@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcn
+@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINF
  #ifndef MakeNamedTargetSubdir
  #define MakeNamedTargetSubdir(dir,flags,subname)\
  		(cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \	@@\
 -			flags subname)
 +			flags subname) || exit $$?
  #endif
  /*
-@@ -1692,7 +1678,7 @@ InstallNamedTargetNoClobber(install,srcn
+@@ -1692,7 +1678,7 @@ step::									@@\
  step::									@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	echo "	cd" dir; cd dir && \					@@\
 -	for i in list; do (set -x; $(LN) -f sub/$$i .); done
 +	for i in list; do (set -x; $(LN) -f sub/$$i .) || exit $$?; done
  #endif
 @@ -1809,7 +1795,7 @@ step:: list								@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	for i in list; do \						@@\
 -		(set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest); \	@@\
 @@ -278,27 +278,27 @@ $$? when it's coming from inside make.)
  #endif /* LinkBuildLibraryMaybe */
 @@ -2615,7 +2602,9 @@ clean::									@@\
  #else
  #define LinkBuildSonameLibrary(lib) MakeDirInline($(BUILDLIBDIR));\	@@\
  	(set -x; RemoveFile($(BUILDLIBDIR)/lib);\			@@\
 -	(cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .))
 +	  (cd $(BUILDLIBDIR) && \					@@\
 +	    $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .) || exit $$? \	@@\
 +	) || exit $$?
  #endif
  #endif /* LinkBuildSonameLibrary */
-@@ -2713,9 +2702,9 @@ AllTarget(LibraryTargetName(libname))
+@@ -2713,9 +2702,9 @@ LibraryTargetName(libname): objlist1 objlist2 objlist3
  									@@\
  LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS)	@@\
  	RemoveFile($@)							@@\
 -	(cd down && MakeLibrary(up/$@,objlist1))			@@\
 -	(cd down && MakeLibrary(up/$@,objlist2))			@@\
 -	(cd down && MakeLibrary(up/$@,objlist3))			@@\
 +	(cd down && MakeLibrary(up/$@,objlist1)) || exit $$?		@@\
 +	(cd down && MakeLibrary(up/$@,objlist2)) || exit $$?		@@\
 +	(cd down && MakeLibrary(up/$@,objlist3)) || exit $$?		@@\
  	RanLibrary($@)							@@\
  	_LinkBuildLibrary($@)
  #endif /* UnsharedLibraryTarget3 */
 @@ -2952,7 +2941,7 @@ step::  dir srclist							@@\
 @@ -312,31 +312,31 @@ $$? when it's coming from inside make.)
  dir::									@@\
 @@ -2974,8 +2963,9 @@ name::									@@\
  	@MakeFlagsToShellFlags(ik,set +e); \				@@\
  	for i in dirs ;\						@@\
  	do \								@@\
 -		echo verb "in $(CURRENT_DIR)/$$i..."; \			@@\
 -		(cd $$i && LANG=lang $(MAKE) $(MFLAGS) flags subname);\ @@\
 +	    echo verb "in $(CURRENT_DIR)/$$i..."; \			@@\
 +	    (cd $$i && \						@@\
 +	       LANG=lang $(MAKE) $(MFLAGS) flags subname) || exit $$?; \ @@\
  	done
  #endif
-@@ -3384,7 +3374,7 @@ clean::									@@\
+@@ -3384,7 +3374,7 @@ step::									@@\
  step::									@@\
  	DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \		@@\
  	for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \		@@\
 -		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \ @@\
 +		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i) || exit $$?; fi; \ @@\
  	done
  #endif /* MakeDirectories */
-@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libna
+@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libname.a)				@@\
  	@$(CP) Concat3(libpath,/lib,libname.a) tmp			@@\
  	@(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \		@@\
  	  $(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \			@@\
 -	  RemoveFiles(*.Osuf))						@@\
 +	  RemoveFiles(*.Osuf)) || exit $$?				@@\
  	@$(RM) -r tmp							@@\
  									@@\
  clean::									@@\