(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

12 files changed, 14 insertions, 23 deletions

diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index d8bfc5af7480..2378ba228ab4 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -18,7 +18,6 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	shige@FreeBSD.org
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	kterm
@@ -29,6 +28,7 @@ PATCHFILES=	${DISTNAME}.NFS-xauth.patch \
 PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		kterm.1
 MANCOMPRESSED=	yes
 
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 8f9d10ca810a..dde15520431e 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -20,7 +20,6 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	kterm
@@ -31,6 +30,7 @@ PATCHFILES=	${DISTNAME}.NFS-xauth.patch \
 PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 DOCDIR=		${PREFIX}/share/doc/kterm16c
 
diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile
index a1a66530bd88..2cbf8e9f9219 100644
--- a/japanese/lyx/Makefile
+++ b/japanese/lyx/Makefile
@@ -22,9 +22,9 @@ MAINTAINER=	flathill@FreeBSD.ORG
 #.if defined(WITH_ISPELL)
 #RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 #.endif
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
+USE_XPM=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LYX_LIBS="-lxpg4"
diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index 9fb5ea4d5c4e..8d48ba6c5702 100644
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@@ -17,8 +17,7 @@ PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index 9fb5ea4d5c4e..8d48ba6c5702 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -17,8 +17,7 @@ PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 9fb5ea4d5c4e..8d48ba6c5702 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -17,8 +17,7 @@ PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index 5cdae131b2e4..33cac7ffe9d7 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -12,13 +12,12 @@ MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
 
 MAINTAINER=	honda@kashio.info.mie-u.ac.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 MAN1=		rxvt.1 rclock.1
-CONFIGURE_ARGS+=--enable-xpm-background --enable-transparency \
+CONFIGURE_ARGS=	--enable-xpm-background --enable-transparency \
 		--enable-menubar --enable-graphics --enable-xim \
 		--enable-languages --with-encoding=eucj \
 		--disable-backspace-key --disable-delete-key \
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 622d3cfc677f..bbdc3f978aa1 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -15,12 +15,11 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-LIB_DEPENDS=	ttf.4:${PORTSDIR}/print/freetype
-
 VFLIB_VERSION=	2.25.1
 PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
 
 GNU_CONFIGURE=	yes
+USE_FREETYPE=	yes
 USE_AUTOCONF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-freetype \
diff --git a/japanese/wine/Makefile b/japanese/wine/Makefile
index 39ef304bb0ac..67753808bbb5 100644
--- a/japanese/wine/Makefile
+++ b/japanese/wine/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	ja-Wine-${PORTVERSION:S/.//g}
 DISTFILES=	Wine-${PORTVERSION:S/.//g}.tar.gz \
 		Wine${PORTVERSION:S/.//g}-ja.tar.gz
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g}
 PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
diff --git a/japanese/xklock/Makefile b/japanese/xklock/Makefile
index 44f680f72671..bb054d94cf6b 100644
--- a/japanese/xklock/Makefile
+++ b/japanese/xklock/Makefile
@@ -18,10 +18,9 @@ PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${DISTNAME}+lx.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 pre-configure:
 	@${MV} ${WRKDIR}/jnames.c ${WRKDIR}/jnames.c.in
diff --git a/japanese/xnetmaj/Makefile b/japanese/xnetmaj/Makefile
index 754a79a601f6..eb6f4a743715 100644
--- a/japanese/xnetmaj/Makefile
+++ b/japanese/xnetmaj/Makefile
@@ -15,9 +15,8 @@ DISTFILES=	netmaj-${PORTVERSION}.tar.gz \
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	libs all
 INSTALL_TARGET=	install install-pf
 
diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile
index 36685de9de38..d2d1b98f2330 100644
--- a/japanese/xyagamo/Makefile
+++ b/japanese/xyagamo/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.dokidoki.ne.jp/home2/shinmaru/mahjong/
 
 MAINTAINER=	shinmaru@dokidoki.ne.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	YES
+USE_XPM=	yes
 
 MAN6=		xyagamo.6
 MANLANG=	ja