Upgrade to Mesa 3.0

author: Justin M. Seger <jseger@FreeBSD.org> 1998-10-01 02:17:49 +0000
committer: Justin M. Seger <jseger@FreeBSD.org> 1998-10-01 02:17:49 +0000
commit: 1b4e5b49b4f51106645cc739a9a6d87c2a0ee972 (patch)
tree: 9f81c796654c03fd50e69d0a22bd6c6461048074
parent: Mark BROKEN for ELF. (diff)
22 files changed, 76 insertions, 72 deletions
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index e59602f5b804..4f2ad4a6ca51 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -3,7 +3,7 @@
 # Date created:				10 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.4 1998/08/05 09:30:51 asami Exp $
+# $Id: Makefile,v 1.5 1998/09/27 16:06:52 steve Exp $
 #
 
 DISTNAME=	KnightCap-3.5
@@ -13,9 +13,9 @@ MASTER_SITES=	ftp://samba.anu.edu.au/pub/KnightCap/
 
 MAINTAINER=	andy@icc.surw.chel.su
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2 \
-		MesaGLU.13:${PORTSDIR}/graphics/Mesa2 \
-		glut.3:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3\
+		MesaGLU.14:${PORTSDIR}/graphics/Mesa3 \
+		glut.3:${PORTSDIR}/graphics/Mesa3
 
 FETCH_BEFORE_ARGS=	-P
 ALL_TARGET=	KnightCap
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index a52a62a7fb43..5c4aad9a38e2 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -3,7 +3,7 @@
 # Date created:				17 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.4 1998/08/05 09:30:52 asami Exp $
+# $Id: Makefile,v 1.5 1998/09/27 16:06:56 steve Exp $
 #
 
 DISTNAME=	battalion-1.4
@@ -13,8 +13,8 @@ DISTFILES=	battalionSource1.4.tar.Z battalionSUN4.tar.gz
 
 MAINTAINER=	andy@icc.surw.chel.su
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2 \
-		MesaGLU.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3 \
+		MesaGLU.14:${PORTSDIR}/graphics/Mesa3
 
 ALL_TARGET=
 USE_X_PREFIX=	yes
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 5f38963aa146..9e94c85f205c 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -3,7 +3,7 @@
 # Date created:         4 Mar 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1998/08/27 06:09:50 jseger Exp $
+# $Id: Makefile,v 1.6 1998/09/27 16:06:56 steve Exp $
 #
 
 DISTNAME=	tank-0.4a-src
@@ -13,7 +13,9 @@ MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
 
 MAINTAINER=	dburr@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
+
+BROKEN=		can't find libaux.h
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index d74e86d067c4..5781bf2fc0dc 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -1,26 +1,24 @@
 # New ports collection makefile for:    Mesa
-# Version required:     3.0 beta 6
+# Version required:     3.0
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.27 1998/08/12 22:52:25 asami Exp $
+# $Id: Makefile,v 1.28 1998/09/26 23:33:10 steve Exp $
 #
 
-DISTNAME=       MesaLib-3.0beta6
-PKGNAME=	Mesa-3.0b6
+DISTNAME=       MesaLib-3.0
+PKGNAME=	Mesa-3.0
 CATEGORIES=	graphics
-MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/beta/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0beta6.tar.gz
+MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/ \
+		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
-MANUAL_PACKAGE_BUILD=	shlib version conflict
-
 WRKSRC=		${WRKDIR}/Mesa-3.0
 
 USE_X_PREFIX=	yes
 LIBS=		libMesaGL libMesaGLU
-NO_LATEST_LINK=	yes
 
 do-install:
 .for file in ${LIBS}
diff --git a/graphics/Mesa3/distinfo b/graphics/Mesa3/distinfo
index 37c9a8a92f0d..da0505ee8322 100644
--- a/graphics/Mesa3/distinfo
+++ b/graphics/Mesa3/distinfo
@@ -1,2 +1,2 @@
-MD5 (MesaLib-3.0beta6.tar.gz) = 2258777f885f838415c8851f1006a6aa
-MD5 (MesaDemos-3.0beta6.tar.gz) = 1096966c0643035d7a1116381116f15d
+MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5
+MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad
diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa
index dfa8fb6e8d29..adb427ad09fe 100644
--- a/graphics/Mesa3/files/patch-aa
+++ b/graphics/Mesa3/files/patch-aa
@@ -1,5 +1,5 @@
---- Make-config.orig	Wed Jul  1 13:17:10 1998
-+++ Make-config	Sun Sep 27 11:46:02 1998
+--- Make-config.orig	Sun Aug 30 05:27:56 1998
++++ Make-config	Wed Sep 30 14:50:03 1998
 @@ -1,8 +1,12 @@
  # Make-config
  
@@ -14,7 +14,7 @@
  
  # Mesa 3-D graphics library
  # Copyright (C) 1995-1998  Brian Paul
-@@ -238,6 +242,16 @@
+@@ -281,6 +285,16 @@
  	"MAKELIB = ../mklib.freebsd" \
  	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
  
@@ -31,11 +31,10 @@
  freebsd-386:
  	$(MAKE) $(MFLAGS) targets \
  	"GL_LIB = libMesaGL.a" \
-@@ -247,6 +261,17 @@
- 	"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
+@@ -291,6 +305,17 @@
  	"MAKELIB = ../mklib.freebsd" \
  	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11" \
-+	"ASM_SOURCES = asm-386.S"
+ 	"ASM_SOURCES = asm_386.S"
 +
 +freebsd-386-elf:
 +	$(MAKE) $(MFLAGS) targets \
@@ -46,6 +45,7 @@
 +	"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM" \
 +	"MAKELIB = ../mklib.freebsd" \
 +	"XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11" \
- 	"ASM_SOURCES = asm-386.S"
++	"ASM_SOURCES = asm-386.S"
  
  gcc:
+ 	$(MAKE) $(MFLAGS) targets \
diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist
index 37a25b9d5cd2..edb1058ff41c 100644
--- a/graphics/Mesa3/pkg-plist
+++ b/graphics/Mesa3/pkg-plist
@@ -1,6 +1,7 @@
-include/GL/FooMesa.h
 include/GL/dosmesa.h
+include/GL/foomesa.h
 include/GL/fxmesa.h
+include/GL/ggimesa.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glu.h
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index b77b7e04acb9..bec5835bed5c 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -3,7 +3,7 @@
 # Date created:				5 November 1996
 # Whom:					fenner
 #
-# $Id: Makefile,v 1.9 1998/09/26 23:18:05 steve Exp $
+# $Id: Makefile,v 1.10 1998/09/27 16:06:56 steve Exp $
 
 DISTNAME=	geomview-1.6.1
 CATEGORIES=	graphics tk42
@@ -16,7 +16,7 @@ MAINTAINER=	fenner@freebsd.org
 BROKEN_ELF=	xforms is a.out only
 
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		MesaGL.13:${PORTSDIR}/graphics/Mesa2 \
+		MesaGL.14:${PORTSDIR}/graphics/Mesa3 \
 		tk42.1:${PORTSDIR}/x11-toolkits/tk42
 
 WRKSRC=		${WRKDIR}/Geomview
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index d74e86d067c4..5781bf2fc0dc 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -1,26 +1,24 @@
 # New ports collection makefile for:    Mesa
-# Version required:     3.0 beta 6
+# Version required:     3.0
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.27 1998/08/12 22:52:25 asami Exp $
+# $Id: Makefile,v 1.28 1998/09/26 23:33:10 steve Exp $
 #
 
-DISTNAME=       MesaLib-3.0beta6
-PKGNAME=	Mesa-3.0b6
+DISTNAME=       MesaLib-3.0
+PKGNAME=	Mesa-3.0
 CATEGORIES=	graphics
-MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/beta/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0beta6.tar.gz
+MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/ \
+		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
-MANUAL_PACKAGE_BUILD=	shlib version conflict
-
 WRKSRC=		${WRKDIR}/Mesa-3.0
 
 USE_X_PREFIX=	yes
 LIBS=		libMesaGL libMesaGLU
-NO_LATEST_LINK=	yes
 
 do-install:
 .for file in ${LIBS}
diff --git a/graphics/mesagl/distinfo b/graphics/mesagl/distinfo
index 37c9a8a92f0d..da0505ee8322 100644
--- a/graphics/mesagl/distinfo
+++ b/graphics/mesagl/distinfo
@@ -1,2 +1,2 @@
-MD5 (MesaLib-3.0beta6.tar.gz) = 2258777f885f838415c8851f1006a6aa
-MD5 (MesaDemos-3.0beta6.tar.gz) = 1096966c0643035d7a1116381116f15d
+MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5
+MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad
diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
index dfa8fb6e8d29..adb427ad09fe 100644
--- a/graphics/mesagl/files/patch-aa
+++ b/graphics/mesagl/files/patch-aa
@@ -1,5 +1,5 @@
---- Make-config.orig	Wed Jul  1 13:17:10 1998
-+++ Make-config	Sun Sep 27 11:46:02 1998
+--- Make-config.orig	Sun Aug 30 05:27:56 1998
++++ Make-config	Wed Sep 30 14:50:03 1998
 @@ -1,8 +1,12 @@
  # Make-config
  
@@ -14,7 +14,7 @@
  
  # Mesa 3-D graphics library
  # Copyright (C) 1995-1998  Brian Paul
-@@ -238,6 +242,16 @@
+@@ -281,6 +285,16 @@
  	"MAKELIB = ../mklib.freebsd" \
  	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
  
@@ -31,11 +31,10 @@
  freebsd-386:
  	$(MAKE) $(MFLAGS) targets \
  	"GL_LIB = libMesaGL.a" \
