summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Coin/Makefile2
-rw-r--r--graphics/clutter/Makefile7
-rw-r--r--graphics/dri/Makefile35
-rw-r--r--graphics/dri/distinfo6
-rw-r--r--graphics/dri/files/patch-sis_context.h14
-rw-r--r--graphics/dri/pkg-plist16
-rw-r--r--graphics/driconf/Makefile4
-rw-r--r--graphics/dynamechs/Makefile2
-rw-r--r--graphics/enblend/Makefile1
-rw-r--r--graphics/f90gl/Makefile2
-rw-r--r--graphics/ffff/Makefile2
-rw-r--r--graphics/flashplayer/Makefile2
-rw-r--r--graphics/fpc-opengl/Makefile2
-rw-r--r--graphics/fv/Makefile1
-rw-r--r--graphics/gauche-gl/Makefile1
-rw-r--r--graphics/geomview/Makefile1
-rw-r--r--graphics/gle/Makefile2
-rw-r--r--graphics/glean/Makefile4
-rw-r--r--graphics/glexcess/Makefile2
-rw-r--r--graphics/glitz/Makefile3
-rw-r--r--graphics/gltk/Makefile5
-rw-r--r--graphics/gltt/Makefile2
-rw-r--r--graphics/ivtools/Makefile1
-rw-r--r--graphics/jasper/Makefile2
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/kdegraphics4/Makefile1
-rw-r--r--graphics/landscape/Makefile4
-rw-r--r--graphics/lib3ds/Makefile1
-rw-r--r--graphics/libGL/Makefile12
-rw-r--r--graphics/libGL/bsd.mesalib.mk111
-rw-r--r--graphics/libGL/distinfo6
-rw-r--r--graphics/libGL/pkg-plist19
-rw-r--r--graphics/libGLU/Makefile9
-rw-r--r--graphics/libGLU/distinfo6
-rw-r--r--graphics/libGLU/pkg-plist2
-rw-r--r--graphics/libGLw/Makefile9
-rw-r--r--graphics/libGLw/distinfo6
-rw-r--r--graphics/libGLw/files/patch-glw-GLwDrawA.c11
-rw-r--r--graphics/libGLw/pkg-plist2
-rw-r--r--graphics/libaux/Makefile5
-rw-r--r--graphics/libdrm/Makefile7
-rw-r--r--graphics/libdrm/distinfo6
-rw-r--r--graphics/libdrm/pkg-plist8
-rw-r--r--graphics/libglut/Makefile17
-rw-r--r--graphics/libglut/distinfo9
-rw-r--r--graphics/libglut/pkg-plist5
-rw-r--r--graphics/libv3d/Makefile5
-rw-r--r--graphics/libwpcg/Makefile2
-rw-r--r--graphics/makehuman/Makefile2
-rw-r--r--graphics/mesa-demos/Makefile93
-rw-r--r--graphics/mesa-demos/distinfo12
-rw-r--r--graphics/mesa-demos/pkg-plist92
-rw-r--r--graphics/mhgui/Makefile6
-rw-r--r--graphics/morpheus/Makefile2
-rw-r--r--graphics/mxp/Makefile2
-rw-r--r--graphics/ocaml-lablgl/Makefile2
-rw-r--r--graphics/ogre3d/Makefile2
-rw-r--r--graphics/pixmap/Makefile2
-rw-r--r--graphics/py-opengl/Makefile4
-rw-r--r--graphics/pyro/Makefile2
-rw-r--r--graphics/quat-gui/Makefile2
-rw-r--r--graphics/quesa/Makefile6
-rw-r--r--graphics/renderpark/Makefile2
-rw-r--r--graphics/ruby-opengl/Makefile2
-rw-r--r--graphics/sced/Makefile2
-rw-r--r--graphics/tiff/Makefile2
-rw-r--r--graphics/togl/Makefile2
-rw-r--r--graphics/tulip/Makefile1
-rw-r--r--graphics/view3ds/Makefile2
-rw-r--r--graphics/visionegg/Makefile5
-rw-r--r--graphics/vvv/Makefile2
-rw-r--r--graphics/white_dune/Makefile1
-rw-r--r--graphics/wildmagic/Makefile1
-rw-r--r--graphics/xbmbrowser/Makefile2
-rw-r--r--graphics/xmms-dancingparticles/Makefile5
-rw-r--r--graphics/xmms-fishmatic/Makefile2
-rw-r--r--graphics/xmms-paranormal/Makefile6
-rw-r--r--graphics/xmms-scivi/Makefile3
-rw-r--r--graphics/xmorph/Makefile2
79 files changed, 359 insertions, 298 deletions
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index d8bf2ff8941f..adf48cd8fd3a 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Coin
PORTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \
ftp://ftp.coin3d.org/pub/coin/src/all/
@@ -18,6 +19,7 @@ LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
simage.26:${PORTSDIR}/graphics/simage
USE_GL= yes
+USE_XORG= xt x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pthread=yes --enable-threadsafe \
--enable-3ds-import --enable-sound \
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index a9ae51b27a9b..26097977513d 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -7,19 +7,20 @@
PORTNAME= clutter
PORTVERSION= 0.8.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
MAINTAINER= gnome@FreeBSD.org
COMMENT= OpenGL based interactive canvas library
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \
- json-glib-1.0:${PORTSDIR}/devel/json-glib
+LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= pkgconfig gtk20 gnomehack ltverhack gnomeprefix
-USE_XORG= xp x11
+USE_GL= gl
+USE_XORG= glproto x11 xfixes xdamage xcomposite xi
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-x --with-json=check
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 4923b70ec1f5..a0d4dde75dd7 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -7,7 +7,6 @@
PORTNAME= dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics
@@ -19,40 +18,10 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
CONFLICTS= dri-6.2.2005* dri-6.5.2006*
-MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \
- FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
- PTHREAD_LIBS=${PTHREAD_LIBS}
-
-USE_XORG= x11
-
-DRIMODDIR= ${PREFIX}/lib/dri
-SRCDIR= mesa
-
-.if !defined(ARCH)
-ARCH!= uname -p
-.endif
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes
do-install:
- ${MKDIR} ${DRIMODDIR}
-.if ${ARCH} == i386
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
-.elif ${ARCH} == amd64
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR}
-.endif
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
+ cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-
.include <bsd.port.mk>
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index c5fcdf9d65c2..da68c3af0e8a 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e
-SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
-SIZE (MesaLib-7.0.3.tar.bz2) = 3389327
+MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
+SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
+SIZE (MesaLib-7.2.tar.bz2) = 3341919
diff --git a/graphics/dri/files/patch-sis_context.h b/graphics/dri/files/patch-sis_context.h
index 1d79d5f32263..3152e2db0f7d 100644
--- a/graphics/dri/files/patch-sis_context.h
+++ b/graphics/dri/files/patch-sis_context.h
@@ -1,16 +1,16 @@
---- src/mesa/drivers/dri/sis/sis_context.h.orig Tue Apr 11 13:41:11 2006
-+++ src/mesa/drivers/dri/sis/sis_context.h Wed Dec 20 18:32:46 2006
-@@ -401,8 +401,20 @@
+--- src/mesa/drivers/dri/sis/sis_context.h.orig 2008-09-22 13:38:53.000000000 +0100
++++ src/mesa/drivers/dri/sis/sis_context.h 2008-09-22 13:40:51.000000000 +0100
+@@ -401,10 +401,20 @@
#define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
#define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
--#if defined(__i386__) || defined(__amd64__)
+-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__alpha__)
+#define MMIO_WMB() __asm __volatile("wmb" : : : "memory")
-+#elif defined(__amd64__) || defined(__i386__)
++#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
#define MMIO_WMB() __asm __volatile("" : : : "memory")
-+#elif defined(__ia64__)
-+#define MMIO_WMB() __asm __volatile("mf" : : : "memory")
+ #elif defined(__ia64__)
+ #define MMIO_WMB() __asm __volatile("mf" : : : "memory")
+#elif defined(__powerpc__)
+#define MMIO_WMB() __asm __volatile("eieio" : : : "memory")
+#elif defined(__sparc64__)
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 10f31ec1d29e..5da5f31f5dad 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,6 +1,8 @@
-%%I386%%lib/dri/i810_dri.so
-%%I386_AMD64%%lib/dri/i915_dri.so
-%%I386_AMD64%%lib/dri/i965_dri.so
+include/GL/internal/dri_interface.h
+include/GL/internal/dri_sarea.h
+lib/dri/i810_dri.so
+lib/dri/i915_dri.so
+lib/dri/i965_dri.so
lib/dri/mach64_dri.so
lib/dri/mga_dri.so
lib/dri/r128_dri.so
@@ -9,6 +11,10 @@ lib/dri/r300_dri.so
lib/dri/radeon_dri.so
lib/dri/savage_dri.so
lib/dri/sis_dri.so
-%%I386%%lib/dri/tdfx_dri.so
-%%I386%%lib/dri/unichrome_dri.so
+lib/dri/swrast_dri.so
+lib/dri/tdfx_dri.so
+lib/dri/unichrome_dri.so
+libdata/pkgconfig/dri.pc
@dirrm lib/dri
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index c20483c78282..729cb88cf606 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -7,16 +7,16 @@
PORTNAME= driconf
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://people.freedesktop.org/~fxkuehl/driconf/
MAINTAINER= ports@FreeBSD.org
COMMENT= Configuration program for DRI drivers
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+USE_GL= glut
USE_PYTHON= yes
NO_BUILD= yes
USE_GETTEXT= yes
diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index b4b0e4148769..bd3e16e3d741 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dynamechs
PORTVERSION= 4.0.p1
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 295e4edfb7c1..66616bd12d30 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enblend
PORTVERSION= 3.1.r20080615
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= vd/enblend
diff --git a/graphics/f90gl/Makefile b/graphics/f90gl/Makefile
index 74801fae0bab..0338cfb3bb27 100644
--- a/graphics/f90gl/Makefile
+++ b/graphics/f90gl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= f90gl
PORTVERSION= 1.2.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://math.nist.gov/f90gl/ \
http://math.nist.gov/~WMitchell/papers/:doc
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index d53c02dd6c17..5e57e8644767 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ffff
PORTVERSION= 323
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SFE
DISTNAME= FFFF${PORTVERSION}-src
diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
index 5f08d37d39f5..f9fc41f82aa0 100644
--- a/graphics/flashplayer/Makefile
+++ b/graphics/flashplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flashplayer
PORTVERSION= 0.4.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/gplflash
DISTNAME= gplflash-${PORTVERSION}
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index ee2b81495ef9..cbead3c8c2ff 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -opengl
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index fd8ab4d7e78c..f97a57f0d144 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fv
PORTVERSION= 1.02
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.eaflux.com/fv/sources/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 47b7fd1d13b8..20e9b4c4f706 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gl
PORTVERSION= 0.4.4
+PORTREVISION= 1
CATEGORIES= graphics scheme
MASTER_SITES= SF
PKGNAMEPREFIX= gauche-
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index e1d91044cbd0..4a4c670979c0 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= geomview
PORTVERSION= 1.9.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index dcdba2a0d267..cc2f7cb366e7 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gle
PORTVERSION= 3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF\
http://linas.org/gle/pub/ \
diff --git a/graphics/glean/Makefile b/graphics/glean/Makefile
index 41f4fd4b8cf2..9c7111884a15 100644
--- a/graphics/glean/Makefile
+++ b/graphics/glean/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glean
PORTVERSION= 1.0.20030925
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics benchmarks
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= anholt
@@ -22,7 +22,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
PLIST_FILES= bin/glean
WRKSRC= ${WRKDIR}/glean/src
USE_BZIP2= yes
-USE_GL= yes
+USE_GL= glut
USE_GMAKE= yes
MAKE_ENV+= GLEAN_ROOT="${WRKDIR}/glean"
ALL_TARGET= install
diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile
index 62751a9c98ec..be826cb435c2 100644
--- a/graphics/glexcess/Makefile
+++ b/graphics/glexcess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glexcess
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.glexcess.com/files/
DISTNAME= ${PORTNAME}
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index d03b9af101ea..0eea8f3c2873 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -8,7 +8,7 @@
PORTNAME= glitz
PORTVERSION= 0.5.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
@@ -16,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= OpenGL image compositing library
USE_GL= yes
+USE_XORG= xt
USE_GNOME= pkgconfig gnometarget gnomehack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/gltk/Makefile b/graphics/gltk/Makefile
index 84fed5eb8141..df65a8ec9f58 100644
--- a/graphics/gltk/Makefile
+++ b/graphics/gltk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gltk
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.sgi.com/opengl/contrib/ \
ftp://ftp.u-aizu.ac.jp/pub/os/sgi/misc/ftp.sgi.com/pub/opengl/contrib/
@@ -17,8 +17,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= An OpenGL/Tk interface
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
+USE_GL= glut
USE_IMAKE= yes
do-install:
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index 5e4d2d8da76e..8ed8347696f7 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gltt
PORTVERSION= 2.5.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://gltt.sourceforge.net/download/
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index dfc16e1fad46..76cb2fe51e22 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ivtools
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index c09c2352bf64..bffe13a42962 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jasper
PORTVERSION= 1.900.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \
${MASTER_SITE_IMAGEMAGICK}
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index eb52337507da..f96ffa253dbc 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdegraphics
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -22,7 +22,6 @@ LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
freetype:${PORTSDIR}/print/freetype2 \
fribidi:${PORTSDIR}/converters/fribidi \
- glut:${PORTSDIR}/graphics/libglut \
lcms:${PORTSDIR}/graphics/lcms \
paper:${PORTSDIR}/print/libpaper \
poppler-qt:${PORTSDIR}/graphics/poppler-qt
@@ -32,6 +31,7 @@ CONFLICTS= kolourpaint-[0-9]*
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
+USE_GL= glut
USE_BZIP2= yes
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index b11e999eb26f..a23cc2066aa2 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdegraphics
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/graphics/landscape/Makefile b/graphics/landscape/Makefile
index 625c332e5327..2faa8a8ff7f5 100644
--- a/graphics/landscape/Makefile
+++ b/graphics/landscape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= landscape
PORTVERSION= 0.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics kde
MASTER_SITES= http://www.witchspace.com/files/
@@ -15,8 +15,8 @@ MAINTAINER= jon@witchspace.com
COMMENT= A program for generating and rendering fractal landscapes
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
+USE_GL= glut
PLIST_FILES= bin/landscape
USE_KDELIBS_VER= 3
QTDIR?= ${QT_PREFIX}
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 8b4309a710c9..46dbd2e2e813 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lib3ds
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 78b5f0208d4a..2caa24c4735e 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -12,14 +12,14 @@ CATEGORIES= graphics
COMMENT= OpenGL library that renders using GLX or DRI
BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend
-LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \
+ expat.6:${PORTSDIR}/textproc/expat2
-USE_XORG= glproto xxf86vm xext xfixes xdamage
-CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/drm
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes
-SRCDIR= glx/x11
-HEADERS= gl.h glext.h glx.h glxext.h
-HEADERSDIR= include/GL
+do-install:
+ ${RM} ${WRKSRC}/include/GL/glu*.h
+ cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.mk>
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 78245755aa90..e4860d4e1766 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -17,75 +17,90 @@
# $FreeBSD$
#
-MESAVERSION= 7.0.3
+MESAVERSION= 7.2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
MASTER_SITE_SUBDIR= mesa3d
-DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES= MesaLib-${MESAVERSION}${EXTRACT_SUFX}
MAINTAINER= x11@FreeBSD.org
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
-MAKE_ARGS= SHELL=${SH}
-CFLAGS+= -DUSE_XSHM -DHZ=100
+CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
-PREFIX= ${LOCALBASE}
-FILESDIR= ${.CURDIR}/../../graphics/libGL/files
-WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}
-CONFDIR= ${WRKSRC}/configs
+ALL_TARGET= default
-SHVER?= 1
+#MAKE_ARGS= SHELL=${SH}
+#CFLAGS+= -DUSE_XSHM -DHZ=100
+
+#FILESDIR= ${.CURDIR}/../../graphics/libGL/files
+WRKSRC= ${WRKDIR}/Mesa-${MESAVERSION}
.if !defined(ARCH)
ARCH!= uname -p
.endif
-.if ${ARCH} == i386
-PLIST_SUB+= I386=""
-PLIST_SUB+= I386_AMD64=""
-ALL_TARGET= freebsd-dri-x86
-.elif ${ARCH} == amd64
-PLIST_SUB+= I386="@comment "
-PLIST_SUB+= I386_AMD64=""
-ALL_TARGET= freebsd-dri-amd64
+.if ${ARCH} == alpha
+FAST_MATH=
.else
-PLIST_SUB+= I386="@comment "
-PLIST_SUB+= I386_AMD64="@comment "
-ALL_TARGET= freebsd-dri
+FAST_MATH= -ffast-math
.endif
-.if ${ARCH} == alpha
-FAST_MATH=
+COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//}
+
+.if ${COMPONENT:Mglut} == ""
+. if ${COMPONENT:Mglu} == ""
+CONFIGURE_ARGS+= --disable-glu --disable-glut
+. else
+CONFIGURE_ARGS+= --disable-glut
+. endif
.else
-FAST_MATH= -ffast-math
+DISTFILES+= MesaGLUT-${MESAVERSION}${EXTRACT_SUFX}
.endif
-pre-patch:
- @${REINPLACE_CMD} \
- -e '/^CC =/d' -e '/^CXX =/d' \
- -e 's|/usr/X11R6|${LOCALBASE}|g' \
- -e 's|/usr/local|${LOCALBASE}|g' \
- -e 's|-lpthread|${PTHREAD_LIBS}|g' \
- -e 's|-ffast-math|${FAST_MATH}|g' \
- -e 's|CFLAGS = |CFLAGS = ${CFLAGS} |g' \
- -e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \
- -e "s|SRC_DIRS = .*|SRC_DIRS = ${SRCDIR}|g" \
- -e 's|-DHAVE_POSIX_MEMALIGN||' \
- ${CONFDIR}/freebsd-dri
- @${REINPLACE_CMD} \
- -e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${LOCALBASE}/include|' \
- -e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${LOCALBASE}/lib|' \
- -e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${LOCALBASE}/lib/dri|' \
- ${CONFDIR}/default
+.if ${COMPONENT:Mglw} == ""
+CONFIGURE_ARGS+= --disable-glw
+.else
+CONFIGURE_ARGS+= --enable-motif
+.endif
-.if !target(do-install)
-do-install:
- ${MKDIR} ${PREFIX}/include/GL/
-.for i in ${HEADERS}
- ${INSTALL_DATA} ${WRKSRC}/${HEADERSDIR}/${i} ${PREFIX}/include/GL/
-.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/${PORTNAME}.so.${SHVER} ${PREFIX}/lib
- ${LN} -sf ${PORTNAME}.so.${SHVER} ${PREFIX}/lib/${PORTNAME}.so
+.if ${COMPONENT:Mdemos} == ""
+CONFIGURE_ARGS+= --with-demos=no
+.else
+DISTFILES+= MesaDemos-${MESAVERSION}${EXTRACT_SUFX}
+CONFIGURE_ARGS+= --with-demos=demos,xdemos
+.endif
+
+.if ${COMPONENT:Mdri} == ""
+CONFIGURE_ARGS+= --with-dri-drivers=no
+.endif
+
+.if defined(WITHOUT_XCB)
+CONFIGURE_ARGS+= --disable-xcb
+.else
+CONFIGURE_ARGS+= --enable-xcb
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+ ${WRKSRC}/src/glu/Makefile \
+ ${WRKSRC}/src/glw/Makefile \
+ ${WRKSRC}/src/mesa/Makefile \
+ ${WRKSRC}/src/mesa/drivers/dri/Makefile
+.if ${COMPONENT:Mglut} != ""
+ @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+ ${WRKSRC}/src/glut/glx/Makefile
+.endif
+.if ${COMPONENT:Mdemos} != ""
+ @${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
+ -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
+ -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
+ -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
+ ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
.endif
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index c5fcdf9d65c2..da68c3af0e8a 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e
-SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
-SIZE (MesaLib-7.0.3.tar.bz2) = 3389327
+MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
+SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
+SIZE (MesaLib-7.2.tar.bz2) = 3341919
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
index f3fd7c6a6ea7..e3ab0eb7c6be 100644
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@@ -1,7 +1,26 @@
+include/GL/amesa.h
+include/GL/dmesa.h
+include/GL/fxmesa.h
+include/GL/ggimesa.h
+include/GL/gl_mangle.h
include/GL/gl.h
include/GL/glext.h
+include/GL/glfbdev.h
+include/GL/glx_mangle.h
include/GL/glx.h
include/GL/glxext.h
+include/GL/mesa_wgl.h
+include/GL/mglmesa.h
+include/GL/osmesa.h
+include/GL/svgamesa.h
+include/GL/uglglutshapes.h
+include/GL/uglmesa.h
+include/GL/vms_x_fix.h
+include/GL/wmesa.h
+include/GL/xmesa.h
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
lib/libGL.so
lib/libGL.so.1
+libdata/pkgconfig/gl.pc
@dirrmtry include/GL
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index e808d6ac3e3e..dace0ab723c7 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -12,11 +12,12 @@ CATEGORIES= graphics
COMMENT= OpenGL utility library
USE_GL= gl
-USE_XORG= xmu xi
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes
-SRCDIR= glu/sgi
-HEADERS= glu.h
-HEADERSDIR= include/GL
+do-install:
+ cd ${WRKSRC}/src/glu; ${GMAKE} install
+ ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
+ cd ${WRKSRC}/src/glu; ${GMAKE} install
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.mk>
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index c5fcdf9d65c2..da68c3af0e8a 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e
-SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
-SIZE (MesaLib-7.0.3.tar.bz2) = 3389327
+MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
+SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
+SIZE (MesaLib-7.2.tar.bz2) = 3341919
diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist
index addb2a1722dc..330c54e13885 100644
--- a/graphics/libGLU/pkg-plist
+++ b/graphics/libGLU/pkg-plist
@@ -1,3 +1,5 @@
include/GL/glu.h
+include/GL/glu_mangle.h
lib/libGLU.so
lib/libGLU.so.1
+libdata/pkgconfig/glu.pc
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index 691d6bb4a341..b08d22647935 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -15,13 +15,10 @@ BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend
LIB_DEPENDS+= Xm.3:${PORTSDIR}/x11-toolkits/open-motif
USE_GL= gl
-USE_XORG= xt
+USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes
-CFLAGS+= -D__GLX_MOTIF=1
-SRCDIR= glw
-
-HEADERS= GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h
-HEADERSDIR= src/glw
+do-install:
+ cd ${WRKSRC}/src/glw; ${GMAKE} install
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.mk>
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
index c5fcdf9d65c2..da68c3af0e8a 100644
--- a/graphics/libGLw/distinfo
+++ b/graphics/libGLw/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e
-SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
-SIZE (MesaLib-7.0.3.tar.bz2) = 3389327
+MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
+SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
+SIZE (MesaLib-7.2.tar.bz2) = 3341919
diff --git a/graphics/libGLw/files/patch-glw-GLwDrawA.c b/graphics/libGLw/files/patch-glw-GLwDrawA.c
deleted file mode 100644
index fac6f15b4823..000000000000
--- a/graphics/libGLw/files/patch-glw-GLwDrawA.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/glw/GLwDrawA.c.orig Tue Mar 13 21:11:41 2007
-+++ src/glw/GLwDrawA.c Tue Mar 13 21:12:38 2007
-@@ -668,7 +668,7 @@
- #endif
-
-
--#ifndef __GLX_MOTIF
-+#ifdef __GLX_MOTIF
-
- /* Make context current */
- void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx){
diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist
index a3105d8fd45f..211b58674677 100644
--- a/graphics/libGLw/pkg-plist
+++ b/graphics/libGLw/pkg-plist
@@ -4,3 +4,5 @@ include/GL/GLwMDrawA.h
include/GL/GLwMDrawAP.h
lib/libGLw.so
lib/libGLw.so.1
+libdata/pkgconfig/glw.pc
+@dirrmtry include/GL
diff --git a/graphics/libaux/Makefile b/graphics/libaux/Makefile
index f7dbfac48e51..b6be89de1dd0 100644
--- a/graphics/libaux/Makefile
+++ b/graphics/libaux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libaux
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/
DISTFILES= libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}
@@ -15,10 +15,9 @@ DISTFILES= libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Nano Window Toolkit and Auxiliary Library for OpenGL
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
WRKSRC= ${WRKDIR}/${PORTNAME}
+USE_GL= glut
USE_IMAKE= yes
do-install:
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 8d66b0357aac..42c700bcdef6 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -6,19 +6,22 @@
#
PORTNAME= libdrm
-PORTVERSION= 2.3.1
+PORTVERSION= 2.4.3
CATEGORIES= graphics x11
MASTER_SITES= http://dri.freedesktop.org/libdrm/
MAINTAINER= x11@FreeBSD.org
COMMENT= Userspace interface to kernel Direct Rendering Module services
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
pre-patch:
- ${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
+ @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 985728ce3a8f..0ebb35f8ef91 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdrm-2.3.1.tar.bz2) = 620fe7dd02c3236c3e9881a3a238173d
-SHA256 (libdrm-2.3.1.tar.bz2) = ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c
-SIZE (libdrm-2.3.1.tar.bz2) = 306013
+MD5 (libdrm-2.4.3.tar.bz2) = 8a4a46eb3dfcccc70af64b5ea240e71f
+SHA256 (libdrm-2.4.3.tar.bz2) = f884594f29df157e11aabbc8574972c9132dd85edfc0f6de30a4311c2f36c409
+SIZE (libdrm-2.4.3.tar.bz2) = 340298
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 4e76f5cc5923..cc5bd8425d37 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -1,8 +1,10 @@
include/drm/drm.h
+include/drm/drm_mode.h
include/drm/drm_sarea.h
include/drm/i915_drm.h
include/drm/mach64_drm.h
include/drm/mga_drm.h
+include/drm/nouveau_drm.h
include/drm/r128_drm.h
include/drm/r300_reg.h
include/drm/radeon_drm.h
@@ -10,9 +12,15 @@ include/drm/savage_drm.h
include/drm/sis_drm.h
include/drm/via_3d_reg.h
include/drm/via_drm.h
+include/drm/xgi_drm.h
+include/intel_bufmgr.h
include/xf86drm.h
+include/xf86drmMode.h
lib/libdrm.la
lib/libdrm.so
lib/libdrm.so.2
+lib/libdrm_intel.la
+lib/libdrm_intel.so
+lib/libdrm_intel.so.1
libdata/pkgconfig/libdrm.pc
@dirrm include/drm
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
index 1a045801d818..e56f68625fe2 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -6,25 +6,18 @@
#
PORTNAME= libglut
-PORTVERSION= 7.0.3
+PORTVERSION= ${MESAVERSION}
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mesa3d
-DISTNAME= MesaGLUT-${PORTVERSION}
MAINTAINER= shaun@FreeBSD.org
COMMENT= OpenGL utility toolkit
-USE_BZIP2= yes
USE_LDCONFIG= yes
USE_GL= glu
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu
-WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/src/glut/glx
-
-pre-patch:
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}/
-
-pre-install:
- @${MKDIR} ${PREFIX}/include/GL
+do-install:
+ cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.mk>
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
index 21ac8e0ba807..799cf9fc2dbe 100644
--- a/graphics/libglut/distinfo
+++ b/graphics/libglut/distinfo
@@ -1,3 +1,6 @@
-MD5 (MesaGLUT-7.0.3.tar.bz2) = 0ff23c4e91b238abae63a5fc9fa003e7
-SHA256 (MesaGLUT-7.0.3.tar.bz2) = edb40aec6c5af1b59a6cac05e7e93040c74500818681d288c89b5c5d56a45cae
-SIZE (MesaGLUT-7.0.3.tar.bz2) = 329421
+MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
+SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
+SIZE (MesaLib-7.2.tar.bz2) = 3341919
+MD5 (MesaGLUT-7.2.tar.bz2) = f67daf93e12c4a459703bbf3e4004e31
+SHA256 (MesaGLUT-7.2.tar.bz2) = 33c51e5f0971c0da568c13b6a7f68d77ef3e0b0ec5c5758f8198ef37320daafe
+SIZE (MesaGLUT-7.2.tar.bz2) = 327717
diff --git a/graphics/libglut/pkg-plist b/graphics/libglut/pkg-plist
index bd3da1fab8b1..27f711bdc740 100644
--- a/graphics/libglut/pkg-plist
+++ b/graphics/libglut/pkg-plist
@@ -1,6 +1,5 @@
include/GL/glut.h
-include/GL/glutf90.h
-lib/libglut.a
lib/libglut.so
-lib/libglut.so.4
+lib/libglut.so.3
+libdata/pkgconfig/glut.pc
@dirrmtry include/GL
diff --git a/graphics/libv3d/Makefile b/graphics/libv3d/Makefile
index 8edbc87d4803..d6b589ea674f 100644
--- a/graphics/libv3d/Makefile
+++ b/graphics/libv3d/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libv3d
PORTVERSION= 0.1.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://wolfpack.twu.net/users/wolfpack/
EXTRACT_SUFX= .tgz
@@ -16,8 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= V3D IO Library
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
+USE_GL= glut
HAS_CONFIGURE= yes
CONFIGURE_ARGS= UNIX --prefix=${PREFIX}
USE_GMAKE= yes
diff --git a/graphics/libwpcg/Makefile b/graphics/libwpcg/Makefile
index 45ac3a23eba3..ef60c9788d8f 100644
--- a/graphics/libwpcg/Makefile
+++ b/graphics/libwpcg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libwpcg
PORTVERSION= 0.9.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.paassen.tmfweb.nl/
DISTNAME= libWPCG-${PORTVERSION}
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index b5b527b45a5b..0b24d16e3d87 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= makehuman
DISTVERSION= 0.9.1-rc1a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 203bdc13ec1b..518a4261e661 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -6,88 +6,39 @@
#
PORTNAME= demos
-PORTVERSION= 7.0.4
+PORTVERSION= ${MESAVERSION}
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mesa3d
PKGNAMEPREFIX= mesa-
-DISTFILES= MesaDemos-${PORTVERSION}${EXTRACT_SUFX} \
- MesaLib-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= araujo@FreeBSD.org
COMMENT= OpenGL demos distributed with Mesa
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
+USE_GL= glu glut
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes
-USE_BZIP2= yes
-USE_GMAKE= yes
-MAKE_ARGS= SHELL=${SH} \
- SUBDIRS="progs/demos progs/xdemos"
-MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
-ALL_TARGET= default
-WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}
-DATADIR= ${PREFIX}/share/mesa-demos
-
-DEMO_PROGS= arbfplight arbfslight arbocclude bounce clearspd cubemap \
- drawpix engine fire fogcoord fplight fslight gamma gearbox \
- gears geartrain glinfo gloss glslnoise gltestperf glutfx \
- ipers isosurf lodbias morph3d multiarb paltex pointblast \
- ray readpix reflect renormal shadowtex singlebuffer spectex \
- spriteblast stex3d streaming_rect teapot terrain tessdemo \
- texcyl texdown texenv texobj trispd tunnel tunnel2 vao_demo \
- winpos
-
-DEMO_IMAGES= arch.rgb bw.rgb girl.rgb girl2.rgb reflect.rgb s128.rgb \
- tile.rgb tree2.rgba tree3.rgb wrs_logo.rgb
-DEMO_DATA= geartrain.dat isosurf.dat terrain.dat
-
-XDEMO_PROGS= glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
- glxheads glxinfo glxpbdemo glxpixmap glxswapcontrol manywin \
- offset overlay pbdemo pbinfo wincopy xfont xrotfontdemo
-
-# Generate packing list
-PLIST_FILES=
-.for prog in ${DEMO_PROGS}
-PLIST_FILES+= bin/${prog}
-.endfor
-.for prog in ${XDEMO_PROGS}
-PLIST_FILES+= bin/${prog}
-.endfor
-.for img in ${DEMO_IMAGES}
-PLIST_FILES+= %%DATADIR%%/images/${img}
-.endfor
-.for dat in ${DEMO_DATA}
-PLIST_FILES+= %%DATADIR%%/data/${dat}
-.endfor
-PLIST_DIRS= %%DATADIR%%/images %%DATADIR%%/data %%DATADIR%%
-
-post-extract:
- ${CP} ${FILESDIR}/config ${WRKSRC}/configs/current
- ${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
- -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
- -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
- -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
- ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
+DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
do-install:
- @for prog in ${DEMO_PROGS}; do \
- ${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \
- ${PREFIX}/bin ; \
- done
- @for prog in ${XDEMO_PROGS}; do \
- ${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/$$prog \
- ${PREFIX}/bin ; \
+ @for i in demos xdemos; do \
+ cd ${WRKSRC}/progs/$$i; \
+ for j in `${MAKE} -V PROGS`; do \
+ echo ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+ ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+ done; \
done
${MKDIR} ${DATADIR}/images ${DATADIR}/data
- @for img in ${DEMO_IMAGES}; do \
- ${INSTALL_DATA} ${WRKSRC}/progs/images/$$img \
- ${DATADIR}/images ; \
- done
- @for dat in ${DEMO_DATA}; do \
- ${INSTALL_DATA} ${WRKSRC}/progs/demos/$$dat ${DATADIR}/data ; \
- done
-
+ @cd ${WRKSRC}/progs/images; \
+ for i in `ls *.rgb*`; do \
+ echo ${INSTALL_DATA} $$i ${DATADIR}/images; \
+ ${INSTALL_DATA} $$i ${DATADIR}/images; \
+ done
+ @cd ${WRKSRC}/progs/demos; \
+ for i in `ls *.dat`; do \
+ echo ${INSTALL_DATA} $$i ${DATADIR}/data; \
+ ${INSTALL_DATA} $$i ${DATADIR}/data; \
+ done
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.pre.mk>
.if defined(WITH_NVIDIA_GL)
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
index dc4d90323853..f30869aa90e4 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -1,6 +1,6 @@
-MD5 (MesaDemos-7.0.4.tar.bz2) = c1215b31c5f7b85f81eed3bfba07d556
-SHA256 (MesaDemos-7.0.4.tar.bz2) = 90830d6771821ac519a160cf7065119fcdb4e077ee5a66ce30bf0d4988b0e77a
-SIZE (MesaDemos-7.0.4.tar.bz2) = 1341624
-MD5 (MesaLib-7.0.4.tar.bz2) = 8d7bacbe0234742a5d08c8088c4619e9
-SHA256 (MesaLib-7.0.4.tar.bz2) = 93fc5f882defc02537e972c6c31616d271d174090179b1697701044989fe29cd
-SIZE (MesaLib-7.0.4.tar.bz2) = 3414357
+MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
+SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
+SIZE (MesaLib-7.2.tar.bz2) = 3341919
+MD5 (MesaDemos-7.2.tar.bz2) = 22e03dc4038cd63f32c21eb60994892b
+SHA256 (MesaDemos-7.2.tar.bz2) = 3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4
+SIZE (MesaDemos-7.2.tar.bz2) = 1360304
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
new file mode 100644
index 000000000000..ac2bb139d53d
--- /dev/null
+++ b/graphics/mesa-demos/pkg-plist
@@ -0,0 +1,92 @@
+bin/arbfplight
+bin/arbfslight
+bin/arbocclude
+bin/bounce
+bin/clearspd
+bin/copypix
+bin/corender
+bin/cubemap
+bin/drawpix
+bin/engine
+bin/fbo_firecube
+bin/fire
+bin/fogcoord
+bin/fplight
+bin/fslight
+bin/gamma
+bin/gearbox
+bin/gears
+bin/geartrain
+bin/glinfo
+bin/gloss
+bin/glslnoise
+bin/gltestperf
+bin/glthreads
+bin/glutfx
+bin/glxcontexts
+bin/glxdemo
+bin/glxgears
+bin/glxgears_fbconfig
+bin/glxgears_pixmap
+bin/glxheads
+bin/glxinfo
+bin/glxpbdemo
+bin/glxpixmap
+bin/glxsnoop
+bin/glxswapcontrol
+bin/ipers
+bin/isosurf
+bin/lodbias
+bin/manywin
+bin/morph3d
+bin/multiarb
+bin/offset
+bin/overlay
+bin/paltex
+bin/pbdemo
+bin/pbinfo
+bin/pointblast
+bin/rain
+bin/ray
+bin/readpix
+bin/reflect
+bin/renormal
+bin/shadowtex
+bin/sharedtex
+bin/singlebuffer
+bin/spectex
+bin/spriteblast
+bin/stex3d
+bin/streaming_rect
+bin/teapot
+bin/terrain
+bin/tessdemo
+bin/texcyl
+bin/texdown
+bin/texenv
+bin/texobj
+bin/texture_from_pixmap
+bin/trispd
+bin/tunnel
+bin/tunnel2
+bin/vao_demo
+bin/wincopy
+bin/winpos
+bin/xfont
+bin/xrotfontdemo
+%%DATADIR%%/data/geartrain.dat
+%%DATADIR%%/data/isosurf.dat
+%%DATADIR%%/data/terrain.dat
+%%DATADIR%%/images/arch.rgb
+%%DATADIR%%/images/bw.rgb
+%%DATADIR%%/images/girl.rgb
+%%DATADIR%%/images/girl2.rgb
+%%DATADIR%%/images/reflect.rgb
+%%DATADIR%%/images/s128.rgb
+%%DATADIR%%/images/tile.rgb
+%%DATADIR%%/images/tree2.rgba
+%%DATADIR%%/images/tree3.rgb
+%%DATADIR%%/images/wrs_logo.rgb
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index d1aba141bba7..482d93314e11 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mhgui
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
MASTER_SITE_SUBDIR= makehuman
@@ -14,15 +15,14 @@ MASTER_SITE_SUBDIR= makehuman
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= GUI widget library for MakeHuman
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \
- animorph.0:${PORTSDIR}/graphics/animorph \
+LIB_DEPENDS= animorph.0:${PORTSDIR}/graphics/animorph \
png.5:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
-USE_GL= yes
+USE_GL= glut
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index 1779a1efdbc4..b532c3c598b9 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= morpheus
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics gnome
MASTER_SITES= http://www.winnicki.net/morpheus/meat/
diff --git a/graphics/mxp/Makefile b/graphics/mxp/Makefile
index 8b5d3dbfe066..9c42174cea7b 100644
--- a/graphics/mxp/Makefile
+++ b/graphics/mxp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mxp
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=apps/math/fractals
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index b39adf17ae9c..4dd337ee6ca5 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lablgl
PORTVERSION= 1.03
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
PKGNAMEPREFIX= ocaml-
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 2a9dc6a92a00..6d5f3b5416c7 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ogre3d
PORTVERSION= 1.4.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=ogre
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index b3e3cf394845..67676901169a 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pixmap
PORTVERSION= 2.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/pixmap
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index c75c75093396..60773e60482a 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= opengl
PORTVERSION= 3.0.0.b8
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= py${PORTNAME}
@@ -20,12 +21,11 @@ BUILD_DEPENDS= ${PYNUMERIC} \
${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
RUN_DEPENDS= ${PYNUMERIC} \
${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
OPTIONS= TKINTER "Build with tkinter for X support" On
OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}/options
-USE_GL= yes
+USE_GL= glut
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= PyOpenGL
diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile
index 67e9c2f09382..14d03c5f4a7f 100644
--- a/graphics/pyro/Makefile
+++ b/graphics/pyro/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyro
PORTVERSION= 1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://nostatic.org/pyro/
EXTRACT_SUFX= .tgz
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index 8cfdfe8407b4..df5ff1253a89 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quat
PORTVERSION= 1.20
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.physcip.uni-stuttgart.de/phy11733/download/
PKGNAMESUFFIX= -gui
diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index 1d5a41583bac..4aa68d227aab 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quesa
PORTVERSION= 1.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF
.ifdef (WITH_EXAMPLES)
@@ -19,8 +19,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM)
USE_AUTOTOOLS= libtool:15
-USE_GL= glu
-USE_XORG= x11 ice
+USE_GL= glut
+USE_XORG= x11 ice xmu xi
.ifdef (WITH_EXAMPLES)
USE_GNOME= gtk12
.endif
diff --git a/graphics/renderpark/Makefile b/graphics/renderpark/Makefile
index 0cbbc5bab440..c67e3640a325 100644
--- a/graphics/renderpark/Makefile
+++ b/graphics/renderpark/Makefile
@@ -7,7 +7,7 @@
PORTNAME= renderpark
PORTVERSION= 3.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/
DISTNAME= RenderPark
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index b21535f861a7..8750f71fe43b 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opengl
PORTVERSION= 0.32b
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics ruby
MASTER_SITES= http://www2.giganet.net/~yoshi/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/sced/Makefile b/graphics/sced/Makefile
index 702a9885b003..555656cb8454 100644
--- a/graphics/sced/Makefile
+++ b/graphics/sced/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sced
PORTVERSION= 1.03
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.cs.wisc.edu/~schenney/sced/src/
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 49ef6d7b7cda..8285c8cc461d 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -9,7 +9,7 @@
PORTNAME= tiff
PORTVERSION= 3.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
http://dl1.maptools.org/dl/libtiff/
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 1a3caae430d5..9020da0b5cfe 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= togl
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= graphics tk
MASTER_SITES= SF
DISTNAME= Togl-${PORTVERSION}
@@ -20,6 +21,7 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GL= yes
+USE_XORG= x11 xt xmu
MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include/tk8.4" \
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index d264a9244d5f..bd49f18f973e 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -8,6 +8,7 @@
PORTNAME= tulip
PORTVERSION= 3.0.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/auber:src \
http://tulip.labri.fr/userHandbook/:doc
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 4941c1c3fa27..4d81925d2655 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= view3ds
PORTVERSION= 1.0.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/graphics/visionegg/Makefile b/graphics/visionegg/Makefile
index 233e8f19a3f2..f4943455a55e 100644
--- a/graphics/visionegg/Makefile
+++ b/graphics/visionegg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= visionegg
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
@@ -25,9 +25,8 @@ RUN_DEPENDS= \
${PYTHON_SITELIBDIR}/PIL/Image.py:${PORTSDIR}/graphics/py-imaging \
${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
-LIB_DEPENDS= \
- glut.4:${PORTSDIR}/graphics/libglut
+USE_GL= glut
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib
diff --git a/graphics/vvv/Makefile b/graphics/vvv/Makefile
index 28bc58227b61..ded5c0e47d73 100644
--- a/graphics/vvv/Makefile
+++ b/graphics/vvv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vvv
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.inf.ufes.br/~thomas/graphics/vvv/ \
${MASTER_SITE_LOCAL}
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 442171fc2829..f784b3fb2af6 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -9,6 +9,7 @@
PORTNAME= white_dune
PORTVERSION= ${DISTVERSION:S/pl/./}
DISTVERSION= 0.28pl14
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES
diff --git a/graphics/wildmagic/Makefile b/graphics/wildmagic/Makefile
index 0082824ae6d4..f3692925dce7 100644
--- a/graphics/wildmagic/Makefile
+++ b/graphics/wildmagic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= WildMagic
DISTVERSION= 4p8
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.geometrictools.com/Downloads/
DISTNAME= ${PORTNAME}${DISTVERSION}
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 688ea079ecd9..58a75b527a1f 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xbmbrowser
PORTVERSION= 5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/graphics/xmms-dancingparticles/Makefile b/graphics/xmms-dancingparticles/Makefile
index fe00670cfe40..5c5bcc0367a1 100644
--- a/graphics/xmms-dancingparticles/Makefile
+++ b/graphics/xmms-dancingparticles/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dancingparticles
PORTVERSION= 0.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://tardyp.free.fr/dancingparticles/
PKGNAMEPREFIX= xmms-
@@ -18,10 +18,9 @@ MAINTAINER= alepulver@FreeBSD.org
COMMENT= Makes particles dance with very pretty neon colors
LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \
- glut.4:${PORTSDIR}/graphics/libglut \
xmms.4:${PORTSDIR}/multimedia/xmms
-USE_GL= yes
+USE_GL= glut
USE_GNOME= gtk12
USE_SDL= sdl
CFLAGS+= -I${PREFIX}/include
diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile
index af4a007d3591..ca23967fd80e 100644
--- a/graphics/xmms-fishmatic/Makefile
+++ b/graphics/xmms-fishmatic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-fishmatic
PORTVERSION= 0.0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://stukach.com/hosted/
DISTNAME= fishmatic
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index 387fa7b94a6f..d09fa6949a3f 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-paranormal
PORTVERSION= 0.2.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF
MASTER_SITE_SUBDIR= paranormal
@@ -16,13 +16,13 @@ DISTNAME= paranormal-${PORTVERSION:S/.p/pre/}
MAINTAINER= dyeske@gmail.com
COMMENT= An adaptation of the "OpenGL Spectrum Analyzer" from XMMS
-LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
- glut.4:${PORTSDIR}/graphics/libglut
+LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include/libxml2/libxml"
+USE_GL= glut
GNU_CONFIGURE= yes
USE_SDL= sdl
USE_LDCONFIG= yes
diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile
index 0b28df856589..f0fb200fe188 100644
--- a/graphics/xmms-scivi/Makefile
+++ b/graphics/xmms-scivi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scivi
DISTVERSION= 0.2.0-rc3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -20,6 +20,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
USE_BZIP2= yes
USE_GL= yes
+USE_XORG= x11 xt
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index e6728da53dee..429b99bd4f4c 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmorph
PORTVERSION= 2006.08.17
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g}