(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

3 files changed, 5 insertions, 5 deletions

diff --git a/korean/ftghostscript5/Makefile b/korean/ftghostscript5/Makefile
index 29ecc17582d2..c39e709a6734 100644
--- a/korean/ftghostscript5/Makefile
+++ b/korean/ftghostscript5/Makefile
@@ -35,10 +35,10 @@ RUN_DEPENDS=	$(LOCALBASE)/share/ghostscript/fonts:${PORTSDIR}/print/gsfonts \
 		$(X11BASE)/lib/X11/fonts/TrueType/gulim.ttf:${PORTSDIR}/korean/baekmukfonts-ttf
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
-		ttf.4:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 USE_XLIB=	YES
+USE_FREETYPE=	YES
 WRKSRC=		${WRKDIR}/gs5.10
 
 MAKEFILE=	unix-gcc.mak
diff --git a/korean/ghostscript55httf/Makefile b/korean/ghostscript55httf/Makefile
index 7a8765f60843..5670f9121c3c 100644
--- a/korean/ghostscript55httf/Makefile
+++ b/korean/ghostscript55httf/Makefile
@@ -26,11 +26,11 @@ Y2K=		http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract \
 		unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
-		ttf.4:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	$(X11BASE)/lib/X11/fonts/TrueType/gulim.ttf:${PORTSDIR}/korean/baekmukfonts-ttf
 
 USE_XLIB=	yes
+USE_FREETYPE=	yes
 EXTRACT_ONLY=	${GS_SOURCES}
 WRKSRC=		${WRKDIR}/gs5.50
 USE_GMAKE=	yes
diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile
index c093f6d04a06..cad1fec87c23 100644
--- a/korean/hanIM/Makefile
+++ b/korean/hanIM/Makefile
@@ -12,10 +12,10 @@ MASTER_SITES=   ftp://ftp.mizi.com/pub/hanIM/
 
 MAINTAINER=     cjh@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
 USE_IMAKE=	YES
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/hanIM
 
 post-install: