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

["Tim Zingelman" <tez%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tez
Date:           Fri Jan  6 21:12:39 UTC 2017

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

Log Message:
Adjust Imake.cf to recognize __sparc__ in addition to sparc.
Apparently now needed for gcc49 on solaris sparc to avoid
'-M /usr/lib/ld/map.noexdata' which in does not work on SPARC
ok'd by joerg


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/xorg-cf-files/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xorg-cf-files/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xorg-cf-files/patches/patch-ag

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.32 pkgsrc/x11/xorg-cf-files/Makefile:1.33
--- pkgsrc/x11/xorg-cf-files/Makefile:1.32      Thu Dec 15 20:13:56 2016
+++ pkgsrc/x11/xorg-cf-files/Makefile   Fri Jan  6 21:12:39 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2016/12/15 20:13:56 maya Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/06 21:12:39 tez Exp $
 
 DISTNAME=              xorg-cf-files-1.0.6
-PKGREVISION=           2
+PKGREVISION=           3
 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.28 pkgsrc/x11/xorg-cf-files/distinfo:1.29
--- pkgsrc/x11/xorg-cf-files/distinfo:1.28      Thu Dec 15 20:13:56 2016
+++ pkgsrc/x11/xorg-cf-files/distinfo   Fri Jan  6 21:12:39 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2016/12/15 20:13:56 maya Exp $
+$NetBSD: distinfo,v 1.29 2017/01/06 21:12:39 tez Exp $
 
 SHA1 (xorg-cf-files-1.0.6.tar.bz2) = 9b6ed71c74a83181a47eb180787e9ab9a5efdfa2
 RMD160 (xorg-cf-files-1.0.6.tar.bz2) = 544d19c017066cbab2c7108ecf702c4866144755
@@ -13,7 +13,7 @@ SHA1 (patch-ac) = 1f977650d9e903a4ea72af
 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
 SHA1 (patch-ae) = 7f39d7b26f8b85529af0b9550ee213ed08aaddde
 SHA1 (patch-af) = 27ee42892b9a3f53e43891ca0caec0301c849c85
-SHA1 (patch-ag) = 4cd1c7c8c6392688b9c5fca5bdd365835ae9d563
+SHA1 (patch-ag) = d06e660d887fa457d13ac9e9e9469e20995c95c2
 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
 SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449
 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501

Index: pkgsrc/x11/xorg-cf-files/patches/patch-ag
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.6 pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.7
--- pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.6       Thu Dec 15 20:13:56 2016
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ag   Fri Jan  6 21:12:39 2017
@@ -1,12 +1,14 @@
-$NetBSD: patch-ag,v 1.6 2016/12/15 20:13:56 maya Exp $
+$NetBSD: patch-ag,v 1.7 2017/01/06 21:12:39 tez 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
-@@ -25,9 +25,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
+@@ -25,9 +25,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
  # define MacroIncludeFile <darwin.cf>
  # define MacroFile darwin.cf
  # define DarwinArchitecture
@@ -18,7 +20,7 @@ Add __ia64__
  # endif
  # ifdef __i386__
  #  define i386DarwinArchitecture
-@@ -255,6 +256,10 @@
+@@ -255,6 +256,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
  #  define AMD64Architecture
  #  undef __x86_64__
  # endif
@@ -29,7 +31,7 @@ Add __ia64__
  #endif /* NetBSD */
  
  /* Systems based on kernel of NetBSD */
-@@ -352,7 +357,7 @@
+@@ -352,7 +357,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
  # endif
  #endif /* AMOEBA */
  
@@ -38,3 +40,14 @@ Add __ia64__
  # define MacroIncludeFile <sun.cf>
  # define MacroFile sun.cf
  # ifdef SVR4
+@@ -363,6 +368,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+ #  undef sparc
+ #  define SparcArchitecture
+ # endif
++# ifdef __sparc__
++#  undef __sparc__
++#  define SparcArchitecture
++# endif
+ # ifdef __sparcv9
+ #  undef __sparcv9
+ #  define Sparc64Architecture