(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

19 files changed, 25 insertions, 42 deletions

diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 6ca53cc01430..5e41737f1735 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -13,11 +13,10 @@ MASTER_SITE_SUBDIR=	apps/asapm
 
 MAINTAINER=	handy@physics.montana.edu
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 ONLY_FOR_ARCHS=	i386
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install install.man
 
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index 515b58694d59..2e9d6cc2fbc8 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES=	http://www.tigr.net/afterstep/as-apps/download/ascpu/	\
 
 MAINTAINER=	dima@Chg.RU
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile
index bce914c195d0..54b9e1d6f913 100644
--- a/sysutils/asfsm/Makefile
+++ b/sysutils/asfsm/Makefile
@@ -12,11 +12,10 @@ DISTNAME=	asfsm-1.0pre15
 
 MAINTAINER=	jack@germanium.xtalwind.net
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--x-includes=${X11BASE}/include/X11
+CONFIGURE_ARGS=	--x-includes=${X11BASE}/include/X11
 
 MAN1=		asfsm.1
 
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index a923380f3201..82e27277d3f2 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -14,12 +14,11 @@ MASTER_SITE_SUBDIR=	apps/asmem
 
 MAINTAINER=	jack@germanium.xtalwind.net
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 MAKEFILE=	Makefile.UNIX
 MAN1=		asmem.1
-MAKE_ENV+=	PCFLAGS="${CFLAGS}"
+MAKE_ENV=	PCFLAGS="${CFLAGS}"
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400000
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index eb0089b597e5..6bea94c82687 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -13,12 +13,11 @@ MASTER_SITE_SUBDIR=	apps/asmon
 
 MAINTAINER=	jack@germanium.xtalwind.net
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
+USE_XPM=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	clean all
 
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index 008e12e8cbe2..36cca0d7d070 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR=	vanilla
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 MAKEFILE=	Makefile.FreeBSD
 ALL_TARGET=	glload
 
diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index 42500f73cffa..bd386cf047d0 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	gnome-find-${PORTVERSION}
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		glade.4:${PORTSDIR}/devel/libglade \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -28,6 +27,7 @@ CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
 		LDFLAGS="-lgnuregex -L${LOCALBASE}/lib"
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		gnome-find.1
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index f699a746ba9d..c588b42ce27a 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
 MAINTAINER=	taoka@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmapm
 USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 BINMODE=	2755
 BINGRP=		operator
diff --git a/sysutils/wmavgload/Makefile b/sysutils/wmavgload/Makefile
index 2a8e0153c7c1..161c5a6694e8 100644
--- a/sysutils/wmavgload/Makefile
+++ b/sysutils/wmavgload/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	contrib/srcs/utils
 
 MAINTAINER=	kushn@mail.kar.net
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index f5aad19594b9..83bcb4f7d167 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -13,12 +13,10 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 60a79224e639..793c32b97597 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -13,12 +13,11 @@ DISTNAME=	wmfire-0.0.3.9pre4
 
 MAINTAINER=	jedgar@fxp.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-x
-CONFIGURE_ENV+=	CFLAGS="-I${PREFIX}/include ${CFLAGS}" \
+CONFIGURE_ENV=	CFLAGS="-I${PREFIX}/include ${CFLAGS}" \
 		LIBS="-L${PREFIX}/lib"
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile
index eae665e8a459..501e8bbcd595 100644
--- a/sysutils/wmhm/Makefile
+++ b/sysutils/wmhm/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES=	ftp://muir.yi.org/pub/wmhm/ \
 
 MAINTAINER=	mmuir@es.co.nz
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/wmhm/wmhm
 
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 MAN8=		wmhm.8
 MANCOMPRESSED=	yes
diff --git a/sysutils/wminet/Makefile b/sysutils/wminet/Makefile
index ef7c16ebc929..a7f656a96b93 100644
--- a/sysutils/wminet/Makefile
+++ b/sysutils/wminet/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.neotokyo.org/illusion/
 
 MAINTAINER=	sk-ports@vegamuse.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 WRKSRC=		${WRKDIR}/wminet.app/wminet
 
diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile
index b54a1729b5bc..9097e78af792 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.fxp.org/~jedgar/wmlmmon/
 
 MAINTAINER=	jedgar@fxp.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 GNU_CONFIGURE=	yes
 MAN8=		wmlmmon.8
diff --git a/sysutils/wmmon/Makefile b/sysutils/wmmon/Makefile
index 3b3d682ad66b..94d373b25a5f 100644
--- a/sysutils/wmmon/Makefile
+++ b/sysutils/wmmon/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://linux.tucows.com/files/x11/dock/
 
 MAINTAINER=	sk-ports@vegamuse.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/wmmon.app/wmmon
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile
index 50f23340519b..39f33377de55 100644
--- a/sysutils/wmmount/Makefile
+++ b/sysutils/wmmount/Makefile
@@ -14,10 +14,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-patch:
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index 4d57cbac7aa5..2f25c6964b05 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.sra.co.jp/people/m-kasahr/wmpccard/src/
 
 MAINTAINER=	taoka@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 MAN1=		wmpccard.1.gz
 NOMANCOMPRESS=	yes
 
diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile
index 05f9509e5a11..aff6d0efcc06 100644
--- a/sysutils/wmtop/Makefile
+++ b/sysutils/wmtop/Makefile
@@ -12,9 +12,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	wmtop@tanelorn.demon.co.uk
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	freebsd
 
 MAN1=		wmtop.1
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 33f52f884ad2..7ade37def8b2 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://www.clave.gr.jp/~eto/xbatt/
 
 MAINTAINER=	nobu@psrc.isac.co.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 ONLY_FOR_ARCHS=	i386
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>