Update to 1.0.5:

This minor maintenance release adds support for the Aarch64 platform to
the Linux configuration and updates the Solaris configuration to reflect
changes in Solaris 11 & later.

Alan Coopersmith (6):
      On Solaris 11 & later, use /usr/gnu/bin/install for InstallCmd
      Update xorgversion.def from 7.6 to 7.7
      Trim trailing whitespace
      Remove xprint_host.def
      sun.cf: stop linking libraries merged into libc in later Solaris releases
      xorg-cf-files 1.0.5

Riku Voipio (1):
      Add Aarch64 support
This commit is contained in:
wiz 2013-07-23 06:50:39 +00:00
parent 044a82dc5f
commit 1d976f5f9d
4 changed files with 22 additions and 25 deletions

View file

@ -1,8 +1,6 @@
# $NetBSD: Makefile,v 1.24 2013/07/17 06:13:22 dholland Exp $ # $NetBSD: Makefile,v 1.25 2013/07/23 06:50:39 wiz Exp $
#
DISTNAME= xorg-cf-files-1.0.4 DISTNAME= xorg-cf-files-1.0.5
PKGREVISION= 6
CATEGORIES= x11 devel CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/} MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2

View file

@ -1,17 +1,17 @@
$NetBSD: distinfo,v 1.18 2013/07/17 06:13:22 dholland Exp $ $NetBSD: distinfo,v 1.19 2013/07/23 06:50:39 wiz Exp $
SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45 SHA1 (xorg-cf-files-1.0.5.tar.bz2) = ae22eb81d56d018f0b3b149f70965ebfef2385fd
RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d RMD160 (xorg-cf-files-1.0.5.tar.bz2) = c389c5c1642a7a3b3bc9603c2cb0217a028f905e
Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes Size (xorg-cf-files-1.0.5.tar.bz2) = 377835 bytes
SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927 SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
SHA1 (patch-X11.rules) = 13fee315aced521bef608e9341fc72526341bb1f SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3 SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3
SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2 SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
SHA1 (patch-af) = acf4b7deb0643867fd1551e9199fd1e7c06b71bd SHA1 (patch-af) = 17705b0951630d241cbdd6f6329f50d6d345b3fc
SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e
SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449 SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449

View file

@ -1,6 +1,6 @@
$NetBSD: patch-X11.rules,v 1.1 2012/03/19 12:34:23 joerg Exp $ $NetBSD: patch-X11.rules,v 1.2 2013/07/23 06:50:39 wiz Exp $
--- X11.rules.orig 2012-03-06 17:09:41.000000000 +0000 --- X11.rules.orig 2013-07-23 05:23:14.000000000 +0000
+++ X11.rules +++ X11.rules
@@ -37,6 +37,8 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v @@ -37,6 +37,8 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v

View file

@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.4 2012/07/02 15:55:03 jperkin Exp $ $NetBSD: patch-af,v 1.5 2013/07/23 06:50:39 wiz Exp $
Run-time path fix for Solaris for the X client libraries. Without this Run-time path fix for Solaris for the X client libraries. Without this
patch, libraries such as libXext.so will not contain a run-time link path patch, libraries such as libXext.so will not contain a run-time link path
@ -9,30 +9,30 @@ Disable Solaris64bitSubdir, at least until multi-arch is supported.
Use pkgsrc CC, CXX, CFLAGS and INSTALL. Use pkgsrc CC, CXX, CFLAGS and INSTALL.
--- sun.cf.orig Fri Oct 16 21:45:42 2009 --- sun.cf.orig 2013-07-23 05:23:14.000000000 +0000
+++ sun.cf Tue Jun 26 09:27:13 2012 +++ sun.cf
@@ -430,7 +430,7 @@ @@ -432,7 +432,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
# endif # if OSMinorVersion > 10
# endif # define InstallCmd /usr/gnu/bin/install
# if OSMinorVersion > 3 # elif OSMinorVersion > 3
-# define InstallCmd /usr/ucb/install -# define InstallCmd /usr/ucb/install
+# define InstallCmd @@INSTALL@@ +# define InstallCmd @@INSTALL@@
# endif # endif
#ifndef LargefileDefines #ifndef LargefileDefines
# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6) # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
@@ -669,19 +669,19 @@ @@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
# endif # endif
# if HasGcc2 # if HasGcc2
# ifndef CcCmd # ifndef CcCmd
-# define CcCmd gcc -# define CcCmd gcc
+# define CcCmd @@PKGSRC_CC@@ +# define CcCmd @@PKGSRC_CC@@
# endif +# endif
+# ifndef CppCmd +# ifndef CppCmd
+# define CppCmd @@PKGSRC_CPP@@ +# define CppCmd @@PKGSRC_CPP@@
+# endif +# endif
+# ifndef CplusplusCmd +# ifndef CplusplusCmd
+# define CplusplusCmd @@PKGSRC_CXX@@ +# define CplusplusCmd @@PKGSRC_CXX@@
+# endif # endif
# ifndef AsCmd # ifndef AsCmd
# define AsCmd CcCmd -c -x assembler # define AsCmd CcCmd -c -x assembler
# endif # endif
@ -48,7 +48,6 @@ Use pkgsrc CC, CXX, CFLAGS and INSTALL.
# endif # endif
# if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd) # if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd)
# if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture) # if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
@@ -688,10 +688,10 @@
/* This is to work around what appears to be a PIC bug in some gcc/egcs /* This is to work around what appears to be a PIC bug in some gcc/egcs
versions that shows up with the Solaris 7/x86 <ctype.h>. */ versions that shows up with the Solaris 7/x86 <ctype.h>. */
# define SharedLibraryLdCmd $(LD) # define SharedLibraryLdCmd $(LD)
@ -61,7 +60,7 @@ Use pkgsrc CC, CXX, CFLAGS and INSTALL.
# endif # endif
# endif # endif
# else # else
@@ -840,7 +840,7 @@ @@ -853,7 +853,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
# endif # endif
#endif #endif