pkg/41507: pkgsrc-2009Q1 wxGTK28 X11R7 fix

[mm_lists%pulsar-zone.net@localhost]

>Number:         41507
>Category:       pkg
>Synopsis:       pkgsrc-2009Q1 wxGTK28 X11R7 fix
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri May 29 18:50:00 +0000 2009
>Originator:     Matthew Mondor
>Release:        NetBSD 5.0
>Organization:
>Environment:
System: NetBSD ginseng.xisop 5.0 NetBSD 5.0 (GENERIC_MM) #5: Mon Apr 27 
00:04:56 EDT 2009 
root%hal.xisop@localhost:/usr/obj/sys/arch/i386/compile/GENERIC_MM i386
Architecture: i386
Machine: i386
>Description:
        On pkgsrc-2009Q1, the wxGTK28 package fails to locate OpenGL or X11
        libraries as it only looks for X11R5 and X11R6 but not X11R7.
        These changes fix this.

        This may be valid for -current pkgsrc but I unfortunately do not
        use it and didn't have time to check.  It is vital for the stable
        pkgsrc branch to work well, however.
>How-To-Repeat:
>Fix:


Patch to add to wxGTK28/patches (patch-ad):


--- ./configure.orig    2009-03-06 07:17:38.000000000 -0500
+++ configure   2009-05-29 13:32:40.000000000 -0400
@@ -24937,7 +24937,9 @@
     /usr/local/X11/include    \
     /usr/local/include/X11    \
     /usr/local/X11R6/include  \
+    /usr/local/X11R7/include  \
     /usr/local/include/X11R6  \
+    /usr/local/include/X11R7  \
                               \
     /usr/Motif-2.1/include    \
     /usr/Motif-1.2/include    \
@@ -24949,9 +24951,11 @@
     /usr/include/Xm           \
                               \
     /usr/X11R6/include        \
+    /usr/X11R7/include        \
     /usr/X11R6.4/include      \
                               \
     /usr/include/X11R6        \
+    /usr/include/X11R7        \
                               \
     /usr/X11/include          \
     /usr/include/X11          \
@@ -29775,21 +29779,25 @@
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
+/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
+/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
+/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
+/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4


Diff against wxGTK28 stub:


Index: distinfo
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/x11/wxGTK28/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    23 Mar 2009 00:38:55 -0000      1.3
+++ distinfo    29 May 2009 17:33:36 -0000
@@ -9,3 +9,4 @@
 SHA1 (patch-aa) = 9cf0af5d5d9f6eaee43ed74c45e45c0a88907ad1
 SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
+SHA1 (patch-ad) = 00d229e36bb05cbab789864deac55e0c7b06e2b7