diff options
Diffstat (limited to 'graphics/Mesa3')
| -rw-r--r-- | graphics/Mesa3/Makefile | 32 | ||||
| -rw-r--r-- | graphics/Mesa3/distinfo | 4 | ||||
| -rw-r--r-- | graphics/Mesa3/files/patch-aa | 10 | ||||
| -rw-r--r-- | graphics/Mesa3/files/patch-ad | 20 | ||||
| -rw-r--r-- | graphics/Mesa3/pkg-plist | 26 |
5 files changed, 69 insertions, 23 deletions
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile index f69e81c2c6d6..6a3ab8afd701 100644 --- a/graphics/Mesa3/Makefile +++ b/graphics/Mesa3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= Mesa -PORTVERSION= 3.2 +PORTVERSION= 3.2.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://iris.ssec.wisc.edu/pub/Mesa/ \ @@ -24,7 +24,6 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi CONFIGURE_ARGS+=--with-ggi=${LOCALBASE} .endif -GLVER= 14 GLUTVER= 3 USE_X_PREFIX= yes USE_LIBTOOL= yes @@ -32,9 +31,36 @@ USE_GMAKE= yes CONFIGURE_ENV+= 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: .for lib in GL GLU @${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so .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> diff --git a/graphics/Mesa3/distinfo b/graphics/Mesa3/distinfo index dd4de7eb9495..761947e954ad 100644 --- a/graphics/Mesa3/distinfo +++ b/graphics/Mesa3/distinfo @@ -1,2 +1,2 @@ -MD5 (MesaLib-3.2.tar.bz2) = 96bde293baafc203d4d8936cc856a7a5 -MD5 (MesaDemos-3.2.tar.bz2) = f561df86199a429f32f641ce771406e6 +MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58 +MD5 (MesaDemos-3.2.1.tar.bz2) = 621bd95ed9f93467f4dfa615e2f27c16 diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa index 0c4ebf03a0fa..335bb2418f85 100644 --- a/graphics/Mesa3/files/patch-aa +++ b/graphics/Mesa3/files/patch-aa @@ -1,11 +1,11 @@ ---- configure.orig Mon Apr 24 09:53:56 2000 -+++ configure Tue Apr 25 10:51:16 2000 -@@ -817,9 +817,9 @@ +--- configure.orig Thu Jul 20 18:25:10 2000 ++++ configure Thu Aug 24 11:34:45 2000 +@@ -822,9 +822,9 @@ MESA_MAJOR=3 MESA_MINOR=2 - MESA_TINY=0 + MESA_TINY=1 -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 +LIBGL_VERSION=${GLVER}:0 +LIBGLU_VERSION=${GLVER}:0 diff --git a/graphics/Mesa3/files/patch-ad b/graphics/Mesa3/files/patch-ad new file mode 100644 index 000000000000..0fb76eb6fbb1 --- /dev/null +++ b/graphics/Mesa3/files/patch-ad @@ -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: diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist index ae680bbaeacc..375b767a05d5 100644 --- a/graphics/Mesa3/pkg-plist +++ b/graphics/Mesa3/pkg-plist @@ -1,21 +1,21 @@ -etc/mesa.conf -include/GL/gl.h -include/GL/gl_mangle.h +%%XFREE3:%%etc/mesa.conf +%%XFREE3:%%include/GL/gl.h +%%XFREE3:%%include/GL/gl_mangle.h include/GL/glu.h -include/GL/glu_mangle.h +%%XFREE3:%%include/GL/glu_mangle.h include/GL/glut.h -include/GL/glx.h -include/GL/glx_mangle.h -include/GL/osmesa.h -include/GL/xmesa.h -include/GL/xmesa_x.h -include/GL/xmesa_xf86.h -lib/libGL.so -lib/libGL.so.%%GLVER%% +%%XFREE3:%%include/GL/glx.h +%%XFREE3:%%include/GL/glx_mangle.h +%%XFREE3:%%include/GL/osmesa.h +%%XFREE3:%%include/GL/xmesa.h +%%XFREE3:%%include/GL/xmesa_x.h +%%XFREE3:%%include/GL/xmesa_xf86.h +%%XFREE3:%%lib/libGL.so +%%XFREE3:%%lib/libGL.so.%%GLVER%% lib/libGLU.so lib/libGLU.so.%%GLVER%% lib/libMesaGL.so lib/libMesaGLU.so lib/libglut.so lib/libglut.so.%%GLUTVER%% -@dirrm include/GL +%%XFREE3:%%@dirrm include/GL |