summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emulators/linux-pete-mesagpu/Makefile4
-rw-r--r--graphics/linux-ac3d/Makefile4
-rw-r--r--graphics/linux-bmrt/Makefile4
-rw-r--r--graphics/linux_mesa3/Makefile87
-rw-r--r--graphics/linux_mesa3/distinfo6
-rw-r--r--graphics/linux_mesa3/files/patch-aa12
-rw-r--r--graphics/linux_mesa3/pkg-plist48
7 files changed, 48 insertions, 117 deletions
diff --git a/emulators/linux-pete-mesagpu/Makefile b/emulators/linux-pete-mesagpu/Makefile
index 5794a7898ed4..a8ff9c374474 100644
--- a/emulators/linux-pete-mesagpu/Makefile
+++ b/emulators/linux-pete-mesagpu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pete-mesagpu
PORTVERSION= 1.75
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators linux
MASTER_SITES= http://www.pbernert.com/
PKGNAMEPREFIX= linux-
@@ -17,7 +17,7 @@ MAINTAINER= jylefort@brutele.be
COMMENT= A PSEmu Pro GPU plugin using an OpenGL renderer (Linux version)
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
- ${LINUXBASE}/usr/X11R6/lib/libGL.so:${PORTSDIR}/graphics/linux_mesa3
+ ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/graphics/linux_mesa3
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/graphics/linux-ac3d/Makefile b/graphics/linux-ac3d/Makefile
index b8bcb2ad6a41..057ed8feff3a 100644
--- a/graphics/linux-ac3d/Makefile
+++ b/graphics/linux-ac3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ac3d
PORTVERSION= 4.0f
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics linux
MASTER_SITES= http://inivis.swmirror.com/
PKGNAMEPREFIX= linux-
@@ -18,7 +18,7 @@ MAINTAINER= ip@doom.homeunix.org
COMMENT= Easy to use and powerful 3D graphics modeller (trial version)
.ifdef(INSTALL_DYNLINKED_VERSION)
-LIB_DEPENDS= ${LINUXBASE}/usr/X11R6/libGLU.so.1:${PORTSDIR}/graphics/linux_mesa3
+LIB_DEPENDS= ${LINUXBASE}/usr/libGLU.so.1:${PORTSDIR}/graphics/linux_mesa3
.endif
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
diff --git a/graphics/linux-bmrt/Makefile b/graphics/linux-bmrt/Makefile
index 6657e273c294..3a1c0c963f07 100644
--- a/graphics/linux-bmrt/Makefile
+++ b/graphics/linux-bmrt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= linux-bmrt
PORTVERSION= 2.6beta
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics linux
MASTER_SITES= #fetch manually
DISTNAME= BMRT${PORTVERSION}.linux-glibc2
@@ -15,7 +15,7 @@ DISTNAME= BMRT${PORTVERSION}.linux-glibc2
MAINTAINER= rjoseph@mammalia.org
COMMENT= A collection of rendering programs that use the RenderMan interface
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libGL.so:${PORTSDIR}/graphics/linux_mesa3
+RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/graphics/linux_mesa3
USE_LINUX= yes
WRKSRC= ${WRKDIR}/BMRT2.6
diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile
index dce45088e8ec..f993e307793b 100644
--- a/graphics/linux_mesa3/Makefile
+++ b/graphics/linux_mesa3/Makefile
@@ -5,76 +5,27 @@
# $FreeBSD$
#
-PORTNAME= mesa
-PORTVERSION= 3.4.2
-PORTREVISION= 4
-CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-MASTER_SITE_SUBDIR= mesa3d
-PKGNAMEPREFIX= linux_
-DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
- MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER= freebsd-emulation@FreeBSD.org
+PORTNAME= mesa
+PORTVERSION= 3.4.2
+PORTREVISION= 5
+MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/linux/redhat/redhat/updates/7.2/en/os/i386/ \
+ ftp://ftp.uni-kl.de/pub/linux/redhat/redhat/updates/7.2/en/os/i386/ \
+ ftp://ftp.icm.edu.pl/mirrors/ftp.redhat.com/pub/redhat/linux/updates/7.2/en/os/i386/ \
+ ftp://ftp.rediris.es/pub/linux/distributions/redhat/redhat/linux/updates/7.2/en/os/i386/ \
+ ftp://sunsite.cnlab-switch.ch/mirror/redhat/linux/updates/7.2/en/os/i386/ \
+ ftp://ftp.dulug.duke.edu/pub/redhat/linux/updates/7.2/en/os/i386/ \
+ ftp://mirror.sit.wisc.edu/mirrors/linux/distributions/redhat/updates/7.2/en/os/i386/
+CATEGORIES= graphics linux
+
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= A graphics library similar to SGI's OpenGL, used from Linux programs
-USE_BZIP2= yes
-ONLY_FOR_ARCHS= i386
-USE_LINUX_PREFIX= yes
-WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}
-NO_FILTER_SHLIBS= yes
-NO_MTREE= yes
-
-INSTALL= ${LINUXBASE}/usr/bin/install
-
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= #
-CONFIGURE_ARGS+= --x-libraries="${LINUXBASE}/usr/X11R6/lib" \
- --x-includes="${LINUXBASE}/usr/X11R6/include" \
- --libdir="${PREFIX}/usr/X11R6/lib" \
- --includedir="${PREFIX}/usr/X11R6/include"
-CONFIGURE_ENV= PATH="${LINUXBASE}/bin:${LINUXBASE}/usr/bin:${PATH}" \
- GL_MAJOR_VER="${GL_MAJOR_VER}" \
- GL_MINOR_VER="${GL_MINOR_VER}" \
- GLUT_MAJOR_VER="${GLUT_MAJOR_VER}" \
- GLUT_MINOR_VER="${GLUT_MINOR_VER}"
-GL_MAJOR_VER= 1
-GL_MINOR_VER= 3
-GLUT_MAJOR_VER= 3
-GLUT_MINOR_VER= 8
-LIBMESA_MAJOR_VER= 3
-
-MAKE_ENV= PATH=${LINUXBASE}/usr/bin:${PATH}
-STRIP_CMD= ${LINUXBASE}/usr/bin/strip
-
-PLIST_SUB+= GL_MAJOR_VER=${GL_MAJOR_VER} \
- GL_MINOR_VER=${GL_MINOR_VER} \
- GLUT_MAJOR_VER=${GLUT_MAJOR_VER} \
- GLUT_MINOR_VER=${GLUT_MINOR_VER} \
- LIBMESA_MAJOR_VER=${LIBMESA_MAJOR_VER}
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LINUXBASE}/lib/ld-2.1.3.so)
-BUILD_DEPENDS+= ${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base-6 \
- ${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-6
-.elifdef(WITH_LINUX6)
-BUILD_DEPENDS+= ${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base-6 \
- ${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-6
-.else
-BUILD_DEPENDS+= ${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base-8 \
- ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs \
- ${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools
RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-.endif
-post-install:
- ${STRIP_CMD} ${PREFIX}/usr/X11R6/lib/libglut.so.${GLUT_MAJOR_VER}.${GLUT_MINOR_VER}.0
- @for R in GL GLU; do \
- ${STRIP_CMD} ${PREFIX}/usr/X11R6/lib/lib$$R.so.${GL_MAJOR_VER}.${GL_MINOR_VER}.0; \
- ${LN} -s lib$$R.so.${GL_MAJOR_VER} ${PREFIX}/usr/X11R6/lib/libMesa$$R.so.${LIBMESA_MAJOR_VER}; \
- done
- ${LINUXBASE}/sbin/ldconfig
+BASEVERSION=7.2
+ONLY_FOR_ARCHS= i386
+PLIST= ${PKGDIR}/pkg-plist
+MD5_FILE= ${PKGDIR}/distinfo
+RPM_SET= Mesa-3.4.2-10.i386.rpm
-.include <bsd.port.post.mk>
+.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux_mesa3/distinfo b/graphics/linux_mesa3/distinfo
index b756476e3e9c..63efda6f1ccb 100644
--- a/graphics/linux_mesa3/distinfo
+++ b/graphics/linux_mesa3/distinfo
@@ -1,4 +1,2 @@
-MD5 (MesaLib-3.4.2.tar.bz2) = 5bad47f1f86a87b2a35e8c8c33d97e4a
-SIZE (MesaLib-3.4.2.tar.bz2) = 1380805
-MD5 (MesaDemos-3.4.2.tar.bz2) = b3a7b01dae8b1f09f951f9257c242b08
-SIZE (MesaDemos-3.4.2.tar.bz2) = 854130
+MD5 (rpm/Mesa-3.4.2-10.i386.rpm) = 4cdcb07cbaedd2ab1205b64931f3dd5b
+SIZE (rpm/Mesa-3.4.2-10.i386.rpm) = 876154
diff --git a/graphics/linux_mesa3/files/patch-aa b/graphics/linux_mesa3/files/patch-aa
deleted file mode 100644
index 18adc1a85c27..000000000000
--- a/graphics/linux_mesa3/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig Fri May 18 10:51:10 2001
-+++ configure Fri May 18 10:52:30 2001
-@@ -823,9 +823,9 @@
- MESA_MAJOR=3
- MESA_MINOR=4
- MESA_TINY=2
--LIBGL_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=${GL_MAJOR_VER}:${GL_MINOR_VER}
-+LIBGLU_VERSION=${GL_MAJOR_VER}:${GL_MINOR_VER}
-+LIBGLUT_VERSION=${GLUT_MAJOR_VER}:${GLUT_MINOR_VER}
diff --git a/graphics/linux_mesa3/pkg-plist b/graphics/linux_mesa3/pkg-plist
index 2cfb560e8c2a..5d40c7a04e5c 100644
--- a/graphics/linux_mesa3/pkg-plist
+++ b/graphics/linux_mesa3/pkg-plist
@@ -1,28 +1,22 @@
-usr/X11R6/lib/libGL.so.%%GL_MAJOR_VER%%.%%GL_MINOR_VER%%.0
-usr/X11R6/lib/libGL.so.%%GL_MAJOR_VER%%
-usr/X11R6/lib/libGL.la
-usr/X11R6/lib/libGLU.so.%%GL_MAJOR_VER%%.%%GL_MINOR_VER%%.0
-usr/X11R6/lib/libGLU.so.%%GL_MAJOR_VER%%
-usr/X11R6/lib/libGLU.la
-usr/X11R6/lib/libglut.so.%%GLUT_MAJOR_VER%%.%%GLUT_MINOR_VER%%.0
-usr/X11R6/lib/libglut.so.%%GLUT_MAJOR_VER%%
-usr/X11R6/lib/libglut.so
-usr/X11R6/lib/libglut.la
-usr/X11R6/lib/libMesaGL.so.%%LIBMESA_MAJOR_VER%%
-usr/X11R6/lib/libMesaGL.so
-usr/X11R6/lib/libMesaGLU.so.%%LIBMESA_MAJOR_VER%%
-usr/X11R6/lib/libMesaGLU.so
etc/mesa.conf
-usr/X11R6/include/GL/gl.h
-usr/X11R6/include/GL/glext.h
-usr/X11R6/include/GL/gl_mangle.h
-usr/X11R6/include/GL/glu.h
-usr/X11R6/include/GL/glu_mangle.h
-usr/X11R6/include/GL/osmesa.h
-usr/X11R6/include/GL/glx.h
-usr/X11R6/include/GL/glx_mangle.h
-usr/X11R6/include/GL/xmesa.h
-usr/X11R6/include/GL/xmesa_x.h
-usr/X11R6/include/GL/xmesa_xf86.h
-usr/X11R6/include/GL/glut.h
-@dirrm usr/X11R6/include/GL
+usr/lib/libGL.so.1
+usr/lib/libGL.so.1.2.030402
+usr/lib/libGLU.so.1
+usr/lib/libGLU.so.1.1.030402
+usr/lib/libglut.so.3
+usr/lib/libglut.so.3.7.0
+usr/share/doc/Mesa-3.4.2/CONFIG
+usr/share/doc/Mesa-3.4.2/CONFORM
+usr/share/doc/Mesa-3.4.2/COPYRIGHT
+usr/share/doc/Mesa-3.4.2/README
+usr/share/doc/Mesa-3.4.2/README.MITS
+usr/share/doc/Mesa-3.4.2/README.X11
+usr/share/doc/Mesa-3.4.2/RELNOTES-3.1
+usr/share/doc/Mesa-3.4.2/RELNOTES-3.2
+usr/share/doc/Mesa-3.4.2/RELNOTES-3.2.1
+usr/share/doc/Mesa-3.4.2/RELNOTES-3.3
+usr/share/doc/Mesa-3.4.2/RELNOTES-3.4
+usr/share/doc/Mesa-3.4.2/RELNOTES-3.4.1
+usr/share/doc/Mesa-3.4.2/RELNOTES-3.4.2
+usr/share/doc/Mesa-3.4.2/VERSIONS
+@dirrm usr/share/doc/Mesa-3.4.2