(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, 12 insertions, 23 deletions

diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 54d69db5fd52..11580f77de67 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://www.asclock.org/tar/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 HAS_CONFIGURE=	YES
 WRKSRC=		${WRKDIR}/asclock-xlib
 USE_X_PREFIX=	YES
+USE_XPM=	YES
 
 post-patch:
 	@(cd ${WRKSRC}; \
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile
index d72a7eb3a973..077ca5c9d21b 100644
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@@ -15,9 +15,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		asclock.1
 
 pre-configure:
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 953e2ac02b7e..61f5e4f8482f 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -14,9 +14,8 @@ MASTER_SITES=	ftp://ftp.afterstep.org/apps/astime/ \
 
 MAINTAINER=	kris@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install install.man
 
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index b45781f1e139..11f07e56c3f0 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://www.seki.ee.kagu.sut.ac.jp/~sakai/
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 #ALL_TARGET=	all
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN1=		eyeclock.1
 MANCOMPRESSED=	yes
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index d2af4b58d8e1..7ec2cbf7ab39 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -14,9 +14,8 @@ MASTER_SITES=	http://www.daionet.gr.jp/~masa/archives/ \
 
 MAINTAINER=	aa8vb@ipass.net
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	glclock
 
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index bb634887dbfd..fda4d6ec4503 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -13,10 +13,9 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/pclock ${PREFIX}/bin
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index ce330d2e9233..0da027632bd8 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -12,11 +12,10 @@ 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_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 
 ALL_TARGET=	clean all
diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile
index 8841cb2aafaa..385a094af6bb 100644
--- a/x11-clocks/wmdate/Makefile
+++ b/x11-clocks/wmdate/Makefile
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR=	jim
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 BUILD_DEPENDS=	${X11BASE}/include/dockapp.h:${PORTSDIR}/x11-wm/libdockapp
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
diff --git a/x11-clocks/wmitime/Makefile b/x11-clocks/wmitime/Makefile
index f84ce9809275..65e7cb69eabf 100644
--- a/x11-clocks/wmitime/Makefile
+++ b/x11-clocks/wmitime/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	http://www.neotokyo.org/illusion/downloads/
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 WRKSRC=		${WRKDIR}/wmitime/wmitime
 
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index 399582e221f8..a920abe11fd1 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	ftp://ftp.enteract.com/users/rneswold/
 
 MAINTAINER=	rneswold@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/wmtime.app/wmtime
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES= 1
 
 post-extract:
diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile
index 30d1cd97d5d5..de2c1cf928e1 100644
--- a/x11-clocks/wmtz/Makefile
+++ b/x11-clocks/wmtz/Makefile
@@ -14,11 +14,10 @@ MASTER_SITE_SUBDIR=	jim
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmtz
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 post-install:
 	@${ECHO} "===>   Installing wmtzrc in ${PREFIX}/share/examples/wmtz"
diff --git a/x11-clocks/xtu/Makefile b/x11-clocks/xtu/Makefile
index 08873f0cb7c7..bb0ea52db609 100644
--- a/x11-clocks/xtu/Makefile
+++ b/x11-clocks/xtu/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.rostock.zgdv.de/~runge/xtu/
 
 MAINTAINER=	runge@rostock.zgdv.de
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 #post-install:
 #		strip ${PREFIX}/bin/xtu