Tue Jan 22 09:34:20 2013 UTC ()
automake-1.13 compat.


(wiz)
diff -r1.2 -r1.3 pkgsrc/x11/xf86-video-vga/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/xf86-video-vga/patches/patch-aa
cvs diff -r1.2 -r1.3 pkgsrc/x11/xf86-video-vga/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-vga/Attic/distinfo 2009/06/09 08:18:39 1.2
+++ pkgsrc/x11/xf86-video-vga/Attic/distinfo 2013/01/22 09:34:19 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2009/06/09 08:18:39 hasso Exp $ 1$NetBSD: distinfo,v 1.3 2013/01/22 09:34:19 wiz Exp $
2 2
3SHA1 (xf86-video-vga-4.1.0.tar.bz2) = a3b5562e5714d956647389cc8c089fac85d7177e 3SHA1 (xf86-video-vga-4.1.0.tar.bz2) = a3b5562e5714d956647389cc8c089fac85d7177e
4RMD160 (xf86-video-vga-4.1.0.tar.bz2) = ff87eab31181abb5aba2bc29dbb7a883392ef95b 4RMD160 (xf86-video-vga-4.1.0.tar.bz2) = ff87eab31181abb5aba2bc29dbb7a883392ef95b
5Size (xf86-video-vga-4.1.0.tar.bz2) = 233642 bytes 5Size (xf86-video-vga-4.1.0.tar.bz2) = 233642 bytes
6SHA1 (patch-aa) = d1d926e4e4ccfe4f810834c33c05be388e33eb2e 6SHA1 (patch-aa) = 90b4b24cbccbbe6aa0789694828d105e8dab6347
7SHA1 (patch-ab) = 04c37e11b5f8234c1588196c483c3a1682831211 7SHA1 (patch-ab) = 04c37e11b5f8234c1588196c483c3a1682831211
cvs diff -r1.1 -r1.2 pkgsrc/x11/xf86-video-vga/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-vga/patches/Attic/patch-aa 2009/06/09 08:18:39 1.1
+++ pkgsrc/x11/xf86-video-vga/patches/Attic/patch-aa 2013/01/22 09:34:19 1.2
@@ -1,20 +1,31 @@ @@ -1,20 +1,31 @@
1$NetBSD: patch-aa,v 1.1 2009/06/09 08:18:39 hasso Exp $ 1$NetBSD: patch-aa,v 1.2 2013/01/22 09:34:19 wiz Exp $
2 2
 3First chunk: automake-1.13 compat
 4Rest:
3http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=97e2d125 5http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=97e2d125
4http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=a0d4a475 6http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=a0d4a475
5 7
6--- configure.ac.orig 2006-04-08 00:48:23 +0300 8--- configure.ac.orig 2006-04-07 21:48:23.000000000 +0000
7+++ configure.ac 2009-06-09 10:27:54 +0300 9+++ configure.ac
 10@@ -27,7 +27,7 @@ AC_INIT([xf86-video-vga],
 11 xf86-video-vga)
 12
 13 AC_CONFIG_SRCDIR([Makefile.am])
 14-AM_CONFIG_HEADER([config.h])
 15+AC_CONFIG_HEADER([config.h])
 16 AC_CONFIG_AUX_DIR(.)
 17
 18 AM_INIT_AUTOMAKE([dist-bzip2])
8@@ -57,6 +57,30 @@ PKG_CHECK_MODULES(XORG, [xorg-server >=  19@@ -57,6 +57,30 @@ PKG_CHECK_MODULES(XORG, [xorg-server >=
9 sdkdir=$(pkg-config --variable=sdkdir xorg-server) 20 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
10  21
11 # Checks for libraries. 22 # Checks for libraries.
12+SAVE_CPPFLAGS="$CPPFLAGS" 23+SAVE_CPPFLAGS="$CPPFLAGS"
13+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" 24+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
14+AC_CHECK_DECL(XSERVER_LIBPCIACCESS, 25+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
15+ [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], 26+ [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
16+ [#include "xorg-server.h"]) 27+ [#include "xorg-server.h"])
17+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) 28+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
18+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) 29+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
19+CPPFLAGS="$SAVE_CPPFLAGS" 30+CPPFLAGS="$SAVE_CPPFLAGS"
20+ 31+