(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

5 files changed, 8 insertions, 10 deletions

diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 6143d62c2fc..4708e557839 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -14,13 +14,13 @@ DISTNAME=	Mosaic-src-2.7b5
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.4:${PORTSDIR}/graphics/png \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
+		png.4:${PORTSDIR}/graphics/png
 
 REQUIRES_MOTIF=	yes
 WRKSRC=		${WRKDIR}/Mosaic-src
 ALL_TARGET=	bsdi
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/Mosaic ${PREFIX}/bin
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 6be554f25f6..418f12d3244 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -19,13 +19,13 @@ LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml \
 		glade.4:${PORTSDIR}/devel/libglade \
 		guile.6:${PORTSDIR}/lang/guile \
-		wwwcore.1:${PORTSDIR}/www/libwww \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		wwwcore.1:${PORTSDIR}/www/libwww
 RUN_DEPENDS=    gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 6be554f25f6..418f12d3244 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -19,13 +19,13 @@ LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml \
 		glade.4:${PORTSDIR}/devel/libglade \
 		guile.6:${PORTSDIR}/lang/guile \
-		wwwcore.1:${PORTSDIR}/www/libwww \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		wwwcore.1:${PORTSDIR}/www/libwww
 RUN_DEPENDS=    gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/www/vrweb/Makefile b/www/vrweb/Makefile
index 91e411241d5..f37674abc39 100644
--- a/www/vrweb/Makefile
+++ b/www/vrweb/Makefile
@@ -15,10 +15,9 @@ DISTFILES=	vrweb-src-1.5.tar.gz help-1.5.tar.gz
 
 MAINTAINER=	saper@system.pl
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 
 do-configure:
 	(cd ${WRKSRC}; \
diff --git a/www/wmnetselect/Makefile b/www/wmnetselect/Makefile
index dc5578f4a24..bdce28db622 100644
--- a/www/wmnetselect/Makefile
+++ b/www/wmnetselect/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://home.att.net/~apathos/code/
 
 MAINTAINER=	nugget@slacker.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 do-install: