summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorJustin M. Seger <jseger@FreeBSD.org>1998-10-01 02:17:49 +0000
committerJustin M. Seger <jseger@FreeBSD.org>1998-10-01 02:17:49 +0000
commit1b4e5b49b4f51106645cc739a9a6d87c2a0ee972 (patch)
tree9f81c796654c03fd50e69d0a22bd6c6461048074 /graphics
parentMark BROKEN for ELF. (diff)
Upgrade to Mesa 3.0
Notes
Notes: svn path=/head/; revision=13567
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Mesa3/Makefile16
-rw-r--r--graphics/Mesa3/distinfo4
-rw-r--r--graphics/Mesa3/files/patch-aa14
-rw-r--r--graphics/Mesa3/pkg-plist3
-rw-r--r--graphics/geomview/Makefile4
-rw-r--r--graphics/mesagl/Makefile16
-rw-r--r--graphics/mesagl/distinfo4
-rw-r--r--graphics/mesagl/files/patch-aa14
-rw-r--r--graphics/mesagl/pkg-plist3
9 files changed, 38 insertions, 40 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 15:24:41 +0000