(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

7 files changed, 8 insertions, 14 deletions

diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile
index d7cbb4e..7090069 100644
--- a/misc/asbutton/Makefile
+++ b/misc/asbutton/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	apps/asbutton
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	asbutton
 
 do-install:
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index f081443..8b81a4a 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES=	ftp://ftp.mew.org/pub/MagicPoint/
 
 MAINTAINER?=	mita@jp.FreeBSD.org
 
-LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
-		png.4:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.4:${PORTSDIR}/graphics/png
 
 USE_IMAKE=	yes
+USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-vflib
 
diff --git a/misc/wmcp/Makefile b/misc/wmcp/Makefile
index 5f0a6d3..ec55329 100644
--- a/misc/wmcp/Makefile
+++ b/misc/wmcp/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	http://users.linuxbox.com/~bac/src/wmcp/
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 pre-build:
 	(cd ${WRKSRC} && ${GMAKE} clean)
diff --git a/misc/wmmand/Makefile b/misc/wmmand/Makefile
index 5b3542c..1ad06ac 100644
--- a/misc/wmmand/Makefile
+++ b/misc/wmmand/Makefile
@@ -12,12 +12,11 @@ DISTNAME=	wmMand-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmMand
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	clean all
 
 MAN1=		wmMand.1
diff --git a/misc/wmstock/Makefile b/misc/wmstock/Makefile
index fb032b8..4690bbe 100644
--- a/misc/wmstock/Makefile
+++ b/misc/wmstock/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://mattfischer.com/wmstock/src/
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 WRKSRC=		${WRKDIR}/wmstock/src
 USE_GMAKE=	yes
diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index 7b4592f..f4b7b24 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -11,12 +11,11 @@ MASTER_SITES= 	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
 MAINTAINER=	kris@FreeBSD.org
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	clean all
 
 MAN1=		wmWeather.1
diff --git a/misc/xquote/Makefile b/misc/xquote/Makefile
index 1555a0a..30bea13 100644
--- a/misc/xquote/Makefile
+++ b/misc/xquote/Makefile
@@ -13,11 +13,10 @@ MASTER_SITE_SUBDIR= applications
 
 MAINTAINER=	mph@freebsd.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 REQUIRES_MOTIF=		yes
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>