(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

13 files changed, 19 insertions, 26 deletions

diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index e44445cbc17f..28a910bdcb82 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	brett@peloton.runet.edu
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shaping
 
diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile
index 1a70681fb035..4fcec3e59cbd 100644
--- a/mail/glbiff/Makefile
+++ b/mail/glbiff/Makefile
@@ -13,9 +13,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL:${PORTSDIR}/graphics/Mesa3
-
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		glbiff.1
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index d5cd16b6bf36..079625f1a981 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -15,7 +15,8 @@ DISTNAME=	mew-${PORTVERSION}
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-RESTRICTED=	"USA ITAR export restrictions (has PGP hooks)"
+### crypto
+#RESTRICTED=	"USA ITAR export restrictions (has PGP hooks)"
 
 RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
 
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index 7eeadd65bdfa..326c7bc0a37e 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--with-tcl-config=${PREFIX}/lib/tcl8.2
 #LIB_DEPENDS+=	tkstep80.1:${PORTSDIR}/x11-toolkits/tkstep80 \
 #		Dnd.1:${PORTSDIR}/x11/libdnd \
 #		tiff.4:${PORTSDIR}/graphics/tiff \
-#		jpeg.9:${PORTSDIR}/graphics/jpeg \
-#		Xpm.4:${PORTSDIR}/graphics/xpm
+#		jpeg.9:${PORTSDIR}/graphics/jpeg
+#USE_XPM=	yes
 #CONFIGURE_ARGS+= --with-tk-config=${PREFIX}/lib/tkstep8.0
 #pre-patch:
 #	${SED} s/'(DND) 0/(DND) 1'/ ${FILESDIR}/options.tcl > \
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index da704e48321f..24e275d1e6cf 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/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}/wmbiff
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 pre-build:
 	@(cd ${WRKSRC} && ${GMAKE} clean)
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 12b5b7924238..d35c8d1a6e9a 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -13,14 +13,14 @@ DISTNAME=	WMMail.app-${PORTVERSION}
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		PropList.2:${PORTSDIR}/devel/libPropList
+LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-PL-libs="-L${LOCALBASE}/lib" \
+CONFIGURE_ARGS=	--with-PL-libs="-L${LOCALBASE}/lib" \
 		--with-PL-incs="-I${LOCALBASE}/include"
 WRKSRC=	${WRKDIR}/WMMail.app-0.63a
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 post-install:
 	@${ECHO} "		"
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index eb0803fce0a6..57dc247b92e5 100644
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -13,11 +13,10 @@ DISTNAME=	WMPop3-${PORTVERSION}
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}/wmpop3
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index 7bf640fcfd2c..f8aca42a753a 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -20,10 +20,10 @@ DISTFILES=	${DISTNAME}.tar.Z xfaces-sounds.tar.gz
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
 BUILD_DEPENDS=	${X11BASE}/lib/libaudio.a:${PORTSDIR}/audio/nas
-LIB_DEPENDS=	compface.1:${PORTSDIR}/mail/faces \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	compface.1:${PORTSDIR}/mail/faces
 
 USE_IMAKE=	YES
+USE_XPM=	YES
 MAN1=		xfaces.1
 
 pre-configure:
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index b669a539c3be..797c28edeb32 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -12,11 +12,11 @@ MASTER_SITES=	ftp://xfmail.ufies.org/pub/xfmail/release/1.4.0/
 
 MAINTAINER=	gena@NetVision.net.il
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		xforms.0:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-dead-keys --with-xkb-dead-keys
 MAN1=		xfmail.1
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 6abd4f74d781..1fa5165e0637 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xmail.1
 MANCOMPRESSED=	no
 
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 1f419f5aeae1..d90bbe7932c6 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=		yes
+USE_XPM=		yes
 MAN1=			xmailbox.1
 
 post-patch:
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 3877551a3c98..44ae9b4a3ae5 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -14,9 +14,8 @@ DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu
 
 MAINTAINER=	sanpei@sanpei.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 WRKSRC=		${WRKDIR}/xpbiff
 
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 76cd33d57ae4..29cdf4a20e81 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	ftp://ftp.nuie.nagoya-u.ac.jp/pub/nagoya-u/ \
 
 MAINTAINER=	max@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 PREFIX?=         ${LOCALBASE}
 MTREE_FILE?=	/etc/mtree/BSD.local.dist