(1) Add new variable, XFREE86_VERSION, to specify which version of

    XFree86 (3 or 4) to depend to when USE_XLIB is set.
    XFREE86_VERSION defaults to 3 for now, but adventurous users can
    override it in /etc/make.conf.  When XFREE86_VERSION=3, USE_XLIB
    will add a dependency to x11/XFree86; when it is set to 4, the
    dependency will be to x11/XFree86-4-libraries.  When
    XFREE86_VERSION=4, the PKG_IGNORE_DEPENDS and ALWAYS_BUILD_DEPENDS
    hacks to avoid messing with XFree86 are turned off.

    Since XFree86 version 4 includes some software that used to be
    separate ports, when XFREE86_VERSION=3 the following variables are
    provided:

    USE_DGS		LIB_DEPENDS on x11/dgs
    USE_FREETYPE	LIB_DEPENDS on print/freetype
    USE_MESA		LIB_DEPENDS on graphics/Mesa3
    USE_XPM		LIB_DEPENDS on graphics/xpm

    When XFREE86_VERSION=4, these variables have no effect.  The
    LIB_DEPENDS in the tree for the above four ports have all been
    converted to the USE_* counterparts.  For your information, this
    is the count of the number of ports:

    USE_DGS		0
    USE_FREETYPE	16
    USE_MESA		36
    USE_XPM		236

    There is a new variable, XAWVER, which is set to 6 when
    XFREE86_VERSION=3 and 7 when XFREE86_VERSION=4.  This is also
    passed to PLIST_SUB so ports that build Xaw based shared libraries
    can use this variable to substitute the shlib version number.

    There is also a provision of using a separate mtree file for
    XFREE86_VERSION=4, but that part is not enabled yet.

Reviewed by:	the ports list
Tested by:	make index (XFREE86_VERSION=3 only)

(2) Add hebrew to list of valid categories.
Submitted by:	nbm

8 files changed, 12 insertions, 14 deletions

diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index bbb84f26ac87..21058a1d2604 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -17,8 +17,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/PGPLOT.
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/PGPLOT.pm:${PORTSDIR}/graphics/pgperl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/ReadLine/readline.pm:${PORTSDIR}/devel/p5-ReadLine-Perl
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
+USE_MESA=	yes
 USE_PERL5=	yes
 SCRIPTS_ENV=	PERL=${PERL}
 
diff --git a/math/abs/Makefile b/math/abs/Makefile
index 7fb6d64bad5d..97c37921e3e7 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	abs-src-0.6a
 
 MAINTAINER=	gmarco@giovannelli.it
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_XLIB=	yes
+USE_XPM=	yes
 WRKSRC=         ${WRKDIR}/abs-src-0.6a/src
 
 do-install:
diff --git a/math/grace/Makefile b/math/grace/Makefile
index dc955d003df2..32ad1d4bc35f 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -23,7 +23,6 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
 BUILD_DEPENDS=  ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp
 LIB_DEPENDS=	Xbae.7:${PORTSDIR}/x11-toolkits/xbae 	\
-		Xpm.4:${PORTSDIR}/graphics/xpm		\
 		netcdf.1:${PORTSDIR}/math/netcdf	\
 		fftw.2:${PORTSDIR}/math/fftw		\
 		pdf.2:${PORTSDIR}/print/pdflib		\
@@ -35,6 +34,7 @@ LIB_DEPENDS=	Xbae.7:${PORTSDIR}/x11-toolkits/xbae 	\
 MAN1=		grace.1 xmgrace.1 gracebat.1 grconvert.1
 
 USE_X_PREFIX=	YES
+USE_XPM=	yes
 USE_GMAKE=	YES
 REQUIRES_MOTIF=	YES
 HAS_CONFIGURE=	YES
diff --git a/math/siag/Makefile b/math/siag/Makefile
index e597280d6299..bf747bbaed38 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.siag.nu/pub/siag/ \
 MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \
-		Magick:${PORTSDIR}/graphics/ImageMagick \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		Magick:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 		mswordview:${PORTSDIR}/textproc/mswordview \
 		catdoc:${PORTSDIR}/textproc/catdoc
@@ -51,6 +50,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
 			CPPFLAGS="${CPPFLAGS}"
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN1=	xedplus.1 xfiler.1 gvu.1 siod.1 siag.1 pw.1 egon.1 \
 	dummy_plugin.1 runcmd.1
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index 1c5f8008184a..c1e1e67aef2a 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	vtk312Unix
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3	\
-		tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
+USE_MESA=	yes
 WRKSRC=		${WRKDIR}/vtk31
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile
index 1c5f8008184a..c1e1e67aef2a 100644
--- a/math/vtk43/Makefile
+++ b/math/vtk43/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	vtk312Unix
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3	\
-		tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
+USE_MESA=	yes
 WRKSRC=		${WRKDIR}/vtk31
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index 1c5f8008184a..c1e1e67aef2a 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	vtk312Unix
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3	\
-		tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
+USE_MESA=	yes
 WRKSRC=		${WRKDIR}/vtk31
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/wmcalc/Makefile b/math/wmcalc/Makefile
index 8e451ee18b32..43e80541751f 100644
--- a/math/wmcalc/Makefile
+++ b/math/wmcalc/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	http://members.access1.net/ehflora/wmcalc/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 ALL_TARGET=	clean wmcalc
 USE_X_PREFIX=   yes
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/wmcalc
 
 do-install: