- Use tcl8.3;

- provide workarround for dlopen()/dlsym() bug in recent CURRENT/STABLE.

10 files changed, 138 insertions, 2 deletions

diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index 51d686800b64..3c6b0bcf211f 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	sobomax
 
 MAINTAINER=	3d@FreeBSD.org
 
-BUILD_DEPENDS=	tclsh8.2:${PORTSDIR}/lang/tcl82 \
+BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83 \
 		autoconf:${PORTSDIR}/devel/autoconf \
 		nonexistent:${PORTSDIR}/graphics/Mesa3:patch
 
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--enable-extra \
 		--with-mesa=${WRKDIRPREFIX}${.CURDIR}/../../graphics/Mesa3/work/Mesa-3.2.1 \
 		--sysconfdir=${PREFIX}/etc \
 		--with-moduledir=${PREFIX}/lib/modules
-CONFIGURE_ENV=	TCLSH="tclsh8.2"
+CONFIGURE_ENV=	TCLSH="tclsh8.3"
 MAKE_ENV=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
 PLIST_SUB=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
 
diff --git a/graphics/utah-glx/files/patch-ba b/graphics/utah-glx/files/patch-ba
new file mode 100644
index 000000000000..252f0e6080ce
--- /dev/null
+++ b/graphics/utah-glx/files/patch-ba
@@ -0,0 +1,15 @@
+diff -druN libGL/pointers.c libGL/pointers.c
+--- libGL/pointers.c	Wed Jan 26 15:28:36 2000
++++ libGL/pointers.c	Sun Nov  5 19:21:46 2000
+@@ -332,9 +332,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fputs(error, stderr);
++   if (tmp == NULL) {
++      fputs(dlerror(), stderr);
+       any_error = 1;
+       return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-bb b/graphics/utah-glx/files/patch-bb
new file mode 100644
index 000000000000..55dde321512f
--- /dev/null
+++ b/graphics/utah-glx/files/patch-bb
@@ -0,0 +1,15 @@
+diff -druN servGL/hwglx/common/glx_symbols.c servGL/hwglx/common/glx_symbols.c
+--- servGL/hwglx/common/glx_symbols.c	Wed Mar 22 07:25:59 2000
++++ servGL/hwglx/common/glx_symbols.c	Sun Nov  5 19:22:23 2000
+@@ -187,9 +187,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fprintf( stderr, "%s\n", error );
++   if (tmp == NULL) {
++      fputs( dlerror(), stderr );
+       any_error = 1;
+       return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-bc b/graphics/utah-glx/files/patch-bc
new file mode 100644
index 000000000000..1406dcf53638
--- /dev/null
+++ b/graphics/utah-glx/files/patch-bc
@@ -0,0 +1,15 @@
+diff -druN servGL/hwglx/common/x11_symbols.c servGL/hwglx/common/x11_symbols.c
+--- servGL/hwglx/common/x11_symbols.c	Mon Jan 17 09:11:02 2000
++++ servGL/hwglx/common/x11_symbols.c	Sun Nov  5 19:22:44 2000
+@@ -92,9 +92,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fputs(error, stderr);
++   if (tmp == NULL) {
++      fputs(dlerror(), stderr);
+       any_error = 1;
+       return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-bd b/graphics/utah-glx/files/patch-bd
new file mode 100644
index 000000000000..a1845ce48b81
--- /dev/null
+++ b/graphics/utah-glx/files/patch-bd
@@ -0,0 +1,15 @@
+diff -druN servGL/hwglx/i810/i810symbols.c servGL/hwglx/i810/i810symbols.c
+--- servGL/hwglx/i810/i810symbols.c	Mon Jan 17 09:11:02 2000
++++ servGL/hwglx/i810/i810symbols.c	Sun Nov  5 19:17:44 2000
+@@ -28,9 +28,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fputs(error, stderr);
++   if (tmp == NULL) {
++      fputs(dlerror(), stderr);
+       any_error = 1;
+       return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-be b/graphics/utah-glx/files/patch-be
new file mode 100644
index 000000000000..b46a94e3caa1
--- /dev/null
+++ b/graphics/utah-glx/files/patch-be
@@ -0,0 +1,15 @@
+diff -druN servGL/hwglx/mga/mgasymbols.c servGL/hwglx/mga/mgasymbols.c
+--- servGL/hwglx/mga/mgasymbols.c	Tue Feb 29 12:40:30 2000
++++ servGL/hwglx/mga/mgasymbols.c	Sun Nov  5 19:18:33 2000
+@@ -29,9 +29,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fputs(error, stderr);
++   if (tmp == NULL) {
++      fputs(dlerror(), stderr);
+       any_error = 1;
+       return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-bf b/graphics/utah-glx/files/patch-bf
new file mode 100644
index 000000000000..cdb0dada01f2
--- /dev/null
+++ b/graphics/utah-glx/files/patch-bf
@@ -0,0 +1,15 @@
+diff -druN servGL/hwglx/nv/riva_symbols.c servGL/hwglx/nv/riva_symbols.c
+--- servGL/hwglx/nv/riva_symbols.c	Sun Feb 13 22:02:30 2000
++++ servGL/hwglx/nv/riva_symbols.c	Sun Nov  5 19:19:04 2000
+@@ -29,9 +29,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fputs(error, stderr);
++   if (tmp == NULL) {
++      fputs(dlerror(), stderr);
+       any_error = 1;
+       return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-bg b/graphics/utah-glx/files/patch-bg
new file mode 100644
index 000000000000..b89473c885b5
--- /dev/null
+++ b/graphics/utah-glx/files/patch-bg
@@ -0,0 +1,16 @@
+diff -druN servGL/hwglx/s3savage/s3savglx.c servGL/hwglx/s3savage/s3savglx.c
+--- servGL/hwglx/s3savage/s3savglx.c	Sun Aug 20 08:50:25 2000
++++ servGL/hwglx/s3savage/s3savglx.c	Sun Nov  5 19:20:54 2000
+@@ -83,10 +83,9 @@
+ my_dlsym(void *handle, const char *name)
+ {
+  void *tmp = dlsym(handle, name);
+- char *error;
+-if ((error = dlerror()) != 0) 
++ if (tmp == NULL)
+    {
+-    fputs(error, stderr);
++    fputs(dlerror(), stderr);
+     any_error = 1;
+     return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-bh b/graphics/utah-glx/files/patch-bh
new file mode 100644
index 000000000000..a9679899d5e6
--- /dev/null
+++ b/graphics/utah-glx/files/patch-bh
@@ -0,0 +1,15 @@
+diff -druN servGL/hwglx/s3virge/s3virgesymbols.c servGL/hwglx/s3virge/s3virgesymbols.c
+--- servGL/hwglx/s3virge/s3virgesymbols.c	Sun Jan 16 03:22:47 2000
++++ servGL/hwglx/s3virge/s3virgesymbols.c	Sun Nov  5 19:19:36 2000
+@@ -24,9 +24,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fputs(error, stderr);
++   if (tmp == NULL) {
++      fputs(dlerror(), stderr);
+       any_error = 1;
+       return 0;
+    }
diff --git a/graphics/utah-glx/files/patch-bi b/graphics/utah-glx/files/patch-bi
new file mode 100644
index 000000000000..3045e3037bf8
--- /dev/null
+++ b/graphics/utah-glx/files/patch-bi
@@ -0,0 +1,15 @@
+diff -druN servGL/hwglx/sis6326/sis6326symbols.c servGL/hwglx/sis6326/sis6326symbols.c
+--- servGL/hwglx/sis6326/sis6326symbols.c	Sun Mar  5 11:10:37 2000
++++ servGL/hwglx/sis6326/sis6326symbols.c	Sun Nov  5 19:20:00 2000
+@@ -10,9 +10,8 @@
+ static void *my_dlsym(void *handle, const char *name)
+ {
+    void *tmp = dlsym(handle, name);
+-   char *error;
+-   if ((error = dlerror()) != 0) {
+-      fputs(error, stderr);
++   if (tmp == NULL) {
++      fputs(dlerror(), stderr);
+       any_error = 1;
+       return 0;
+    }