Date: Sun, 27 Feb 2000 23:22:38 -0800 From: Jeremy Lea <reg@FreeBSD.ORG> To: steve@FreeBSD.ORG Cc: freebsd-ports@FreeBSD.ORG Subject: Re: ports/17029: update port: graphics/Mesa3: 3.0 -> 3.1 Message-ID: <20000227232238.D542@shale.csir.co.za> In-Reply-To: <200002280346.TAA84388@freefall.freebsd.org>; from steve@FreeBSD.ORG on Sun, Feb 27, 2000 at 07:46:01PM -0800 References: <200002280346.TAA84388@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
On Sun, Feb 27, 2000 at 07:46:01PM -0800, steve@FreeBSD.ORG wrote:
> Synopsis: update port: graphics/Mesa3: 3.0 -> 3.1
>
> Responsible-Changed-From-To: freebsd-ports->steve
> Responsible-Changed-By: steve
> Responsible-Changed-When: Sun Feb 27 19:45:40 PST 2000
> Responsible-Changed-Why:
> I'll try to coordinate this one with Justin.
You might want to try the attached patch. I've verified that the .la
files don't get installed in a non broken tree...
-Jeremy
--
FreeBSD - Because the best things in life are free...
http://www.freebsd.org/
graphics/Mesa3:
Maintainer: jseger@FreeBSD.org
Upgrade from 3.0 to ${VERSION}
Changes: Makefile files/md5 patches/patch-aa patches/patch-ab patches/patch-ac pkg/PLIST
Adds :
Removes:
--- /usr/ports.ref/graphics/Mesa3/Makefile Tue Aug 31 21:33:05 1999
+++ graphics/Mesa3/Makefile Sun Feb 27 22:12:18 2000
@@ -1,53 +1,43 @@
# 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
+.if defined(WITH_GGI)
+LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
+CONFIGURE_ARGS+=--with-ggi=${X11BASE}
+.endif
-USE_X_PREFIX= yes
-LIBS= libMesaGL libMesaGLU
+VERSION= 3.1
+GLVER= 14
+GLUTVER= 3
-.include <bsd.port.pre.mk>
+PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
-.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
-.endif
+WRKSRC= ${WRKDIR}/${PKGNAME}
-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
+USE_X_PREFIX= yes
+USE_LIBTOOL= yes
+CONFIGURE_ARGS= --enable-static
+CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+
+post-install:
+.for lib in GL GLU
+ @${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
+ @${LN} -sf ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/libMesa${lib}.a
.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>
--- /usr/ports.ref/graphics/Mesa3/files/md5 Wed Sep 30 19:17:42 1998
+++ graphics/Mesa3/files/md5 Sun Feb 27 21:01:17 2000
@@ -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
--- /usr/ports.ref/graphics/Mesa3/patches/patch-aa Sat Oct 3 14:38:11 1998
+++ graphics/Mesa3/patches/patch-aa Sun Feb 27 21:01:17 2000
@@ -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 \
--- /usr/ports.ref/graphics/Mesa3/patches/patch-ab Wed Sep 30 19:17:46 1998
+++ graphics/Mesa3/patches/patch-ab Sun Feb 27 21:13:09 2000
@@ -1,6 +1,6 @@
---- Makefile.orig Tue Sep 1 05:14:24 1998
-+++ Makefile Wed Sep 30 14:52:15 1998
-@@ -123,7 +123,9 @@
+--- Makefile.orig Wed Dec 15 17:32:20 1999
++++ Makefile Sun Feb 27 21:07:59 2000
+@@ -44,7 +44,9 @@
@echo " make cygnus-linux for Win95/NT using Cygnus-Win32 under Linux"
@echo " make dgux for Data General"
@echo " make freebsd for FreeBSD systems with GCC"
@@ -10,12 +10,12 @@
@echo " make gcc for a generic system with GCC"
@echo " make hpux9 for HP systems with HPUX 9.x"
@echo " make hpux9-sl for HP systems with HPUX 9.x, make shared libs"
-@@ -208,7 +210,7 @@
+@@ -136,7 +138,7 @@
--aix aix-sl amix bsdos dgux freebsd freebsd-386 gcc \
-+aix aix-sl amix bsdos dgux freebsd freebsd-elf freebsd-386 freebsd-386-elf gcc \
- hpux9 hpux9-gcc hpux9-sl hpux9-gcc-sl hpux10 hpux10-gcc hpux10-gcc-sl \
- irix-debug irix4 irix5 irix5-gcc irix5-dso irix6-32 \
- irix6-32-dso \
+-aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
++aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-elf freebsd-386 freebsd-386-elf gcc \
+ hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
+ hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
+ irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
--- /usr/ports.ref/graphics/Mesa3/patches/patch-ac Sat Sep 18 14:25:44 1999
+++ graphics/Mesa3/patches/patch-ac Sun Feb 27 21:11:24 2000
@@ -1,5 +1,5 @@
---- mklib.freebsd.orig Tue Oct 21 18:34:34 1997
-+++ mklib.freebsd Fri Sep 17 13:50:59 1999
+--- bin/mklib.freebsd.orig Wed Sep 15 08:10:20 1999
++++ bin/mklib.freebsd Sun Feb 27 21:10:06 2000
@@ -34,7 +34,11 @@
#--platform------------------------------------------------------------
--- /usr/ports.ref/graphics/Mesa3/pkg/PLIST Wed Sep 30 19:17:47 1998
+++ graphics/Mesa3/pkg/PLIST Sun Feb 27 23:15:01 2000
@@ -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,21 @@
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
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
lib/libGL.a
lib/libGL.so
-lib/libGL.so.14
+lib/libGL.so.%%GLVER%%
lib/libGLU.a
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
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?20000227232238.D542>