-@@ -247,6 +261,17 @@
- 	"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
+@@ -291,6 +305,17 @@
  	"MAKELIB = ../mklib.freebsd" \
  	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11" \
-+	"ASM_SOURCES = asm-386.S"
+ 	"ASM_SOURCES = asm_386.S"
 +
 +freebsd-386-elf:
 +	$(MAKE) $(MFLAGS) targets \
@@ -46,6 +45,7 @@
 +	"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM" \
 +	"MAKELIB = ../mklib.freebsd" \
 +	"XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11" \
- 	"ASM_SOURCES = asm-386.S"
++	"ASM_SOURCES = asm-386.S"
  
  gcc:
+ 	$(MAKE) $(MFLAGS) targets \
diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist
index 37a25b9d5cd2..edb1058ff41c 100644
--- a/graphics/mesagl/pkg-plist
+++ b/graphics/mesagl/pkg-plist
@@ -1,6 +1,7 @@
-include/GL/FooMesa.h
 include/GL/dosmesa.h
+include/GL/foomesa.h
 include/GL/fxmesa.h
+include/GL/ggimesa.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glu.h
diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile
index 5a6a345f5ab8..80861fbddeec 100644
--- a/mail/glbiff/Makefile
+++ b/mail/glbiff/Makefile
@@ -3,7 +3,7 @@
 # Date created:				18 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.5 1998/09/15 06:37:57 hoek Exp $
+# $Id: Makefile,v 1.6 1998/09/27 16:06:57 steve Exp $
 #
 
 DISTNAME=	glbiff-0.2
@@ -13,10 +13,12 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	andy@icc.surw.chel.su
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2 \
-		MesaGLU.13:${PORTSDIR}/graphics/Mesa2 \
-		Mesatk.13:${PORTSDIR}/graphics/Mesa2 \
-		glut.3:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3 \
+		MesaGLU.14:${PORTSDIR}/graphics/Mesa3 \
+		Mesatk.14:${PORTSDIR}/graphics/Mesa3 \
+		glut.3:${PORTSDIR}/graphics/Mesa3
+
+BROKEN=		can't find mesatk
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/glbiff
diff --git a/www/vrweb/Makefile b/www/vrweb/Makefile
index dd792d7bb5f7..3e68d2294a43 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.6 1998/08/05 09:31:39 asami Exp $
+# $Id: Makefile,v 1.7 1998/09/27 16:06:57 steve Exp $
 #
 
 DISTNAME=	vrweb-1.5
@@ -13,7 +13,9 @@ 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/Mesa2
+LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
+
+BROKEN=		install
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index a6a6b1fda7da..cc504b412b7c 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $
+# $Id: Makefile,v 1.24 1998/09/27 17:46:48 steve Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
 MAJ=		1
 MIN=		40
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index a6a6b1fda7da..cc504b412b7c 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $
+# $Id: Makefile,v 1.24 1998/09/27 17:46:48 steve Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
 MAJ=		1
 MIN=		40
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index a6a6b1fda7da..cc504b412b7c 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $
+# $Id: Makefile,v 1.24 1998/09/27 17:46:48 steve Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
 MAJ=		1
 MIN=		40
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index a6a6b1fda7da..cc504b412b7c 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $
+# $Id: Makefile,v 1.24 1998/09/27 17:46:48 steve Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
 MAJ=		1
 MIN=		40
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index a6a6b1fda7da..cc504b412b7c 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $
+# $Id: Makefile,v 1.24 1998/09/27 17:46:48 steve Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
 MAJ=		1
 MIN=		40
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index a6a6b1fda7da..cc504b412b7c 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $
+# $Id: Makefile,v 1.24 1998/09/27 17:46:48 steve Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
 MAJ=		1
 MIN=		40
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index a6a6b1fda7da..cc504b412b7c 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $
+# $Id: Makefile,v 1.24 1998/09/27 17:46:48 steve Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=	MesaGL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
 MAJ=		1
 MIN=		40
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 74e6957a9ba3..74c039a35fea 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.40 1998/09/27 16:06:58 steve Exp $
+# $Id: Makefile,v 1.41 1998/09/30 07:52:45 tg Exp $
 #
 
 DISTNAME=       xlockmore-4.12
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --with-libraries=/usr/lib/aout
 WITH_MESAGL?=	no
 .if ${WITH_MESAGL} == yes
 CONFIGURE_ARGS+=	--with-mesagl
-LIB_DEPENDS+=		GL.13:${PORTSDIR}/graphics/Mesa2
+LIB_DEPENDS+=		GL.14:${PORTSDIR}/graphics/Mesa3
 .else
 CONFIGURE_ARGS+=	--without-mesagl
 .endif
author	Justin M. Seger <jseger@FreeBSD.org>	1998-10-01 02:17:49 +0000
committer	Justin M. Seger <jseger@FreeBSD.org>	1998-10-01 02:17:49 +0000
commit	1b4e5b49b4f51106645cc739a9a6d87c2a0ee972 (patch)
tree	9f81c796654c03fd50e69d0a22bd6c6461048074
parent	Mark BROKEN for ELF. (diff)