Re: pkg/49986: print/xdvik fails to build on NetBSD-6.1.5/amd64

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

The following reply was made to PR pkg/49986; it has been noted by GNATS.

From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/49986: print/xdvik fails to build on NetBSD-6.1.5/amd64
Date: Sat, 20 Jun 2015 15:56:51 +1200

 --Boundary-00=_DSOhVsqTV0WWGLJ
 Content-Type: Text/Plain;
   charset="iso-8859-15"
 Content-Transfer-Encoding: 7bit
 
 On Fri, 19 Jun 2015 15:00:01 David Holland wrote:
 >  Probably it's ok to stuff the #include and #ifdef parts of that into
 >  the existing test.
 
 Here is a patch that does that, and I've confirmed that it doesn't break 
 things on NetBSD-6.1_STABLE with modular X and on Linux so could you please 
 confirm this fixes NetBSD 6.1 with native X.
 
 cheers
 mark
 
 --Boundary-00=_DSOhVsqTV0WWGLJ
 Content-Type: text/x-patch;
   charset="UTF-8";
   name="xdvik.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="xdvik.patch"
 
 Index: distinfo
 ===================================================================
 RCS file: /src/cvs/netbsd/pkgsrc/print/xdvik/distinfo,v
 retrieving revision 1.8
 diff -u -r1.8 distinfo
 --- distinfo	14 Jun 2015 12:50:07 -0000	1.8
 +++ distinfo	20 Jun 2015 02:36:24 -0000
 @@ -5,3 +5,4 @@
  Size (texlive-20150521-source.tar.xz) = 45459552 bytes
  SHA1 (patch-aa) = 08bc8e8a7a2cd7a65c0a176f02fdd2930d1d9ae2
  SHA1 (patch-ab) = bbbeb011aa888f2ee7dab84c1602fb3e1127cdb1
 +SHA1 (patch-configure) = bd3b6309a60ea8173cb020335f7337abbda07103
 --- /dev/null	2015-06-20 14:50:42.000000000 +1200
 +++ patches/patch-configure	2015-06-20 14:36:16.000000000 +1200
 @@ -0,0 +1,14 @@
 +$NetBSD$
 +
 +--- configure.orig	2015-03-12 14:42:02.000000000 +0000
 ++++ configure
 +@@ -15788,6 +15788,9 @@ LDFLAGS="$X_LIBS $LDFLAGS"
 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 + /* end confdefs.h.  */
 + #include <X11/extensions/XInput2.h>
 ++#ifndef XIScrollClass
 ++ bollocks
 ++#endif
 + int
 + main ()
 + {
 
 --Boundary-00=_DSOhVsqTV0WWGLJ--