From e4e87e958f2326e56cda6f44a4947d96dc9088fe Mon Sep 17 00:00:00 2001
From: richard <richard@pkgsrc.org>
Date: Fri, 10 Jul 2015 13:46:36 +0000
Subject: Remove seemingly unnecessary patch-aa (inexistant file) and use c99.
 Not using git, pkgsrc should punt like other distros to get the date from the
 Changelog as set in configure.  Use awk to avoid all the other business, not
 to mention difficulties with configures use of 'echo -n' on SunOS.

---
 x11/xf86-video-nouveau/Makefile                |  3 ++-
 x11/xf86-video-nouveau/distinfo                |  4 ++--
 x11/xf86-video-nouveau/patches/patch-aa        | 16 ----------------
 x11/xf86-video-nouveau/patches/patch-configure | 17 +++++++++++++++++
 4 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 x11/xf86-video-nouveau/patches/patch-aa
 create mode 100644 x11/xf86-video-nouveau/patches/patch-configure

(limited to 'x11')

diff --git a/x11/xf86-video-nouveau/Makefile b/x11/xf86-video-nouveau/Makefile
index 9e54ef2dd5f..eb069fcbda7 100644
--- a/x11/xf86-video-nouveau/Makefile
+++ b/x11/xf86-video-nouveau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/10 13:46:36 richard Exp $
 
 DISTNAME=	xf86-video-nouveau-1.0.11
 CATEGORIES=	x11
@@ -10,6 +10,7 @@ HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	New (or nouveau) NVidia driver for modular X.org
 
 GNU_CONFIGURE=	yes
+USE_LANGUAGES+=	c99
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
diff --git a/x11/xf86-video-nouveau/distinfo b/x11/xf86-video-nouveau/distinfo
index 3cc77535674..20371267987 100644
--- a/x11/xf86-video-nouveau/distinfo
+++ b/x11/xf86-video-nouveau/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/07/10 11:38:36 rodent Exp $
+$NetBSD: distinfo,v 1.3 2015/07/10 13:46:36 richard Exp $
 
 SHA1 (xf86-video-nouveau-1.0.11.tar.bz2) = ea94037f8dd05c223dd89c79a2e655ff58425892
 RMD160 (xf86-video-nouveau-1.0.11.tar.bz2) = fb456dd3f9a20f492860040f3b7b70e107d68e61
 Size (xf86-video-nouveau-1.0.11.tar.bz2) = 582436 bytes
-SHA1 (patch-aa) = 70171a9fd194f7f4be86dd849b6c04c454e183a2
+SHA1 (patch-configure) = 21b8b7b8410fced80aef457cec1c1e3b0fed3f57
diff --git a/x11/xf86-video-nouveau/patches/patch-aa b/x11/xf86-video-nouveau/patches/patch-aa
deleted file mode 100644
index 92cbefb15e8..00000000000
--- a/x11/xf86-video-nouveau/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2015/07/02 03:37:49 rodent Exp $
-
---- src/nv_bios.c.orig	2008-06-02 01:28:36.000000000 -0400
-+++ src/nv_bios.c
-@@ -23,7 +23,11 @@
-  */
- 
- #include "nv_include.h"
-+#ifdef __NetBSD__
-+#include <sys/endian.h>
-+#else
- #include <byteswap.h>
-+#endif
- 
- /* FIXME: put these somewhere */
- #define SEQ_INDEX VGA_SEQ_INDEX
diff --git a/x11/xf86-video-nouveau/patches/patch-configure b/x11/xf86-video-nouveau/patches/patch-configure
new file mode 100644
index 00000000000..3636a2ce18e
--- /dev/null
+++ b/x11/xf86-video-nouveau/patches/patch-configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2015/07/10 13:46:36 richard Exp $
+
+Not using git, pkgsrc should punt like other distros to get the date
+from the Changelog.  Use awk to avoid all the other business, not to
+mention difficulties with configures use of 'echo -n' on SunOS.
+
+--- configure.orig	2014-09-03 19:30:34.000000000 +0000
++++ configure
+@@ -2268,7 +2268,7 @@ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define NV_DRIVER_DATE $(echo -n \";git log |head -3|tail -1|tr -d '\n';echo -n \")
++#define NV_DRIVER_DATE $(awk '/^Date:/{print "\"" $0 "\"";exit}' ChangeLog)
+ _ACEOF
+ 
+ 
-- 
cgit v1.2.3