- Update X.org ports to 7.4+ (few ports are more recent than the katamari).

- Bump PORTREVISION for all ports depending on libglut since the shlib
version number went from 4 to 3.
- Bump PORTREVISION for all ports depending on libXaw as libXaw.so.8 isn't
installed anymore.
- Couple of ports fixes (mostly missing xorg components added to USE_XORG).

6 files changed, 11 insertions, 10 deletions

diff --git a/science/elmerpost/Makefile b/science/elmerpost/Makefile
index 281e22c9df81..1955cc3ec4bb 100644
--- a/science/elmerpost/Makefile
+++ b/science/elmerpost/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmerpost
 PORTVERSION=	5.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 MASTER_SITES=	SF/elmerfem
 
@@ -23,6 +23,7 @@ RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 CXXFLAGS+=	-Wno-deprecated
 
 USE_GL=		yes
+USE_XORG=	x11 xt xi
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 9fefe700faa5..67ef6317eee4 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	flounder
 PORTVERSION=	0.40
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 MASTER_SITES=	http://www2.enel.ucalgary.ca/~vigmond/flounder/
 EXTRACT_SUFX=	.tgz
@@ -18,9 +18,9 @@ COMMENT=	A quick way to visualize regularly spaced 4D data
 
 LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk \
 		ungif:${PORTSDIR}/graphics/libungif \
-		png:${PORTSDIR}/graphics/png \
-		glut.4:${PORTSDIR}/graphics/libglut
+		png:${PORTSDIR}/graphics/png
 
+USE_GL=		glut
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++"
diff --git a/science/liboglappth/Makefile b/science/liboglappth/Makefile
index b9f4b45ef3b9..fb0c489d0855 100644
--- a/science/liboglappth/Makefile
+++ b/science/liboglappth/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	liboglappth
 PORTVERSION=	0.98
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/current/ \
 		http://bioinformatics.org/ghemical/download/
diff --git a/science/medit/Makefile b/science/medit/Makefile
index 8f607c16b51a..7945db3a6649 100644
--- a/science/medit/Makefile
+++ b/science/medit/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	medit
 PORTVERSION=	2006.09.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}	\
 		http://www.ann.jussieu.fr/~frey/logiciels/:author
@@ -47,10 +47,8 @@ PLIST_DIRS=	%%EXAMPLESDIR%%
 . endif
 .endif
 
-LIB_DEPENDS+=	glut.4:${PORTSDIR}/graphics/libglut
-
 NO_WRKSUBDIR=	yes
-USE_GL=		yes
+USE_GL=		glut
 
 .include <bsd.port.pre.mk>
 
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 1f1ad40fc4ce..a1584628a5cd 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	paraview
 PORTVERSION=	2.4.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v2.4/
 
@@ -22,6 +22,7 @@ LIB_DEPENDS=	hdf5.0:${PORTSDIR}/science/hdf5 \
 		expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GL=		yes
+USE_XORG=	x11 xt
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile
index cbb898fe5cf5..9ed927cd5501 100644
--- a/science/xmakemol/Makefile
+++ b/science/xmakemol/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xmakemol
 PORTVERSION=	5.16
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	SAVANNAH