Patches from maintainer to make the port non-BROKEN.

PR:		6392
Submitted by:	Yukihiro Nakai <nakai@apricot.astec.co.jp>

5 files changed, 48 insertions, 1 deletions

diff --git a/www/vrweb/Makefile b/www/vrweb/Makefile
index ed8196f8fee4..bb29f9578ea8 100644
--- a/www/vrweb/Makefile
+++ b/www/vrweb/Makefile
@@ -3,7 +3,7 @@
 # Date created:        20 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/11/19 03:15:39 asami Exp $
+# $Id: Makefile,v 1.3 1998/04/19 17:14:33 steve Exp $
 #
 
 DISTNAME=	vrweb-1.5
@@ -13,6 +13,8 @@ DISTFILES=	vrweb-src-1.5.tar.gz help-1.5.tar.gz
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
+LIB_DEPENDS=	GL\\.13\\.:${PORTSDIR}/graphics/Mesa
+
 USE_GMAKE=	yes
 USE_X11=	yes
 
diff --git a/www/vrweb/files/patch-ac b/www/vrweb/files/patch-ac
new file mode 100644
index 000000000000..ad151494404f
--- /dev/null
+++ b/www/vrweb/files/patch-ac
@@ -0,0 +1,10 @@
+--- src/harmony/Imakefile.orig	Fri Apr 17 12:39:50 1998
++++ src/harmony/Imakefile	Fri Apr 17 12:39:57 1998
+@@ -1,7 +1,6 @@
+ # src/harmony Imakefile
+ 
+ DIRS = \
+-  mesa \
+   ge3d \
+   vrml \
+   iicmviews \
diff --git a/www/vrweb/files/patch-ad b/www/vrweb/files/patch-ad
new file mode 100644
index 000000000000..81b1ee70a33e
--- /dev/null
+++ b/www/vrweb/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/harmony/ge3d/mesa/ge3d_mesa.C.orig	Thu Apr 23 16:05:07 1998
++++ src/harmony/ge3d/mesa/ge3d_mesa.C	Thu Apr 23 16:05:30 1998
+@@ -131,7 +131,7 @@
+ #endif
+ 
+ /* #include <GL/glx.h> */
+-#include <mesa/GL/glu.h>
++#include <GL/glu.h>
+ 
+ #include <stdio.h>
+ #include <math.h>
diff --git a/www/vrweb/files/patch-ae b/www/vrweb/files/patch-ae
new file mode 100644
index 000000000000..ea13a09e019c
--- /dev/null
+++ b/www/vrweb/files/patch-ae
@@ -0,0 +1,13 @@
+--- src/harmony/scene/mesacontext.C.orig	Thu Apr 23 16:08:17 1998
++++ src/harmony/scene/mesacontext.C	Thu Apr 23 16:08:47 1998
+@@ -95,8 +95,8 @@
+ 
+ #include <IV-X11/Xdefs.h>      /* Display, Font of X11 */
+ /* include <mesa/GL/xmesa.h> */
+-#include <mesa/GL/glx.h>
+-#include <mesa/GL/glu.h>
++#include <GL/glx.h>
++#include <GL/glu.h>
+ #include <IV-X11/Xundefs.h>  /* get back to IV's names */
+ 
+ #include <iostream.h>
diff --git a/www/vrweb/files/patch-af b/www/vrweb/files/patch-af
new file mode 100644
index 000000000000..433def17cda2
--- /dev/null
+++ b/www/vrweb/files/patch-af
@@ -0,0 +1,11 @@
+--- src/harmony/scene/Imakefile.orig	Thu Apr 23 16:25:17 1998
++++ src/harmony/scene/Imakefile	Thu Apr 23 16:29:05 1998
+@@ -135,7 +135,7 @@
+ #endif
+ #ifdef MESA_GL
+ MESA_CCLDLIBS = $(APP_CCLDLIBS) -l$(MESA_GE3D) $(MESA_LIBS) $(IV_CCLDLIBS) $(EXTRA_CCLDLIBS)
+-MESA_CCDEPLIBS = $(HGLIBDIR)/lib$(MESA_GE3D).a $(HGLIBDIR)/libMesaGL.a $(HGLIBDIR)/libMesaGLU.a
++MESA_CCDEPLIBS = $(HGLIBDIR)/lib$(MESA_GE3D).a
+ #endif
+ 
+ # Mosaic CCI