Make this package work on Solaris.

4 files changed, 69 insertions, 8 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 9e8382a90e7..9818d484ed2 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/04/14 20:01:42 garbled Exp $
+# $NetBSD: Makefile,v 1.25 1999/07/15 15:51:42 agc Exp $
 #
 
 DISTNAME=       MesaLib-3.0
@@ -14,13 +14,19 @@ MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.ssec.wisc.edu/~brianp/Mesa.html
 
 WRKSRC=         ${WRKDIR}/${PKGNAME}
-ALL_TARGET=	netbsd
+ALL_TARGET=	${LOWER_OPSYS}
 USE_X11BASE=	yes
 MESA_LIBS=	libMesaGL libMesaGLU
 MESA_VERSION=	3.0
 GLUT_LIBS=	libglut
 GLUT_VERSION=	3.7
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+ALL_TARGET=	sunos5-gcc
+.endif
+
 post-extract:
 	@chmod +r ${WRKSRC}/demos/*
 	@find ${WRKSRC} -type f -name "*~" | xargs ${RM} -f
diff --git a/graphics/Mesa/files/patch-sum b/graphics/Mesa/files/patch-sum
index 7eb37ee8b5c..516b03c17f4 100644
--- a/graphics/Mesa/files/patch-sum
+++ b/graphics/Mesa/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:05 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/15 15:51:43 agc Exp $
 
-MD5 (patch-aa) = f356a56f4fcca4b1a389395551a17fbb
+MD5 (patch-aa) = cfe81c78d115480156c028305b7256d3
 MD5 (patch-ab) = c3385dd5619c0dd302be1049d80c9d6c
 MD5 (patch-ac) = 0baf7f6443f12759dba28d67fe61a426
+MD5 (patch-ad) = efea5edced1b2f572f79c267439849c4
diff --git a/graphics/Mesa/patches/patch-aa b/graphics/Mesa/patches/patch-aa
index 6c6b2a00a00..7d510b25364 100644
--- a/graphics/Mesa/patches/patch-aa
+++ b/graphics/Mesa/patches/patch-aa
@@ -1,7 +1,10 @@
-$NetBSD: patch-aa,v 1.5 1999/04/22 18:37:26 mycroft Exp $
+$NetBSD: patch-aa,v 1.6 1999/07/15 15:51:43 agc Exp $
 
---- Make-config.orig	Sat Aug 29 20:27:56 1998
-+++ Make-config	Wed Apr 21 23:58:58 1999
+NetBSD mods to rely on X11BASE.
+Solaris mods to rely on X11BASE, and to add the libs that Solaris forgot.
+
+--- Make-config.orig	Sun Aug 30 04:27:56 1998
++++ Make-config	Thu Jul 15 16:37:26 1999
 @@ -773,13 +773,13 @@
  
  netbsd:
@@ -21,4 +24,28 @@ $NetBSD: patch-aa,v 1.5 1999/04/22 18:37:26 mycroft Exp $
  
  next:	
  	$(MAKE)	-f Makefile.NeXT targets \
-
+@@ -1002,9 +1002,9 @@
+ 	"GLU_LIB = libMesaGLU.a" \
+ 	"GLUT_LIB = libglut.a" \
+ 	"CC = gcc" \
+-	"CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \
+-	"MAKELIB = ../mklib.ar-ruv" \
+-	"XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
++	"CFLAGS = -O3 -fPIC -I${X11BASE}/include -DSHM -DSOLARIS_2_4_BUG" \
++	"MAKELIB = ../mklib.sunos5" \
++	"XLIBS = -L${X11BASE}/lib -lX11 -lXext -lXmu -lXi -lsocket -lnsl"
+ 
+ sunos5-gcc-sl:
+ 	$(MAKE) $(MFLAGS) targets \
+@@ -1012,9 +1012,9 @@
+ 	"GLU_LIB = libMesaGLU.so" \
+ 	"GLUT_LIB = libglut.so" \
+ 	"CC = gcc" \
+-	"CFLAGS = -fPIC -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \
++	"CFLAGS = -fPIC -O3 -I${X11BASE}/include -DSHM -DSOLARIS_2_4_BUG" \
+ 	"MAKELIB = ../mklib.sunos5" \
+-	"XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
++	"XLIBS = -L${X11BASE}/lib -R${X11BASE}/lib -lX11 -lXext -lXmu -lXi -lsocket -lnsl"
+ 
+ sunos5-x11r6-gcc-sl:
+ 	$(MAKE) $(MFLAGS) targets \
diff --git a/graphics/Mesa/patches/patch-ad b/graphics/Mesa/patches/patch-ad
new file mode 100644
index 00000000000..9365b9b6ee9
--- /dev/null
+++ b/graphics/Mesa/patches/patch-ad
@@ -0,0 +1,27 @@
+$NetBSD: patch-ad,v 1.1 1999/07/15 15:51:43 agc Exp $
+
+Make Solaris build shared and static libs.
+
+--- mklib.sunos5	1999/07/15 15:15:20	1.1
++++ mklib.sunos5	1999/07/15 15:15:32
+@@ -36,4 +33,19 @@
+ 
+ #--platform-------------------------------------------------------------
+ 
+-ld -G -o $LIBRARY $OBJECTS
++set -x
++
++VERSION=$MAJOR.$MINOR
++
++BASENAME=`echo ${LIBRARY} | sed "s/\.a//g"`
++SHLIB=${BASENAME}.so.${VERSION}
++STLIB=${BASENAME}.a
++
++rm -f ${SHLIB} ${STLIB}
++
++ar cq ${STLIB} ${OBJECTS}
++ranlib ${STLIB}
++#ld -Bshareable -o ${SHLIB} ${OBJECTS}
++ld -G -o ${SHLIB} ${OBJECTS}
++
++mv ${SHLIB} ../lib