CVS commit: pkgsrc/x11/xorg-cf-files

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Tue Jan 17 05:29:00 UTC 2023

Modified Files:
        pkgsrc/x11/xorg-cf-files: Makefile distinfo
        pkgsrc/x11/xorg-cf-files/patches: patch-ai

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/xorg-cf-files/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/xorg-cf-files/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xorg-cf-files/patches/patch-ai

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.39 pkgsrc/x11/xorg-cf-files/Makefile:1.40
--- pkgsrc/x11/xorg-cf-files/Makefile:1.39      Wed Nov  9 13:14:31 2022
+++ pkgsrc/x11/xorg-cf-files/Makefile   Tue Jan 17 05:28:59 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2022/11/09 13:14:31 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2023/01/17 05:28:59 mrg Exp $
 
 DISTNAME=              xorg-cf-files-1.0.7
+PKGREVISION=           1
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=          .tar.bz2

Index: pkgsrc/x11/xorg-cf-files/distinfo
diff -u pkgsrc/x11/xorg-cf-files/distinfo:1.34 pkgsrc/x11/xorg-cf-files/distinfo:1.35
--- pkgsrc/x11/xorg-cf-files/distinfo:1.34      Thu Dec  1 21:14:08 2022
+++ pkgsrc/x11/xorg-cf-files/distinfo   Tue Jan 17 05:28:59 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2022/12/01 21:14:08 jperkin Exp $
+$NetBSD: distinfo,v 1.35 2023/01/17 05:28:59 mrg Exp $
 
 BLAKE2s (xorg-cf-files-1.0.7.tar.bz2) = 7c971e7951a9369904f766fb5a9e6c78fd07703131e2a042e858e53480f27fd7
 SHA512 (xorg-cf-files-1.0.7.tar.bz2) = 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
@@ -14,7 +14,7 @@ SHA1 (patch-ae) = d89ea1af22b3d0fab3cc43
 SHA1 (patch-af) = 42c0e0738a5ca20c2f7aa09684630093970c1dee
 SHA1 (patch-ag) = b7c07619141df8d8ae718732343fd185098bdafb
 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
-SHA1 (patch-ai) = fd846dba8f2e90ebf039cba68f35ceb6351c19a6
+SHA1 (patch-ai) = 62867c76ddc14d2e87a04325057a80beb9f116b8
 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
 SHA1 (patch-ak) = ec4e8c30782e3081a84b8c3bd8ab71961a0f13cb
 SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d

Index: pkgsrc/x11/xorg-cf-files/patches/patch-ai
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ai:1.4 pkgsrc/x11/xorg-cf-files/patches/patch-ai:1.5
--- pkgsrc/x11/xorg-cf-files/patches/patch-ai:1.4       Thu Dec  1 21:14:09 2022
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ai   Tue Jan 17 05:28:59 2023
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.4 2022/12/01 21:14:09 jperkin Exp $
+$NetBSD: patch-ai,v 1.5 2023/01/17 05:28:59 mrg Exp $
 
---- Imake.tmpl.orig    2021-08-02 01:00:38
-+++ Imake.tmpl
+--- Imake.tmpl.orig    2021-08-01 18:00:38.000000000 -0700
++++ Imake.tmpl 2023-01-16 21:19:48.832729868 -0800
 @@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir
  #ifndef ManPath
  #define ManPath ManDirectoryRoot
@@ -33,6 +33,15 @@ $NetBSD: patch-ai,v 1.4 2022/12/01 21:14
  #ifndef AppLoadDefs
  #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
  #endif
+@@ -1078,7 +1072,7 @@ TCLIBDIR = TclLibDir
+ #define ArCmdBase ar
+ #endif
+ #ifndef ArCmd
+-#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion
++#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion || defined(NetBSDArchitecture)
+ #define ArCmd ArCmdBase cq
+ #else
+ #define ArCmd ArCmdBase clq
 @@ -1447,9 +1441,9 @@ TCLIBDIR = TclLibDir
  #ifndef DependCmd
  #if UseGccMakeDepend
@@ -93,14 +102,14 @@ $NetBSD: patch-ai,v 1.4 2022/12/01 21:14
  #ifndef ExpandManNames
  #if SystemV
  #define ExpandManNames NO
-@@ -2048,6 +2020,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
-      INSTMANFLAGS = InstManFlags      /* install flags for man pages */
+@@ -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