Re: pkg/41613: x11/qt3-tools don't compile on Solaris 10 w/ modular X11

[Thomas Klausner <wiz%NetBSD.org@localhost>]

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

From: Thomas Klausner <wiz%NetBSD.org@localhost>
To: =?iso-8859-1?Q?J=F6rn?= Clausen <joern%uni-bielefeld.de@localhost>
Cc: gnats-bugs%NetBSD.org@localhost
Subject: Re: pkg/41613: x11/qt3-tools don't compile on Solaris 10 w/
        modular X11
Date: Thu, 6 Aug 2009 23:04:32 +0200

 --/e2eDi0V/xtL+Mc8
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Does the attached patch fix the problem?
  Thomas
 
 --/e2eDi0V/xtL+Mc8
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=PR41613
 
 Index: glu/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/graphics/glu/Makefile,v
 retrieving revision 1.55
 diff -u -r1.55 Makefile
 --- glu/Makefile       8 Jul 2009 20:00:58 -0000       1.55
 +++ glu/Makefile       6 Aug 2009 21:03:45 -0000
 @@ -1,6 +1,7 @@
  # $NetBSD: Makefile,v 1.55 2009/07/08 20:00:58 hasso Exp $
  
  PKGNAME=      glu-${MESA_PKGVERSION}
 +PKGREVISION=  1
  COMMENT=      GLU polygon tessellation facility for Mesa
  
  CONFLICTS+=   Mesa-glx-[0-9]*
 @@ -20,6 +21,8 @@
  post-extract:
        ${GREP} '^[[:cntrl:]][g][l][u]' ${WRKSRC}/src/glu/sgi/glu.def \
        | ${SED} -e 's,^[[:cntrl:]],,' > ${WRKSRC}/src/glu/sgi/glu.sym
 +      ${RM} ${WRKSRC}/src/glu/sgi/glu.exports
 +      ${CP} ${FILESDIR}/glu.exports.in ${WRKSRC}/src/glu/sgi/
  
  pre-build:
        cd ${WRKSRC} && ${RM} -fr src/glx src/mesa src/glut src/glw progs
 Index: glu/files/glu.exports.in
 ===================================================================
 RCS file: glu/files/glu.exports.in
 diff -N glu/files/glu.exports.in
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +++ glu/files/glu.exports.in   6 Aug 2009 21:03:45 -0000
 @@ -0,0 +1,63 @@
 +#if defined(USE_MGL_NAMESPACE)
 +# include "glu_mangle.h" /* mangle function names if needed */
 +#endif
 +
 +      gluBeginCurve
 +      gluBeginPolygon
 +      gluBeginSurface
 +      gluBeginTrim
 +      gluBuild1DMipmapLevels
 +      gluBuild1DMipmaps
 +      gluBuild2DMipmapLevels
 +      gluBuild2DMipmaps
 +      gluBuild3DMipmapLevels
 +      gluBuild3DMipmaps
 +      gluCheckExtension
 +      gluCylinder
 +      gluDeleteNurbsRenderer
 +      gluDeleteQuadric
 +      gluDeleteTess
 +      gluDisk
 +      gluEndCurve
 +      gluEndPolygon
 +      gluEndSurface
 +      gluEndTrim
 +      gluErrorString
 +      gluGetNurbsProperty
 +      gluGetString
 +      gluGetTessProperty
 +      gluLoadSamplingMatrices
 +      gluLookAt
 +      gluNewNurbsRenderer
 +      gluNewQuadric
 +      gluNewTess
 +      gluNextContour
 +      gluNurbsCallback
 +      gluNurbsCallbackData
 +      gluNurbsCallbackDataEXT
 +      gluNurbsCurve
 +      gluNurbsProperty
 +      gluNurbsSurface
 +      gluOrtho2D
 +      gluPartialDisk
 +      gluPerspective
 +      gluPickMatrix
 +      gluProject
 +      gluPwlCurve
 +      gluQuadricCallback
 +      gluQuadricDrawStyle
 +      gluQuadricNormals
 +      gluQuadricOrientation
 +      gluQuadricTexture
 +      gluScaleImage
 +      gluSphere
 +      gluTessBeginContour
 +      gluTessBeginPolygon
 +      gluTessCallback
 +      gluTessEndContour
 +      gluTessEndPolygon
 +      gluTessNormal
 +      gluTessProperty
 +      gluTessVertex
 +      gluUnProject
 +      gluUnProject4
 Index: MesaLib/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/graphics/MesaLib/distinfo,v
 retrieving revision 1.67
 diff -u -r1.67 distinfo
 --- MesaLib/distinfo   8 Jul 2009 20:00:58 -0000       1.67
 +++ MesaLib/distinfo   6 Aug 2009 21:03:46 -0000
 @@ -10,7 +10,7 @@
  RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 
9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084
  Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes
  SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
 -SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e
 +SHA1 (patch-ab) = 2d7cb59c5a157142ffbfbed026d8a51cb18d21ee
  SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
  SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
  SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
 Index: MesaLib/patches/patch-ab
 ===================================================================
 RCS file: /cvsroot/pkgsrc/graphics/MesaLib/patches/patch-ab,v
 retrieving revision 1.17
 diff -u -r1.17 patch-ab
 --- MesaLib/patches/patch-ab   5 Jun 2009 11:10:35 -0000       1.17
 +++ MesaLib/patches/patch-ab   6 Aug 2009 21:03:46 -0000
 @@ -1,7 +1,7 @@
  $NetBSD: patch-ab,v 1.17 2009/06/05 11:10:35 wiz Exp $
  
 ---- src/glu/sgi/Makefile.orig 2008-08-25 17:46:42 +0300
 -+++ src/glu/sgi/Makefile      2009-05-17 16:59:39 +0300
 +--- src/glu/sgi/Makefile.orig 2008-08-25 14:46:42.000000000 +0000
 ++++ src/glu/sgi/Makefile
  @@ -8,7 +8,8 @@ include $(TOP)/configs/current
   
   GLU_MAJOR = 1
 @@ -27,16 +27,25 @@
   
   
   ##### TARGETS #####
 -@@ -136,12 +139,11 @@ $(TOP)/$(LIB_DIR):
 +@@ -134,14 +137,19 @@ default:
 + $(TOP)/$(LIB_DIR):
 +      -mkdir $(TOP)/$(LIB_DIR)
   
 - # Make the library:
 - $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
 +-# Make the library:
 +-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
  -     $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
  -             -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
  -             -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
  -             -exports glu.exports -id 
$(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
  -             $(GLU_LIB_DEPS) $(OBJECTS)
 --
 ++# Make the exports file with the mangled or unmangled names per $CFLAGS
 ++glu.exports: glu.exports.in
 ++     $(CC) -E -I $(TOP)/include/GL $(CFLAGS) $< | \
 ++             awk '/^[^#]+/ {print}' > $@
 ++
 + 
 ++# Make the library:
 ++$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) glu.exports
  +     $(LIBTOOL) --mode=link $(CXX) \
  +             -o $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME:.so=.la) $(LDFLAGS) \
  +             -rpath $(PREFIX)/lib $(GLU_LIB_DEPS) $(OBJECTS:.o=.lo) \
 
 --/e2eDi0V/xtL+Mc8--