(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

11 files changed, 14 insertions, 20 deletions

diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index 8550b19c0f00..ea169edc278f 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -13,11 +13,11 @@ DISTFILES=	${DISTNAME}-src.tgz ${DATAFILES}
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		workman.1:${PORTSDIR}/audio/libworkman
+LIB_DEPENDS=	workman.1:${PORTSDIR}/audio/libworkman
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_IMAKE=	yes
+USE_XPM=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	default
 DATAFILES=	ascd-0.13pr6-themes.tgz
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 5fe01366d923..0f25adf43a37 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -13,10 +13,10 @@ EXTRACT_SUFX=.tgz
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 9a5e77663d35..f0e1987d8092 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -13,13 +13,13 @@ MASTER_SITES=	http://www.faradic.net/~jasta/files/
 MAINTAINER=	cpiazza@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		ungif.5:${PORTSDIR}/graphics/libungif
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 6004e8b7ed32..a94e45b3c8c1 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -13,9 +13,8 @@ DISTNAME=	Mixer.app-${PORTVERSION}
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Mixer ${PREFIX}/bin
diff --git a/audio/wmcdplay/Makefile b/audio/wmcdplay/Makefile
index 273702fc6d03..548237a427a6 100644
--- a/audio/wmcdplay/Makefile
+++ b/audio/wmcdplay/Makefile
@@ -14,11 +14,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	clkao@CirX.ORG
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/wmcdplay
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 83df66e6c427..3fd858f0a0a8 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -14,11 +14,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rneswold@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=			${WRKDIR}/wmmixer
 FETCH_BEFORE_ARGS=	-t
 USE_IMAKE=		yes
+USE_XPM=		yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 37a01857fad6..92d4b22f9883 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -12,10 +12,10 @@ MASTER_SITES= 	http://www.dotfiles.com/software/wmmp3/
 MAINTAINER=	jim@FreeBSD.org
 
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 post-install:
 	@${ECHO} "===>   Installing sample.wmmp3 in ${PREFIX}/share/examples/wmmp3"
diff --git a/audio/wmtune/Makefile b/audio/wmtune/Makefile
index 7defa3434314..6275478272ab 100644
--- a/audio/wmtune/Makefile
+++ b/audio/wmtune/Makefile
@@ -16,11 +16,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 PATCH_ARGS	=-p0 -d ${WRKDIR}
 
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index f390d468226d..7b732e9fc402 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -12,13 +12,12 @@ MASTER_SITES=	http://www.egd.igd.fhg.de/~runge/radio/
 
 MAINTAINER=	runge@rostock.zgdv.de
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 # This program does not actually depend on the below, but they are pretty
 # useful if you are into digital audio recording and playback.
 #RUN_DEPENDS=   sox:${PORTSDIR}/audio/sox
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 REQUIRES_MOTIF=	yes
 
 #post-install:
diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile
index 25ccd103421c..6d4085586ce2 100644
--- a/audio/xtuner/Makefile
+++ b/audio/xtuner/Makefile
@@ -13,10 +13,10 @@ DISTNAME=	Xtuner-${PORTVERSION}
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
 USE_IMAKE=	YES
+USE_XPM=	YES
 NO_INSTALL_MANPAGES=	YES
 
 .include <bsd.port.mk>
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index a5aed79be4f8..7b095f539aac 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -13,10 +13,9 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./v/}
 
 MAINTAINER=	martin.kraft@fal.de
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${PORTNAME}2-981109
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 DOC_FILES=	README README-XWAVE2 README.v06 INSTALL