head 1.7; access; symbols pkgsrc-2023Q4:1.7.0.8 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.6 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.4 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.2 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.4.0.2 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.3.0.84 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.82 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.80 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.78 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.76 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.74 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.72 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.70 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.68 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.64 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.44 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.66 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.62 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.60 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.58 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.56 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.54 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.52 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.50 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.48 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.46 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.42 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.40 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.38 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.36 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.34 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.32 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.30 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.28 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.26 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.24 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.22 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.20 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.18 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.16 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.14 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.12 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.10 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.8 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.4 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.2 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.2.0.2 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.1.1.1.0.46 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.44 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.42 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.40 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.38 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-2010Q3:1.1.1.1.0.36 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.34 pkgsrc-2010Q2-base:1.1.1.1 pkgsrc-2010Q1:1.1.1.1.0.32 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.30 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-2009Q3:1.1.1.1.0.28 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-2009Q2:1.1.1.1.0.26 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-2009Q1:1.1.1.1.0.24 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.22 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.20 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.18 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.16 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.14 pkgsrc-2008Q1:1.1.1.1.0.12 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.10 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.8 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.6 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.4 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.2 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2023.02.22.07.44.55; author wiz; state Exp; branches; next 1.6; commitid CymYKImPxHrbFueE; 1.6 date 2023.01.20.22.46.34; author mrg; state Exp; branches; next 1.5; commitid JGoEub6rm9ajIkaE; 1.5 date 2023.01.17.05.28.59; author mrg; state Exp; branches; next 1.4; commitid H2ghK0sIH2Md4R9E; 1.4 date 2022.12.01.21.14.09; author jperkin; state Exp; branches; next 1.3; commitid Oplhwtz20PihOT3E; 1.3 date 2012.04.12.14.01.17; author hans; state Exp; branches; next 1.2; 1.2 date 2012.03.19.12.34.24; author joerg; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2006.12.19.22.54.51; author joerg; state Exp; branches 1.1.1.1; next ; 1.2.2.1 date 2012.05.09.06.23.14; author tron; state Exp; branches; next ; 1.1.1.1 date 2006.12.19.22.54.51; author joerg; state Exp; branches; next ; desc @@ 1.7 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-ai,v 1.6 2023/01/20 22:46:34 mrg Exp $ --- Imake.tmpl.orig 2023-02-22 02:28:43.000000000 +0000 +++ 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 -#ifndef LibmanDir +#undef LibmanDir #define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX) -#endif -#ifndef FileManDir +#undef FileManDir #define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX) -#endif -#ifndef MiscManDir +#undef MiscManDir #define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX) -#endif -#ifndef DriverManDir +#undef DriverManDir #define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX) -#endif #ifndef AppLoadDefs #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) #endif @@@@ -1085,14 +1079,14 @@@@ TCLIBDIR = TclLibDir #endif #endif #ifndef ArAddCmd -#if HasLargeTmp || SystemV4 +#if HasLargeTmp || SystemV4 || HasGnuAr #define ArAddCmd ArCmdBase ru #else #define ArAddCmd ArCmdBase rul #endif #endif #ifndef ArExtCmd -#if HasLargeTmp || SystemV4 +#if HasLargeTmp || SystemV4 || HasGnuAr #define ArExtCmd ArCmdBase x #else #define ArExtCmd ArCmdBase xl @@@@ -1447,9 +1441,9 @@@@ TCLIBDIR = TclLibDir #ifndef DependCmd #if UseGccMakeDepend #ifdef UseInstalled /* assume BINDIR in path */ -#define DependCmd gccmakedep +#define DependCmd ccmakedep #else -#define DependCmd $(DEPENDSRC)/gccmakedep +#define DependCmd $(DEPENDSRC)/ccmakedep #endif #elif UseCCMakeDepend #ifdef UseInstalled /* assume BINDIR in path */ @@@@ -1609,40 +1603,18 @@@@ TCLIBDIR = TclLibDir #ifndef SHsuf #define SHsuf sh #endif -#ifndef ManSuffix -#define ManSuffix n /* use just one tab or cpp will die */ -#endif -#ifndef LibManSuffix +#undef ManSuffix +#define ManSuffix 1 /* use just one tab or cpp will die */ +#undef LibManSuffix #define LibManSuffix 3 /* use just one tab or cpp will die */ -#endif -#ifndef FileManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) -#define FileManSuffix 4 /* use just one tab or cpp will die */ -#else +#undef FileManSuffix #define FileManSuffix 5 /* use just one tab or cpp will die */ -#endif -#endif -#ifndef MiscManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) -#define MiscManSuffix 5 /* use just one tab or cpp will die */ -#else +#undef MiscManSuffix #define MiscManSuffix 7 /* use just one tab or cpp will die */ -#endif -#endif -#ifndef DriverManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) -#define DriverManSuffix 7 /* use just one tab or cpp will die */ -#else +#undef DriverManSuffix #define DriverManSuffix 4 /* use just one tab or cpp will die */ -#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 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.6 log @pull over / convert to upstream fixes for newer binutils https://gitlab.freedesktop.org/xorg/util/cf/-/commit/90b66dc73deb9ef303690370395cf831425547c7 also apply to a couple of other ArCmd uses. thanks tnn@@ for pointing me to the above change. bump pkg revision. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.5 2023/01/17 05:28:59 mrg Exp $ d3 2 a4 2 --- Imake.tmpl.orig 2021-08-01 18:00:38.000000000 -0700 +++ Imake.tmpl 2023-01-18 14:02:36.645134759 -0800 d36 1 a36 9 @@@@ -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 @ 1.5 log @avoid using ar's 'l' flag on any netbsd. it's not useful and it has been ignored for at least the last 20 years if not for all netbsd, and it causes newer binutils to be grumpy. fixes several packages that use 'AR' from imake. bump pkg revision. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.4 2022/12/01 21:14:09 jperkin Exp $ d4 1 a4 1 +++ Imake.tmpl 2023-01-16 21:19:48.832729868 -0800 d36 1 a36 1 @@@@ -1078,7 +1072,7 @@@@ TCLIBDIR = TclLibDir d41 1 a41 1 +#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion || defined(NetBSDArchitecture) d45 16 @ 1.4 log @xorg-cf-files: Support Darwin/aarch64. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.3 2012/04/12 14:01:17 hans Exp $ d3 2 a4 2 --- Imake.tmpl.orig 2021-08-02 01:00:38 +++ Imake.tmpl d36 9 d105 1 a105 2 @@@@ -2048,6 +2020,10 @@@@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags INSTMANFLAGS = InstManFlags /* install flags for man pages */ d108 1 a108 1 + d112 1 a112 1 d115 1 @ 1.3 log @Override man directories and suffixes to be the same on all platforms. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.2 2012/03/19 12:34:24 joerg Exp $ d3 1 a3 1 --- Imake.tmpl.orig 2009-10-16 21:45:42.000000000 +0000 d96 2 a97 1 @@@@ -2049,6 +2021,10 @@@@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags d100 1 a100 1 d104 1 a104 1 + a106 1 #endif @ 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$ d5 1 a5 1 @@@@ -898,9 +898,8 @@@@ TCLIBDIR = TclLibDir d13 2 a14 1 #ifndef ManDir d16 19 d36 1 a36 1 @@@@ -1447,9 +1446,9 @@@@ TCLIBDIR = TclLibDir d48 2 a49 1 @@@@ -1610,39 +1609,23 @@@@ TCLIBDIR = TclLibDir d52 1 a52 1 #ifndef ManSuffix d54 3 d58 1 a58 2 #endif #ifndef LibManSuffix d60 2 a61 2 #endif #ifndef FileManSuffix d65 1 a66 1 #endif d68 2 a69 1 #ifndef MiscManSuffix d73 1 a74 1 #endif d76 2 a77 1 #ifndef DriverManSuffix d81 1 a82 1 #endif d84 2 a85 1 #ifndef AdminManSuffix d89 1 d91 1 a91 1 #endif d96 1 a96 1 @@@@ -2049,6 +2032,10 @@@@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags @ 1.2.2.1 log @Pullup ticket #3776 - requested by sbd x11/xorg-cf-files: portability fix Revisions pulled up: - x11/xorg-cf-files/Makefile 1.20 - x11/xorg-cf-files/distinfo 1.14 - x11/xorg-cf-files/patches/patch-ai 1.3 --- Module Name: pkgsrc Committed By: hans Date: Thu Apr 12 14:01:17 UTC 2012 Modified Files: pkgsrc/x11/xorg-cf-files: distinfo pkgsrc/x11/xorg-cf-files/patches: patch-ai Log Message: Override man directories and suffixes to be the same on all platforms. --- Module Name: pkgsrc Committed By: sbd Date: Mon Apr 30 07:26:08 UTC 2012 Modified Files: pkgsrc/x11/xorg-cf-files: Makefile Log Message: The changes to patch-ai in rev1.3 need the PKGREVISION to be bumped. @ text @d5 1 a5 1 @@@@ -898,24 +898,18 @@@@ TCLIBDIR = TclLibDir d13 1 a13 2 -#ifndef ManDir +#undef ManDir a14 19 -#endif -#ifndef LibmanDir +#undef LibmanDir #define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX) -#endif -#ifndef FileManDir +#undef FileManDir #define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX) -#endif -#ifndef MiscManDir +#undef MiscManDir #define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX) -#endif -#ifndef DriverManDir +#undef DriverManDir #define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX) -#endif #ifndef AppLoadDefs #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) d16 1 a16 1 @@@@ -1447,9 +1441,9 @@@@ TCLIBDIR = TclLibDir d28 1 a28 2 @@@@ -1609,40 +1603,18 @@@@ TCLIBDIR = TclLibDir #ifndef SHsuf d31 1 a31 1 -#ifndef ManSuffix a32 3 -#endif -#ifndef LibManSuffix +#undef ManSuffix d34 2 a35 1 +#undef LibManSuffix d37 2 a38 2 -#endif -#ifndef FileManSuffix a41 1 +#undef FileManSuffix d43 1 d45 1 a45 2 -#endif -#ifndef MiscManSuffix a48 1 +#undef MiscManSuffix d50 1 d52 1 a52 2 -#endif -#ifndef DriverManSuffix a55 1 +#undef DriverManSuffix d57 1 d59 1 a59 2 -#endif -#ifndef AdminManSuffix a62 1 +#undef AdminManSuffix d64 1 a64 1 -#endif d69 1 a69 1 @@@@ -2049,6 +2021,10 @@@@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- Imake.tmpl.orig 2006-12-18 01:09:37.000000000 +0100 d5 12 a16 1 @@@@ -1447,9 +1447,9 @@@@ TCLIBDIR = TclLibDir d28 52 @ 1.1.1.1 log @Import xorg-cf-files-1.0.2 with the local changes from xorg-imake. This are the default rules used by imake. Platforms other than DragonFly, FreeBSD, Linux and NetBSD will most likely want some work here. OK for import during freeze: agc@@ and wiz@@ @ text @@