(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

10 files changed, 16 insertions, 19 deletions

diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 075cd6b032b0..3d5ce1c25366 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -14,12 +14,12 @@ MASTER_SITE_SUBDIR=	apps/editors/X
 
 MAINTAINER=	brett@peloton.runet.edu
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_XLIB=       yes
+USE_XPM=       yes
 USE_GMAKE=      yes
 
 CONFIGURE_ARGS=	--disable-mail-author --with-libs='-lcrypt -lreadline' \
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 8d21565b929f..96ea6a3a636c 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -14,10 +14,9 @@ DISTFILES=	nedit-5.1.1-src.tar.gz nedit-5.1.app-defaults
 
 MAINTAINER=	deischen@freebsd.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 REQUIRES_MOTIF=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 EXTRACT_ONLY=	nedit-5.1.1-src.tar.gz
 MAN1=		nclient.1 nedit.1
 ALL_TARGET=	freebsd
diff --git a/editors/offix-editor/Makefile b/editors/offix-editor/Makefile
index c50af5b938ba..bb5473b42ab5 100644
--- a/editors/offix-editor/Makefile
+++ b/editors/offix-editor/Makefile
@@ -14,12 +14,12 @@ DISTNAME=	Editor-${PORTVERSION}
 
 MAINTAINER=	ruslan@shevchenko.kiev.ua
 
-LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
+USE_XPM=	YES
 MAN1=		editor.1
 
 .include <bsd.port.mk>
diff --git a/editors/xed/Makefile b/editors/xed/Makefile
index 758f85ee4c6f..850b8fbf39e8 100644
--- a/editors/xed/Makefile
+++ b/editors/xed/Makefile
@@ -15,9 +15,8 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xed.1
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index afc992ce4b46..020515e68ec9 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -18,8 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 MAINTAINER?=	gj@FreeBSD.org
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
-LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
@@ -29,6 +28,7 @@ DIST_SUBDIR=	xemacs
 
 SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index afc992ce4b46..020515e68ec9 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -18,8 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 MAINTAINER?=	gj@FreeBSD.org
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
-LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
@@ -29,6 +28,7 @@ DIST_SUBDIR=	xemacs
 
 SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index d51eb5f66cb2..ed439d7eedca 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -18,10 +18,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE}
 
 MAINTAINER=	gj@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png
 
+USE_XPM=	yes
 USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index afc992ce4b46..020515e68ec9 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -18,8 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 MAINTAINER?=	gj@FreeBSD.org
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
-LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
@@ -29,6 +28,7 @@ DIST_SUBDIR=	xemacs
 
 SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile
index 96e538a9e4ff..7c8c2b741a46 100644
--- a/editors/xenon/Makefile
+++ b/editors/xenon/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	ftp://ftp.proximity.com.au/pub/xenon/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN1=		xe.1
 
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 1ab6acd6db31..9aca2876dcf2 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -19,9 +19,9 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	rch@WriteMe.Com
 
-LIB_DEPENDS=	ttf.4:${PORTSDIR}/print/freetype
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
+USE_FREETYPE=	YES
 CONFIGURE_ENV=	LC_ALL=
 GNU_CONFIGURE=	YES
 MAKE_ENV=	LC_ALL=