head 1.4; access; symbols pkgsrc-2023Q4:1.4.0.8 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.6 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.4 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.2 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.3.0.2 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.2.0.86 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.84 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.82 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.80 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.78 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.76 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.74 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.72 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.70 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.66 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.46 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.68 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.64 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.62 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.60 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.58 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.56 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.54 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.52 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.50 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.48 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.44 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.42 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.40 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.38 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.36 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.34 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.32 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.30 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.28 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.26 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.24 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.22 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.20 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.18 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.16 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.14 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.12 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.10 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.8 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.6 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.4 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.2 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.1.0.20 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.18 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.16 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.14 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.12 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.10 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.8 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.6 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.4 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.2 pkgsrc-2009Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2023.02.22.07.44.55; author wiz; state Exp; branches; next 1.3; commitid CymYKImPxHrbFueE; 1.3 date 2022.12.01.21.14.09; author jperkin; state Exp; branches; next 1.2; commitid Oplhwtz20PihOT3E; 1.2 date 2012.03.19.12.34.24; author joerg; state Exp; branches; next 1.1; 1.1 date 2009.07.14.06.19.43; author dholland; state Exp; branches; next ; desc @@ 1.4 log @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. @ text @$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 2023-02-22 02:28:43.000000000 +0000 +++ Imake.rules @@@@ -534,9 +534,9 @@@@ clean cleantc:: @@@@\ 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:: @@@@\ :; \ @@@@\ 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 \ @@@@\ RemoveFile($$i); \ @@@@\ $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$$i .; \ @@@@\ - done) + done) || exit $$? #endif /* BuildIncludesTop */ #ifndef BuildIncludes @@@@ -581,7 +581,7 @@@@ includes:: srclist @@@@\ @@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@@@\ RemoveFile($$i); \ @@@@\ $(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@@@\ - done) + 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 * (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) @@ 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) @@ $(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) @@ $(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)); \ @@@@\ done -#endif /* * InstallManPageAliases - install soft links for aliases. */ -#ifndef InstallManPageAliasesBase +#undef InstallManPageAliasesBase #define InstallManPageAliasesBase(file,destdir,aliases) @@@@\ install.man:: @@@@\ @@(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@@@\ for i in aliases; do (set -x; \ @@@@\ $(RM) $(DESTDIR)destdir/$$i.*; \ @@@@\ (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@@@\ - $$i.$${SUFFIX})); \ @@@@\ - done) -#endif + $$i.$${SUFFIX}) || exit $$?) || exit $$?; \ @@@@\ + done) || exit $$? -#ifndef InstallManPageAliases +#undef InstallManPageAliases #define InstallManPageAliases(file,destdir,aliases) @@@@\ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@@@\ @@@@\ InstallManPageAliasesBase(file,destdir,aliases) -#endif /* * 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 /* * 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 */ -#ifndef InstallGenManPage +#undef InstallGenManPage #define InstallGenManPage(file,destdir,suffix) @@@@\ InstallGenManPageLong(file,destdir,file,suffix) -#endif /* InstallGenManPage */ /* @@@@ -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 #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 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); \ @@@@\ + (set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest) || exit $$?; \ @@@@\ done #endif /* InstallMultipleDestFlags */ @@@@ -1876,7 +1862,7 @@@@ install.man:: @@@@\ MakeDir($(DESTDIR)dest) @@@@\ @@MakeFlagsToShellFlags(i,set +e); \ @@@@\ for i in list; do \ @@@@\ - (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $$i.suffix $(DESTDIR)dest/$$i.$(MANSUFFIX)); \ @@@@\ + (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $$i.suffix $(DESTDIR)dest/$$i.$(MANSUFFIX)) || exit $$?; \ @@@@\ done #endif /* InstallMultipleManSuffix */ @@@@ -2601,7 +2587,8 @@@@ clean:: @@@@\ #define LinkBuildLibraryMaybe(lib,doit) MakeDir($(BUILDLIBDIR)) @@@@\ @@if doit; then (set -x; \ @@@@\ RemoveFile($(BUILDLIBDIR)/lib); \ @@@@\ - cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .); fi + cd $(BUILDLIBDIR) && \ @@@@\ + $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .) || exit $$?; fi #endif #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)) @@@@\ 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 @@@@\ @@-(list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@@@\ set -x; cd dir && RemoveFiles($$list)) @@@@\ @@for i in srclist; do \ @@@@\ - (set -x; cd dir && $(LN) ../$$i .); \ @@@@\ + (set -x; cd dir && $(LN) ../$$i .) || exit $$?; \ @@@@\ done @@@@\ @@@@\ 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:: @@@@\ 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 @@$(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:: @@@@\ @ 1.3 log @xorg-cf-files: Support Darwin/aarch64. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.2 2012/03/19 12:34:24 joerg Exp $ d7 1 a7 1 --- Imake.rules.orig 2021-08-02 01:00:38 d9 1 a9 1 @@@@ -534,9 +534,9 @@@@ -if [ -f program ]; then RemoveFile(Concat(program,~)) d21 1 a21 1 @@@@ -545,9 +545,9 @@@@ -if [ -f program ]; then RemoveFile(Concat(program,~)) d60 1 a60 1 @@@@ -1280,20 +1280,18 @@@@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(I d73 1 a74 1 - d92 1 a93 1 - d103 1 a103 1 @@@@ -1322,13 +1318,11 @@@@ install.man:: file.$(MANNEWSUFFIX) @@@@\ d108 1 a109 1 - d135 1 a135 1 @@@@ -1356,9 +1349,8 @@@@ install.man:: file.$(MANNEWSUFFIX) @@@@\ d146 1 a146 1 @@@@ -1370,9 +1362,8 @@@@ install.man:: file.$(MANNEWSUFFIX) @@@@\ d202 1 a202 1 @@@@ -1425,19 +1412,17 @@@@ InstallManPageAliasesBase(file,destdir,aliases) d234 1 a234 1 @@@@ -1681,7 +1667,7 @@@@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINF d243 1 a243 1 @@@@ -1692,7 +1678,7 @@@@ step:: @@@@\ d291 1 a291 1 @@@@ -2713,9 +2702,9 @@@@ LibraryTargetName(libname): objlist1 objlist2 objlist3 d325 1 a325 1 @@@@ -3384,7 +3374,7 @@@@ step:: @@@@\ d334 1 a334 1 @@@@ -3610,7 +3600,7 @@@@ objname.Osuf: Concat3(libpath,/lib,libname.a) @@@@\ @ 1.2 log @Drop imake-check logic from X11 components' builtin.mk. Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge. Always install man pages, not cat pages when using imake. Unify the various imake PLIST variables in preparation for dropping. Adjust xbattbar for the new expectations. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1 2009/07/14 06:19:43 dholland Exp $ d7 1 a7 1 --- Imake.rules.orig 2009-10-16 21:45:42.000000000 +0000 d9 1 a9 1 @@@@ -534,9 +534,9 @@@@ clean cleantc:: @@@@\ d21 1 a21 1 @@@@ -545,9 +545,9 @@@@ clean cleantc:: @@@@\ d60 1 a60 1 @@@@ -1280,20 +1280,18 @@@@ InstallTarget(install.ln,Concat(llib-l,l d73 1 a74 1 d92 1 a93 1 d103 1 a103 1 @@@@ -1322,13 +1318,11 @@@@ install.man:: file.$(MANNEWSUFFIX) @@ d108 1 a109 1 d135 1 a135 1 @@@@ -1356,9 +1349,8 @@@@ install.man:: file.$(MANNEWSUFFIX) @@ d146 1 a146 1 @@@@ -1370,9 +1362,8 @@@@ install.man:: file.$(MANNEWSUFFIX) @@ d202 1 a202 1 @@@@ -1425,19 +1412,17 @@@@ InstallManPageAliasesBase(file,destdir,a d234 1 a234 1 @@@@ -1681,7 +1667,7 @@@@ InstallNamedTargetNoClobber(install,srcn d243 1 a243 1 @@@@ -1692,7 +1678,7 @@@@ InstallNamedTargetNoClobber(install,srcn d291 1 a291 1 @@@@ -2713,9 +2702,9 @@@@ AllTarget(LibraryTargetName(libname)) d325 1 a325 1 @@@@ -3384,7 +3374,7 @@@@ clean:: @@@@\ d334 1 a334 1 @@@@ -3610,7 +3600,7 @@@@ objname.Osuf: Concat3(libpath,/lib,libna @ 1.1 log @Avoid energizer-bunny-makefiles. PKGREVISION++ (to 9) @ text @d1 1 a1 1 $NetBSD$ d7 3 a9 3 --- Imake.rules~ 2005-11-08 01:33:24.000000000 -0500 +++ Imake.rules 2008-08-30 11:57:32.000000000 -0400 @@@@ -534,9 +534,9 @@@@ d21 1 a21 1 @@@@ -545,9 +545,9 @@@@ d33 1 a33 1 @@@@ -571,7 +571,7 @@@@ d42 1 a42 1 @@@@ -581,7 +581,7 @@@@ d51 1 a51 1 @@@@ -604,7 +604,7 @@@@ d60 24 a83 1 @@@@ -1302,7 +1302,7 @@@@ d91 28 a118 2 #endif /* InstallManPageAliases */ @@@@ -1337,7 +1337,7 @@@@ d126 45 a170 2 #endif /* InstallGenManPageAliases */ @@@@ -1397,8 +1397,8 @@@@ d176 1 a178 1 #endif d180 45 a224 2 #ifndef InstallManPageAliases @@@@ -1499,7 +1499,8 @@@@ d234 1 a234 1 @@@@ -1681,7 +1682,7 @@@@ d243 1 a243 1 @@@@ -1692,7 +1693,7 @@@@ d252 1 a252 1 @@@@ -1809,7 +1810,7 @@@@ d261 1 a261 1 @@@@ -1876,7 +1877,7 @@@@ d270 1 a270 1 @@@@ -2601,7 +2602,8 @@@@ d280 1 a280 1 @@@@ -2615,7 +2617,9 @@@@ d291 1 a291 1 @@@@ -2713,9 +2717,9 @@@@ d304 1 a304 1 @@@@ -2952,7 +2956,7 @@@@ d313 1 a313 1 @@@@ -2974,8 +2978,9 @@@@ d325 1 a325 1 @@@@ -3384,7 +3389,7 @@@@ d334 1 a334 1 @@@@ -3610,7 +3615,7 @@@@ @