- 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).

7 files changed, 13 insertions, 10 deletions

diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index 3367cc2400ca..2118055cb79e 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cider
 PORTVERSION=	1.b1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mita
diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile
index d2ed545c77ce..09692f9f0d91 100644
--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jspice3
 PORTVERSION=	2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://www.wrcad.com/ftp/pub/	\
 		ftp://ftp.srware.com/pub/
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index c19331d2c163..2a4ce82550f6 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	leocad
 PORTVERSION=	0.73
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
@@ -19,9 +19,9 @@ COMMENT=	A CAD program that uses bricks similar to those found in many toys
 
 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		glut.4:${PORTSDIR}/graphics/libglut
+		png.5:${PORTSDIR}/graphics/png
 
+USE_GL=		glut
 USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 29dd4e4a963a..c9e955f957a8 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netgen
 PORTVERSION=	4.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	http://www.hpfem.jku.at/cgi/download.cgi?ID=
 DISTNAME=	ngs${PORTVERSION:S/.//g}
@@ -21,6 +21,7 @@ USE_GMAKE=	yes
 USE_TK=		yes
 USE_TK_BUILD=	yes
 USE_GL=		yes
+USE_XORG=	xmu xi
 
 ALL_TARGET=	ng
 
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index ecf8cb48e573..fed93b66df46 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		opencascade
 PORTVERSION=		6.3
+PORTREVISION=		1
 CATEGORIES=		cad science
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
@@ -31,6 +32,7 @@ USE_TCL_BUILD=	84
 USE_TCL_RUN=	84
 USE_TCL_THREADS=yes
 USE_JAVA=	yes
+USE_XORG=	xmu
 JAVA_VERSION=	1.4+
 #.if defined(MAINTAINER_MODE)
 # linux-sun-jdk was required for 6.1, but 6.2 is OK with diablo-jdk.
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index 955bab8b2c57..554ed1cc6225 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	slffea
 PORTVERSION=	1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}13
@@ -17,10 +17,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	jmelo@FreeBSD.org
 COMMENT=	San Le's Free Finite Element Analysis
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 CONFLICTS=	swi-pl-[0-9]* TenDRA-[0-9]*
 
+USE_GL=		glut
+
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.3
 ALL_TARGET=	everything
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index ada632a40935..4a4ec2379b94 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spice
 PORTVERSION=	3f5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources
 DISTFILES=	spice3f5${EXTRACT_SUFX}:sources	\