sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 3.2.1 and make it working on XFree86-4.

Browse source 
On XFree86-4 the port builds/installs only GLU and glut libraries and associated
includes, so GL applications have a chance to use GL library provided by the
XFree itself. Please don't forget to set XFREE86_VERSION=4 in your make.conf
if you are building it with XFee86-4.

Approved by:	jseger (previous maintainer)
This commit is contained in:
Maxim Sobolev 2000-08-24 09:53:11 +00:00
parent 1f8d2883ee
commit a002bdfd0b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=31915
10 changed files with 138 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
graphics/Mesa3/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= Mesa PORTNAME= Mesa
PORTVERSION= 3.2 PORTVERSION= 3.2.1
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://iris.ssec.wisc.edu/pub/Mesa/ \ ftp://iris.ssec.wisc.edu/pub/Mesa/ \
@ -24,7 +24,6 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
CONFIGURE_ARGS+=--with-ggi=${LOCALBASE} CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
.endif .endif
GLVER= 14
GLUTVER= 3 GLUTVER= 3
USE_X_PREFIX= yes USE_X_PREFIX= yes
USE_LIBTOOL= yes USE_LIBTOOL= yes
@ -32,9 +31,36 @@ USE_GMAKE= yes
CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}" CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}" PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
.include <bsd.port.pre.mk>
.if ${XFREE86_VERSION} == 3
SUB_GL= src
INCLUDE_GL= include
GLVER= 14
PLIST_SUB+= XFREE3:=""
.else
SUB_GL=
INCLUDE_GL=
GLVER= 1
PLIST_SUB+= XFREE3:="@comment "
MAKE_ENV= INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\*"
MAKE_ARGS= -e
.endif
MAKE_ENV+= SUB_GL=${SUB_GL} \
INCLUDE_GL=${INCLUDE_GL}
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
post-install: post-install:
.for lib in GL GLU .for lib in GL GLU
@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so @${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
.endfor .endfor
.if ${XFREE86_VERSION} > 3
@${MKDIR} ${PREFIX}/include/GL
@cd ${WRKSRC}/include/GL && \
${INSTALL_DATA} glu.h glut.h ${PREFIX}/include/GL
.endif
.include <bsd.port.mk> .include <bsd.port.post.mk>

4
graphics/Mesa3/distinfo
View file

@ -1,2 +1,2 @@
MD5 (MesaLib-3.2.tar.bz2) = 96bde293baafc203d4d8936cc856a7a5 MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58
MD5 (MesaDemos-3.2.tar.bz2) = f561df86199a429f32f641ce771406e6 MD5 (MesaDemos-3.2.1.tar.bz2) = 621bd95ed9f93467f4dfa615e2f27c16

10
graphics/Mesa3/files/patch-aa
View file

@ -1,11 +1,11 @@
--- configure.orig Mon Apr 24 09:53:56 2000 --- configure.orig Thu Jul 20 18:25:10 2000
+++ configure Tue Apr 25 10:51:16 2000 +++ configure Thu Aug 24 11:34:45 2000
@@ -817,9 +817,9 @@ @@ -822,9 +822,9 @@
MESA_MAJOR=3 MESA_MAJOR=3
MESA_MINOR=2 MESA_MINOR=2
MESA_TINY=0 MESA_TINY=1
-LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
-LIBGLU_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
-LIBGLUT_VERSION=3:7:0 -LIBGLUT_VERSION=3:7:0
+LIBGL_VERSION=${GLVER}:0 +LIBGL_VERSION=${GLVER}:0
+LIBGLU_VERSION=${GLVER}:0 +LIBGLU_VERSION=${GLVER}:0

20
graphics/Mesa3/files/patch-ad Normal file
View file

@ -0,0 +1,20 @@
--- Makefile.in 2000/08/22 07:27:14 1.1
+++ Makefile.in 2000/08/22 07:29:15
@@ -92,7 +92,7 @@
@NEED_GLUT_TRUE@SUB_GLUT = src-glut
-SUBDIRS = include src src-glu $(SUB_GLUT) $(DEMO_DIRS) util
+SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu $(SUB_GLUT) $(DEMO_DIRS) util
EXTRA_DIST = docs/INSTALL docs/INSTALL.GNU docs/CONFIG docs/IAFA-PACKAGE docs/RELNOTES docs/VERSIONS docs/CONFORM docs/COPYING docs/COPYRIGHT docs/README docs/README.3DFX docs/README.BEOS docs/README.GGI docs/README.MINGW32 docs/README.MITS docs/README.QUAKE docs/README.THREADS docs/README.X11 images/girl.rgb images/reflect.rgb images/tile.rgb
@@ -110,7 +110,7 @@
TAR = gtar
GZIP_ENV = --best
-DIST_SUBDIRS = include src src-glu src-glut book demos samples xdemos \
+DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu src-glut book demos samples xdemos \
util
all: all-redirect
.SUFFIXES:

26
graphics/Mesa3/pkg-plist
View file

@ -1,21 +1,21 @@
etc/mesa.conf %%XFREE3:%%etc/mesa.conf
include/GL/gl.h %%XFREE3:%%include/GL/gl.h
include/GL/gl_mangle.h %%XFREE3:%%include/GL/gl_mangle.h
include/GL/glu.h include/GL/glu.h
include/GL/glu_mangle.h %%XFREE3:%%include/GL/glu_mangle.h
include/GL/glut.h include/GL/glut.h
include/GL/glx.h %%XFREE3:%%include/GL/glx.h
include/GL/glx_mangle.h %%XFREE3:%%include/GL/glx_mangle.h
include/GL/osmesa.h %%XFREE3:%%include/GL/osmesa.h
include/GL/xmesa.h %%XFREE3:%%include/GL/xmesa.h
include/GL/xmesa_x.h %%XFREE3:%%include/GL/xmesa_x.h
include/GL/xmesa_xf86.h %%XFREE3:%%include/GL/xmesa_xf86.h
lib/libGL.so %%XFREE3:%%lib/libGL.so
lib/libGL.so.%%GLVER%% %%XFREE3:%%lib/libGL.so.%%GLVER%%
lib/libGLU.so lib/libGLU.so
lib/libGLU.so.%%GLVER%% lib/libGLU.so.%%GLVER%%
lib/libMesaGL.so lib/libMesaGL.so
lib/libMesaGLU.so lib/libMesaGLU.so
lib/libglut.so lib/libglut.so
lib/libglut.so.%%GLUTVER%% lib/libglut.so.%%GLUTVER%%
@dirrm include/GL %%XFREE3:%%@dirrm include/GL

32
graphics/mesagl/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= Mesa PORTNAME= Mesa
PORTVERSION= 3.2 PORTVERSION= 3.2.1
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://iris.ssec.wisc.edu/pub/Mesa/ \ ftp://iris.ssec.wisc.edu/pub/Mesa/ \
@ -24,7 +24,6 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
CONFIGURE_ARGS+=--with-ggi=${LOCALBASE} CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
.endif .endif
GLVER= 14
GLUTVER= 3 GLUTVER= 3
USE_X_PREFIX= yes USE_X_PREFIX= yes
USE_LIBTOOL= yes USE_LIBTOOL= yes
@ -32,9 +31,36 @@ USE_GMAKE= yes
CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}" CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}" PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
.include <bsd.port.pre.mk>
.if ${XFREE86_VERSION} == 3
SUB_GL= src
INCLUDE_GL= include
GLVER= 14
PLIST_SUB+= XFREE3:=""
.else
SUB_GL=
INCLUDE_GL=
GLVER= 1
PLIST_SUB+= XFREE3:="@comment "
MAKE_ENV= INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\*"
MAKE_ARGS= -e
.endif
MAKE_ENV+= SUB_GL=${SUB_GL} \
INCLUDE_GL=${INCLUDE_GL}
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
post-install: post-install:
.for lib in GL GLU .for lib in GL GLU
@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so @${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
.endfor .endfor
.if ${XFREE86_VERSION} > 3
@${MKDIR} ${PREFIX}/include/GL
@cd ${WRKSRC}/include/GL && \
${INSTALL_DATA} glu.h glut.h ${PREFIX}/include/GL
.endif
.include <bsd.port.mk> .include <bsd.port.post.mk>

4
graphics/mesagl/distinfo
View file

@ -1,2 +1,2 @@
MD5 (MesaLib-3.2.tar.bz2) = 96bde293baafc203d4d8936cc856a7a5 MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58
MD5 (MesaDemos-3.2.tar.bz2) = f561df86199a429f32f641ce771406e6 MD5 (MesaDemos-3.2.1.tar.bz2) = 621bd95ed9f93467f4dfa615e2f27c16

10
graphics/mesagl/files/patch-aa
View file

@ -1,11 +1,11 @@
--- configure.orig Mon Apr 24 09:53:56 2000 --- configure.orig Thu Jul 20 18:25:10 2000
+++ configure Tue Apr 25 10:51:16 2000 +++ configure Thu Aug 24 11:34:45 2000
@@ -817,9 +817,9 @@ @@ -822,9 +822,9 @@
MESA_MAJOR=3 MESA_MAJOR=3
MESA_MINOR=2 MESA_MINOR=2
MESA_TINY=0 MESA_TINY=1
-LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
-LIBGLU_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
-LIBGLUT_VERSION=3:7:0 -LIBGLUT_VERSION=3:7:0
+LIBGL_VERSION=${GLVER}:0 +LIBGL_VERSION=${GLVER}:0
+LIBGLU_VERSION=${GLVER}:0 +LIBGLU_VERSION=${GLVER}:0

20
graphics/mesagl/files/patch-ad Normal file
View file

@ -0,0 +1,20 @@
--- Makefile.in 2000/08/22 07:27:14 1.1
+++ Makefile.in 2000/08/22 07:29:15
@@ -92,7 +92,7 @@
@NEED_GLUT_TRUE@SUB_GLUT = src-glut
-SUBDIRS = include src src-glu $(SUB_GLUT) $(DEMO_DIRS) util
+SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu $(SUB_GLUT) $(DEMO_DIRS) util
EXTRA_DIST = docs/INSTALL docs/INSTALL.GNU docs/CONFIG docs/IAFA-PACKAGE docs/RELNOTES docs/VERSIONS docs/CONFORM docs/COPYING docs/COPYRIGHT docs/README docs/README.3DFX docs/README.BEOS docs/README.GGI docs/README.MINGW32 docs/README.MITS docs/README.QUAKE docs/README.THREADS docs/README.X11 images/girl.rgb images/reflect.rgb images/tile.rgb
@@ -110,7 +110,7 @@
TAR = gtar
GZIP_ENV = --best
-DIST_SUBDIRS = include src src-glu src-glut book demos samples xdemos \
+DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu src-glut book demos samples xdemos \
util
all: all-redirect
.SUFFIXES:

26
graphics/mesagl/pkg-plist
View file

@ -1,21 +1,21 @@
etc/mesa.conf %%XFREE3:%%etc/mesa.conf
include/GL/gl.h %%XFREE3:%%include/GL/gl.h
include/GL/gl_mangle.h %%XFREE3:%%include/GL/gl_mangle.h
include/GL/glu.h include/GL/glu.h
include/GL/glu_mangle.h %%XFREE3:%%include/GL/glu_mangle.h
include/GL/glut.h include/GL/glut.h
include/GL/glx.h %%XFREE3:%%include/GL/glx.h
include/GL/glx_mangle.h %%XFREE3:%%include/GL/glx_mangle.h
include/GL/osmesa.h %%XFREE3:%%include/GL/osmesa.h
include/GL/xmesa.h %%XFREE3:%%include/GL/xmesa.h
include/GL/xmesa_x.h %%XFREE3:%%include/GL/xmesa_x.h
include/GL/xmesa_xf86.h %%XFREE3:%%include/GL/xmesa_xf86.h
lib/libGL.so %%XFREE3:%%lib/libGL.so
lib/libGL.so.%%GLVER%% %%XFREE3:%%lib/libGL.so.%%GLVER%%
lib/libGLU.so lib/libGLU.so
lib/libGLU.so.%%GLVER%% lib/libGLU.so.%%GLVER%%
lib/libMesaGL.so lib/libMesaGL.so
lib/libMesaGLU.so lib/libMesaGLU.so
lib/libglut.so lib/libglut.so
lib/libglut.so.%%GLUTVER%% lib/libglut.so.%%GLUTVER%%
@dirrm include/GL %%XFREE3:%%@dirrm include/GL