Date: Sun, 27 Feb 2000 22:16:23 -0500 (EST) From: Will Andrews <andrews@technologist.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/17029: update port: graphics/Mesa3: 3.0 -> 3.1 Message-ID: <20000228031623.8304A18CA@shadow.blackdawn.com>
next in thread | raw e-mail | index | archive | help
>Number: 17029
>Category: ports
>Synopsis: update port: graphics/Mesa3: 3.0 -> 3.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 27 19:20:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Will Andrews
>Release: FreeBSD 3.4-STABLE i386
>Organization:
none
>Environment:
FreeBSD shadow.blackdawn.com 3.4-STABLE FreeBSD 3.4-STABLE #0: Sun Jan 23 13:41:02 EST 2000 root@shadow.blackdawn.com:/usr/src/sys/compile/SHADOW i386
>Description:
Upgrade graphics/Mesa3 to new version (Mesa 3.1).
Changes in port:
1) Sort pkg/PLIST.
2) Add library version knobs in pkg/PLIST.
3) Remove patch-ab and patch-ac. They are obsolete now.
4) Support GGI interface. I tested the build/link for this.
5) New MASTER_SITES.
6) General Makefile cleanups.
7) Add USE_LIBTOOL.
8) Allow -lMesaGL[U] to continue working.
Problems:
1) USE_LIBTOOL doesn't quite work. It installs the *.la
files anyway. I left those files out of pkg/PLIST in
hopes that someone with the knowledge could fix this
problem before it is committed.
>How-To-Repeat:
Use the patch below to fix the current port.
>Fix:
Index: Makefile
===================================================================
RCS file: /extra/cvsroot/ports/graphics/Mesa3/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile 1999/08/31 06:44:53 1.34
+++ Makefile 2000/02/28 03:14:34
@@ -1,53 +1,39 @@
# New ports collection makefile for: Mesa
-# Version required: 3.0
+# Version required: 3.1
# Date created: Tue Feb 7 12:02:49 1995
# Whom: hsu
#
# $FreeBSD: ports/graphics/Mesa3/Makefile,v 1.34 1999/08/31 06:44:53 mharo Exp $
#
-DISTNAME= MesaLib-3.0
-PKGNAME= Mesa-3.0
+DISTNAME= MesaLib-${VERSION}
+PKGNAME= Mesa-${VERSION}
CATEGORIES= graphics
-MASTER_SITES= ftp://iris.ssec.wisc.edu/pub/Mesa/ \
+MASTER_SITES= http://download.sourceforge.net/mesa3d/ \
+ 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
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MesaDemos-${VERSION}.tar.gz
MAINTAINER= jseger@FreeBSD.org
-WRKSRC= ${WRKDIR}/Mesa-3.0
-
-USE_X_PREFIX= yes
-LIBS= libMesaGL libMesaGLU
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-ALL_TARGET= freebsd-elf
-SHLIB_VERSION= 14
-GLUT_VERSION= 3
-.else
-ALL_TARGET= freebsd
-SHLIB_VERSION= 14.0
-GLUT_VERSION= 3.7
+.if defined(WANT_GGI)
+LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
+CONFIGURE_ARGS+=--with-ggi=${X11BASE}
.endif
-do-install:
-.for file in ${LIBS}
- ${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
- ${LN} -fs ${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/${file}.so
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/lib/libglut.a ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ${PREFIX}/lib
- ${LN} -fs libglut.so.${GLUT_VERSION} ${PREFIX}/lib/libglut.so
-.for file in GL GLU
- @${LN} -fs libMesa${file}.a ${PREFIX}/lib/lib${file}.a
- @${LN} -fs libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
- @${LN} -fs libMesa${file}.so ${PREFIX}/lib/lib${file}.so
+VERSION= 3.1
+GLVER= 14
+GLUTVER= 3
+WRKSRC= ${WRKDIR}/${PKGNAME}
+USE_X_PREFIX= yes
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+
+post-install:
+.for lib in GL GLU
+ @${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
.endfor
- @${MKDIR} ${PREFIX}/include/GL
- ${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
- ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/md5
===================================================================
RCS file: /extra/cvsroot/ports/graphics/Mesa3/files/md5,v
retrieving revision 1.15
diff -u -r1.15 md5
--- files/md5 1998/10/01 02:17:42 1.15
+++ files/md5 2000/02/26 02:38:59
@@ -1,2 +1,2 @@
-MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5
-MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad
+MD5 (MesaLib-3.1.tar.gz) = 39af22bdf42f280f20afcacfa7ba4599
+MD5 (MesaDemos-3.1.tar.gz) = c788d5206acf290439f718d5f447724c
Index: patches/patch-aa
===================================================================
RCS file: /extra/cvsroot/ports/graphics/Mesa3/patches/patch-aa,v
retrieving revision 1.16
diff -u -r1.16 patch-aa
--- patches/patch-aa 1998/10/03 21:38:11 1.16
+++ patches/patch-aa 2000/02/26 05:44:43
@@ -1,51 +1,15 @@
---- 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
+--- configure Tue Dec 14 14:20:48 1999
++++ configure.new Sat Feb 26 00:34:51 2000
+@@ -815,9 +815,9 @@
--MAJOR=3
-+MAJOR=14
- MINOR=0
-+.if ${PORTOBJFORMAT} == "elf"
-+VERSION=$(MAJOR)
-+.else
- VERSION=$(MAJOR).$(MINOR)
-+.endif
- # Mesa 3-D graphics library
- # Copyright (C) 1995-1998 Brian Paul
-@@ -281,6 +285,16 @@
- "MAKELIB = ../mklib.freebsd" \
- "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
+ # CURRENT:REVISION:AGE
+-LIBGL_VERSION=3:0:2
+-LIBGLU_VERSION=3:0:2
+-LIBGLUT_VERSION=10:0:7
++LIBGL_VERSION=${GLVER}:0
++LIBGLU_VERSION=${GLVER}:0
++LIBGLUT_VERSION=${GLUTVER}:0
-+freebsd-elf:
-+ $(MAKE) $(MFLAGS) targets \
-+ "GL_LIB = libMesaGL.a" \
-+ "GLU_LIB = libMesaGLU.a" \
-+ "GLUT_LIB = libglut.a" \
-+ "CC = gcc" \
-+ "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
-+ "MAKELIB = ../mklib.freebsd" \
-+ "XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11"
-+
- freebsd-386:
- $(MAKE) $(MFLAGS) targets \
- "GL_LIB = libMesaGL.a" \
-@@ -291,6 +305,17 @@
- "MAKELIB = ../mklib.freebsd" \
- "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11" \
- "ASM_SOURCES = asm_386.S"
-+
-+freebsd-386-elf:
-+ $(MAKE) $(MFLAGS) targets \
-+ "GL_LIB = libMesaGL.a" \
-+ "GLU_LIB = libMesaGLU.a" \
-+ "GLUT_LIB = libglut.a" \
-+ "CC = gcc" \
-+ "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"
- gcc:
- $(MAKE) $(MFLAGS) targets \
+
Index: pkg/PLIST
===================================================================
RCS file: /extra/cvsroot/ports/graphics/Mesa3/pkg/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- pkg/PLIST 1998/10/01 02:17:47 1.14
+++ pkg/PLIST 2000/02/28 01:41:02
@@ -1,7 +1,4 @@
-include/GL/dosmesa.h
-include/GL/foomesa.h
-include/GL/fxmesa.h
-include/GL/ggimesa.h
+etc/mesa.conf
include/GL/gl.h
include/GL/gl_mangle.h
include/GL/glu.h
@@ -9,27 +6,18 @@
include/GL/glut.h
include/GL/glx.h
include/GL/glx_mangle.h
-include/GL/mglmesa.h
include/GL/osmesa.h
-include/GL/osmesa3.h
-include/GL/svgamesa.h
-include/GL/wmesa.h
include/GL/xmesa.h
-lib/libGL.a
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
lib/libGL.so
-lib/libGL.so.14
-lib/libGLU.a
+lib/libGL.so.%%GLVER%%
lib/libGLU.so
-lib/libGLU.so.14
-lib/libMesaGL.a
+lib/libGLU.so.%%GLVER%%
lib/libMesaGL.so
-lib/libMesaGL.so.14
-lib/libMesaGLU.a
lib/libMesaGLU.so
-lib/libMesaGLU.so.14
-lib/libglut.a
lib/libglut.so
-lib/libglut.so.3.7
+lib/libglut.so.%%GLUTVER%%
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm include/GL
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000228031623.8304A18CA>