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

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Dec 15 20:13:56 UTC 2016

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

Log Message:
xorg-cf-files: recognise netbsd/ia64.
Bump PKGREVISION.

from scole in PR pkg/51722
ok joerg


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/xorg-cf-files/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/xorg-cf-files/distinfo
cvs rdiff -u -r1.5 -r1.6 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.31 pkgsrc/x11/xorg-cf-files/Makefile:1.32
--- pkgsrc/x11/xorg-cf-files/Makefile:1.31      Tue Sep 20 16:37:24 2016
+++ pkgsrc/x11/xorg-cf-files/Makefile   Thu Dec 15 20:13:56 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2016/09/20 16:37:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2016/12/15 20:13:56 maya Exp $
 
 DISTNAME=              xorg-cf-files-1.0.6
-PKGREVISION=           1
+PKGREVISION=           2
 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.27 pkgsrc/x11/xorg-cf-files/distinfo:1.28
--- pkgsrc/x11/xorg-cf-files/distinfo:1.27      Tue Sep 20 16:37:24 2016
+++ pkgsrc/x11/xorg-cf-files/distinfo   Thu Dec 15 20:13:56 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2016/09/20 16:37:24 jperkin Exp $
+$NetBSD: distinfo,v 1.28 2016/12/15 20:13:56 maya 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) = 72fcd4463207491c23e599f621c86560a2934bea
+SHA1 (patch-ag) = 4cd1c7c8c6392688b9c5fca5bdd365835ae9d563
 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.5 pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.6
--- pkgsrc/x11/xorg-cf-files/patches/patch-ag:1.5       Sun Dec 27 11:31:54 2015
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ag   Thu Dec 15 20:13:56 2016
@@ -1,7 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2015/12/27 11:31:54 wiz Exp $
+$NetBSD: patch-ag,v 1.6 2016/12/15 20:13:56 maya Exp $
 
 Add __ppc64__ and __arm__
 Recognize __sun as well as sun
+Add __ia64__
 
 --- Imake.cf.orig      2015-12-22 01:28:02.000000000 +0000
 +++ Imake.cf
@@ -17,7 +18,18 @@ Recognize __sun as well as sun
  # endif
  # ifdef __i386__
  #  define i386DarwinArchitecture
-@@ -352,7 +357,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
+@@ -255,6 +256,10 @@
+ #  define AMD64Architecture
+ #  undef __x86_64__
+ # endif
++# ifdef __ia64__
++#  define ia64Architecture
++#  undef __ia64__
++# endif
+ #endif /* NetBSD */
+ 
+ /* Systems based on kernel of NetBSD */
+@@ -352,7 +357,7 @@
  # endif
  #endif /* AMOEBA */