New X.org and emulators/wine

[Gerald Pfeifer]

After updating my test system to the lastest X.org packages and making
the adjustments to emulators/wine which I include at the end, my testing 
caught the fact that Wine longer builds the following files:

  tar: lib/wine/glu32.dll.so: Cannot stat: No such file or directory
  tar: lib/wine/libglu32.def: Cannot stat: No such file or directory
  tar: lib/wine/libopengl32.def: Cannot stat: No such file or directory
  tar: lib/wine/libwined3d.def: Cannot stat: No such file or directory
  tar: lib/wine/opengl32.dll.so: Cannot stat: No such file or directory
  tar: lib/wine/wined3d.dll.so: Cannot stat: No such file or directory

This is the case because the configure check for glXCreateContext being
present in -lGL failed.

Diving into the configure log, I spotted the following:

  configure:8335: checking for glXCreateContext in -lGL
  configure:8370: cc -o conftest -O2 -fno-strict-aliasing -pipe 
     -I/files/pfeifer/porttest/wine/include  -I/usr/local/include 
     -L/files/pfeifer/porttest/wine/lib -L/usr/local/lib conftest.c
     -lGL  -L/usr/local/lib -R/usr/local/lib -lXext -lX11
     -lm  -Wl,-rpath,/files/pfeifer/porttest/wine/lib/wine >&5
  /usr/local/lib/libGL.so: undefined reference to `drmOpenOnce'
  /usr/local/lib/libGL.so: undefined reference to `drmCloseOnce'

So, while glXCreateContext is actually provided, two other symbols
libGL.so is looking for in turn are missing.

Now, indeed I cannot find any library providing these on my system.  
/usr/local/lib/libdrm.so.2 comes close in that it provides drmOpen
and drmClose, but not the drmOpenOnce and drmCloseOnce variants.

Any hints where I should direct my investigations?

Gerald

PS: Updated port below...

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/wine/Makefile,v
retrieving revision 1.233
diff -u -3 -p -r1.233 Makefile
--- Makefile	19 May 2007 20:04:49 -0000	1.233
+++ Makefile	27 May 2007 20:21:42 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.36
-PORTREVISION=	1
+PORTVERSION=	0.9.37
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -18,11 +17,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gerald at FreeBSD.org
 COMMENT=	Microsoft Windows compatibility layer for Unix-like systems
 
-# wine/dlls/glut32/ depends on the presence of libglut.
 LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdraw.1:${PORTSDIR}/print/fontforge \
-		glut.4:${PORTSDIR}/graphics/libglut \
 		xml2:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
@@ -38,7 +35,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GL=		yes
+USE_GL=		glut
 USE_XPM=	yes
 
 SUB_FILES=	pkg-message
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/wine/distinfo,v
retrieving revision 1.135
diff -u -3 -p -r1.135 distinfo
--- distinfo	27 Apr 2007 20:42:14 -0000	1.135
+++ distinfo	27 May 2007 20:21:42 -0000
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.36.tar.bz2) = 8cc54b83b5beafcc3d998a04ed723a39
-SHA256 (wine-0.9.36.tar.bz2) = 97266030c40266dce8bc3a0f7085dd1b101c4660562137ac606a96a4cb9133f3
-SIZE (wine-0.9.36.tar.bz2) = 11843261
+MD5 (wine-0.9.37.tar.bz2) = d8f361e6fe7520cda983a78673cd3bda
+SHA256 (wine-0.9.37.tar.bz2) = ea6dd625c19a04956a743616b91d5de6239746860966c6c242475bb06b7008d0
+SIZE (wine-0.9.37.tar.bz2) = 11915704
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/wine/pkg-plist,v
retrieving revision 1.112
diff -u -3 -p -r1.112 pkg-plist
--- pkg-plist	27 Apr 2007 20:42:15 -0000	1.112
+++ pkg-plist	27 May 2007 20:21:42 -0000
@@ -708,6 +708,7 @@ lib/wine/msvideo.dll16
 lib/wine/mswsock.dll.so
 lib/wine/msxml3.dll.so
 lib/wine/nddeapi.dll.so
+lib/wine/net.exe.so
 lib/wine/netapi32.dll.so
 lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so