(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

Mk/bsd.port.mk

@@ -754,7 +754,29 @@ BUILD_DEPENDS+=		${X11BASE}/lib/libXm.a:${PORTSDIR}/x11-toolkits/Motif-dummy
 .endif
 .endif
 
-PKG_IGNORE_DEPENDS?=		'(XFree86-3\.3\.6|Motif-2\.1\.10)'
+# defaults to 3.3.6; will be changed to 4.0 when it is ready
+XFREE86_VERSION?=	3
+
+.if ${XFREE86_VERSION} == 3
+.if defined(USE_XPM)
+LIB_DEPENDS+=			Xpm.4:${PORTSDIR}/graphics/xpm
+.endif
+.if defined(USE_DGS)
+LIB_DEPENDS+=			dps.0:${PORTSDIR}/x11/dgs
+.endif
+.if defined(USE_MESA)
+LIB_DEPENDS+=			GL.14:${PORTSDIR}/graphics/Mesa3
+.endif
+.if defined(USE_FREETYPE)
+LIB_DEPENDS+=			ttf.4:${PORTSDIR}/print/freetype
+.endif
+XAWVER=					7
+PKG_IGNORE_DEPENDS?=	'(XFree86-3\.3\.6|Motif-2\.1\.10)'
+.else
+XAWVER=					6
+PKG_IGNORE_DEPENDS?=	'Motif-2\.1\.10'
+.endif
+PLIST_SUB+=				XAWVER=${XAWVER}
 
 .if defined(USE_BISON)
 .if ${OSVERSION} >= 400014
@@ -797,11 +819,17 @@ RUN_DEPENDS+=	perl${PERL_VERSION}:${PORTSDIR}/lang/perl5
 .endif
 .endif
 
-# Don't try to build XFree86 even if ALWAYS_BUILD_DEPENDS is defined --
+.if defined(USE_XLIB)
+.if ${XFREE86_VERSION} == 3
+# Don't try to build XFree86-3 even if ALWAYS_BUILD_DEPENDS is defined --
 # it's just too big....
-.if defined(USE_XLIB) && !defined(ALWAYS_BUILD_DEPENDS)
+.if !defined(ALWAYS_BUILD_DEPENDS)
 LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86
 .endif
+.else
+LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+.endif
+.endif
 
 .if exists(${PORTSDIR}/../Makefile.inc)
 .include "${PORTSDIR}/../Makefile.inc"
@@ -905,8 +933,13 @@ EXTRACT_CMD?=			${GZIP_CMD}
 # Figure out where the local mtree file is
 .if !defined(MTREE_FILE) && !defined(NO_MTREE)
 .if defined(USE_X_PREFIX)
+.if ${XFREE86_VERSION} == 3
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .else
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
+#MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+.endif
+.else
 MTREE_FILE=	/etc/mtree/BSD.local.dist
 .endif
 .endif
@@ -1135,7 +1168,7 @@ maintainer:
 VALID_CATEGORIES+=	afterstep archivers astro audio benchmarks biology \
 	cad chinese comms converters databases deskutils devel \
 	editors elisp emulators ftp games german gnome graphics \
-	ipv6 irc japanese java kde korean lang linux \
+	hebrew ipv6 irc japanese java kde korean lang linux \
 	mail math mbone misc net news \
 	offix palm perl5 plan9 print python russian \
 	security shells sysutils \

astro/openuniverse/Makefile

@@ -14,12 +14,12 @@ MASTER_SITES=		http://plasma.gsfc.nasa.gov/Ssystem/ \
 
 MAINTAINER=		[email protected]
 
-LIB_DEPENDS=		jpeg.9:${PORTSDIR}/graphics/jpeg \
-			GL.14:${PORTSDIR}/graphics/Mesa3
+LIB_DEPENDS=		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 MAKEFILE=		Makefile.FreeBSD
 FETCH_BEFORE_ARGS=	-b
 USE_X_PREFIX=		yes
+USE_MESA=		yes
 USE_BISON=		yes
 
 do-install:

astro/wmmoonclock/Makefile

@@ -12,11 +12,10 @@ MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 
 MAN1=		wmmoonclock.1

astro/wmspaceweather/Makefile

@@ -12,12 +12,11 @@ DISTNAME=	wmSpaceWeather-1.04
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmSpaceWeather
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	clean all
 
 MAN1=	wmSpaceWeather.1

astro/wmsun/Makefile

@@ -12,12 +12,11 @@ DISTNAME=	wmSun-1.03
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmSun
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	clean all
 
 MAN1=	wmSun.1

astro/xephem/Makefile

@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.clearskyinstitute.com/xephem/xephem/ \
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
 MANCOMPRESSED=	no

astro/xplanet/Makefile

@@ -17,10 +17,10 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	[email protected]
 
 LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
-		GL.14:${PORTSDIR}/graphics/Mesa3 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-map-extension=jpg

astro/xtide/Makefile

@@ -14,11 +14,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		png.4:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 IGNOREFILES=	harmonics.world.gz
 
+USE_XPM=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 MAN1=	xtide.1 tide.1

audio/ascd/Makefile

@@ -13,11 +13,11 @@ DISTFILES=	${DISTNAME}-src.tgz ${DATAFILES}
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		workman.1:${PORTSDIR}/audio/libworkman
+LIB_DEPENDS=	workman.1:${PORTSDIR}/audio/libworkman
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_IMAKE=	yes
+USE_XPM=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	default
 DATAFILES=	ascd-0.13pr6-themes.tgz

audio/dap/Makefile

@@ -13,10 +13,10 @@ EXTRACT_SUFX=.tgz
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/

audio/gnapster/Makefile

@@ -13,13 +13,13 @@ MASTER_SITES=	http://www.faradic.net/~jasta/files/
 MAINTAINER=	[email protected]
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		ungif.5:${PORTSDIR}/graphics/libungif
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \

audio/mixer.app/Makefile

@@ -13,9 +13,8 @@ DISTNAME=	Mixer.app-${PORTVERSION}
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Mixer ${PREFIX}/bin

audio/wmcdplay/Makefile

@@ -14,11 +14,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/wmcdplay
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>

audio/wmmixer/Makefile

@@ -14,11 +14,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=			${WRKDIR}/wmmixer
 FETCH_BEFORE_ARGS=	-t
 USE_IMAKE=		yes
+USE_XPM=		yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>

audio/wmmp3/Makefile

@@ -12,10 +12,10 @@ MASTER_SITES= 	http://www.dotfiles.com/software/wmmp3/
 MAINTAINER=	[email protected]
 
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 post-install:
 	@${ECHO} "===>   Installing sample.wmmp3 in ${PREFIX}/share/examples/wmmp3"

audio/wmtune/Makefile

@@ -16,11 +16,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 PATCH_ARGS	=-p0 -d ${WRKDIR}
 

audio/xmradio/Makefile

@@ -12,13 +12,12 @@ MASTER_SITES=	http://www.egd.igd.fhg.de/~runge/radio/
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 # This program does not actually depend on the below, but they are pretty
 # useful if you are into digital audio recording and playback.
 #RUN_DEPENDS=   sox:${PORTSDIR}/audio/sox
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 REQUIRES_MOTIF=	yes
 
 #post-install:

audio/xtuner/Makefile

@@ -13,10 +13,10 @@ DISTNAME=	Xtuner-${PORTVERSION}
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
 USE_IMAKE=	YES
+USE_XPM=	YES
 NO_INSTALL_MANPAGES=	YES
 
 .include <bsd.port.mk>

audio/xwave/Makefile

@@ -13,10 +13,9 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./v/}
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/${PORTNAME}2-981109
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 DOC_FILES=	README README-XWAVE2 README.v06 INSTALL
 

cad/xcircuit/Makefile

@@ -12,11 +12,11 @@ MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55
 
 USE_BZIP2=	yes
 USE_IMAKE=	yes
+USE_XPM=	yes
 XMKMF=		xmkmf
 
 MAN1=		xcircuit.1

chinese/CJK/Makefile

@@ -16,12 +16,12 @@ MAINTAINER=	[email protected]
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \
 		ttf2pk:${PORTSDIR}/print/freetype:build
-LIB_DEPENDS=	ttf.4:${PORTSDIR}/print/freetype
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 NO_PACKAGE=	"Needs ttf2pk source from FreeType"
 
 USE_GMAKE=	yes
+USE_FREETYPE=	yes
 WRKSRC=		${WRKDIR}/cjk-current
 
 post-install:

chinese/aterm/Makefile

@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR=	foxfair
 
 MAINTAINER=	[email protected]
 
-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_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-transparency --enable-background-image \
 		--disable-delete-key --disable-backspace-key \

chinese/rxvt/Makefile

@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR= X11/terms
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 MAN1=		crxvt.1

chinese/xemacs/Makefile

@@ -16,13 +16,13 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-mule${EXTRACT_SUFX}
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	xcin2.5:${PORTSDIR}/chinese/xcin25 \
 		${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 
 USE_GMAKE=	yes
+USE_XPM=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 XEMACS_ARCH=	${MACHINE_ARCH}--freebsd

comms/asmodem/Makefile

@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}-0.6-1
 
 MAINTAINER=	[email protected]
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 MAN1=		asmodem.1