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

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Sep 20 16:37:24 UTC 2016

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

Log Message:
Handle Solaris 11/sparc correctly.  Fixes PR#51475 from Joern Clausen.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/xorg-cf-files/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xorg-cf-files/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xorg-cf-files/patches/patch-af

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.30 pkgsrc/x11/xorg-cf-files/Makefile:1.31
--- pkgsrc/x11/xorg-cf-files/Makefile:1.30      Sun Dec 27 11:31:53 2015
+++ pkgsrc/x11/xorg-cf-files/Makefile   Tue Sep 20 16:37:24 2016
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2015/12/27 11:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2016/09/20 16:37:24 jperkin Exp $
 
 DISTNAME=              xorg-cf-files-1.0.6
+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.26 pkgsrc/x11/xorg-cf-files/distinfo:1.27
--- pkgsrc/x11/xorg-cf-files/distinfo:1.26      Sun Dec 27 11:31:53 2015
+++ pkgsrc/x11/xorg-cf-files/distinfo   Tue Sep 20 16:37:24 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2015/12/27 11:31:53 wiz Exp $
+$NetBSD: distinfo,v 1.27 2016/09/20 16:37:24 jperkin Exp $
 
 SHA1 (xorg-cf-files-1.0.6.tar.bz2) = 9b6ed71c74a83181a47eb180787e9ab9a5efdfa2
 RMD160 (xorg-cf-files-1.0.6.tar.bz2) = 544d19c017066cbab2c7108ecf702c4866144755
@@ -12,7 +12,7 @@ SHA1 (patch-ab) = f8f816409eb233ae4d8430
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
 SHA1 (patch-ae) = 7f39d7b26f8b85529af0b9550ee213ed08aaddde
-SHA1 (patch-af) = c000ab24fafd1f6e154df6b317291f89f952c479
+SHA1 (patch-af) = 27ee42892b9a3f53e43891ca0caec0301c849c85
 SHA1 (patch-ag) = 72fcd4463207491c23e599f621c86560a2934bea
 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
 SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449

Index: pkgsrc/x11/xorg-cf-files/patches/patch-af
diff -u pkgsrc/x11/xorg-cf-files/patches/patch-af:1.8 pkgsrc/x11/xorg-cf-files/patches/patch-af:1.9
--- pkgsrc/x11/xorg-cf-files/patches/patch-af:1.8       Mon Jul 28 14:38:17 2014
+++ pkgsrc/x11/xorg-cf-files/patches/patch-af   Tue Sep 20 16:37:24 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.8 2014/07/28 14:38:17 jperkin Exp $
+$NetBSD: patch-af,v 1.9 2016/09/20 16:37:24 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        2013-07-23 05:23:14.000000000 +0000
+--- sun.cf.orig        2015-12-22 01:28:02.000000000 +0000
 +++ sun.cf
 @@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
  #  endif
@@ -58,7 +58,16 @@ $NetBSD: patch-af,v 1.8 2014/07/28 14:38
  #   endif
  #  endif
  # else
-@@ -836,7 +836,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+ # 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
  MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
  /* ExtraLoadFlags apply to all binaries - programs & libraries */
  # ifndef ExtraLoadFlags
@@ -67,7 +76,7 @@ $NetBSD: patch-af,v 1.8 2014/07/28 14:38
  # endif
  /* ExtraLoadOptions only apply to programs */
  # ifndef ExtraLoadOptions
-@@ -853,7 +853,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
+@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
  # endif
  #endif