(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

28 files changed, 52 insertions, 56 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index cea9efd89ee2..a0f19be5a8db 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2 \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		ttf.4:${PORTSDIR}/print/freetype
+		tiff.4:${PORTSDIR}/graphics/tiff
 BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55 \
 		mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
 		picttoppm:${PORTSDIR}/graphics/netpbm \
@@ -33,6 +32,7 @@ BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55 \
 
 USE_PERL5=	yes
 USE_XLIB=	yes
+USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index 83fcc8398913..40e3a41bf529 100644
--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@@ -15,9 +15,9 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/lib/libfwf.a:${PORTSDIR}/x11-toolkits/FWF
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/aero/src
 MAKEFILE=	Makefile.linux
 
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 480b837ac544..141041d6fc17 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -14,8 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	aa8vb@nc.rr.com
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d    \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 
 # This program does not actually require the programs below unless you
 #   use audio/video recording and/or playback and save to a non-raw format.
@@ -26,6 +25,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 #		mplex:${PORTSDIR}/graphics/mplex
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=      yes
 MAKE_FLAGS=	-e
 MAN1=		fxtv.1
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 8d57c4be5dde..5ada5de05ba8 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -16,10 +16,9 @@ MAINTAINER=	billf@FreeBSD.org
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 .if defined(WITH_X11)
-LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_XLIB=	yes
+USE_XPM=	yes
+USE_FREETYPE=	yes
 .endif
 
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index 8d57c4be5dde..5ada5de05ba8 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -16,10 +16,9 @@ MAINTAINER=	billf@FreeBSD.org
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 .if defined(WITH_X11)
-LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_XLIB=	yes
+USE_XPM=	yes
+USE_FREETYPE=	yes
 .endif
 
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index 8d57c4be5dde..5ada5de05ba8 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -16,10 +16,9 @@ MAINTAINER=	billf@FreeBSD.org
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 .if defined(WITH_X11)
-LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_XLIB=	yes
+USE_XPM=	yes
+USE_FREETYPE=	yes
 .endif
 
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index e369bfa598d4..1daa2d3e19ef 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -14,9 +14,9 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
-		gd.1:${PORTSDIR}/graphics/gd \
-		ttf.4:${PORTSDIR}/print/freetype
+		gd.1:${PORTSDIR}/graphics/gd
 
+USE_FREETYPE=	yes
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV=	TCL_VER=8.2 MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}"
 ALL_TARGET=	all
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 8114fe243a21..a358e617a7d7 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -15,12 +15,12 @@ DISTFILES=	geomview-1.6.1-src.tar.gz
 MAINTAINER=	fenner@freebsd.org
 
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		GL.14:${PORTSDIR}/graphics/Mesa3 \
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/Geomview
 REQUIRES_MOTIF=	yes
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 
 MAN1=		addbbox.1 animate.1 anytooff.1 anytoucd.1 bdy.1 clip.1 \
 		cplxview.1 crayola.1 example.1 flythrough.1 geomview.1 \
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index a6d0dd83e6c3..5308cb416cf8 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		aa.1:${PORTSDIR}/graphics/aalib \
+LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
@@ -29,6 +28,7 @@ SHLIBVER?=	${PORTVERSION:S/1.//g}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index a6d0dd83e6c3..5308cb416cf8 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		aa.1:${PORTSDIR}/graphics/aalib \
+LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
@@ -29,6 +28,7 @@ SHLIBVER?=	${PORTVERSION:S/1.//g}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index a6d0dd83e6c3..5308cb416cf8 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		aa.1:${PORTSDIR}/graphics/aalib \
+LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
@@ -29,6 +28,7 @@ SHLIBVER?=	${PORTVERSION:S/1.//g}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index a6d0dd83e6c3..5308cb416cf8 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		aa.1:${PORTSDIR}/graphics/aalib \
+LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
@@ -29,6 +28,7 @@ SHLIBVER?=	${PORTVERSION:S/1.//g}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index a6d0dd83e6c3..5308cb416cf8 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		aa.1:${PORTSDIR}/graphics/aalib \
+LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
@@ -29,6 +28,7 @@ SHLIBVER?=	${PORTVERSION:S/1.//g}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index a6d0dd83e6c3..5308cb416cf8 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		aa.1:${PORTSDIR}/graphics/aalib \
+LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
@@ -29,6 +28,7 @@ SHLIBVER?=	${PORTVERSION:S/1.//g}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 78f7708163fa..480e705f4e57 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -13,12 +13,12 @@ DISTNAME=	Giram-${PORTVERSION}
 
 MAINTAINER=	bfoz@glue.umd.edu
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		GL:${PORTSDIR}/graphics/Mesa3
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray31
 
 GTK_CONFIG?=    ${X11BASE}/bin/gtk12-config
 
+USE_MESA=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gltk/Makefile b/graphics/gltk/Makefile
index e0645b3f380b..a73d2b99d581 100644
--- a/graphics/gltk/Makefile
+++ b/graphics/gltk/Makefile
@@ -15,9 +15,8 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 USE_IMAKE=	yes
+USE_MESA=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libtk.a ${PREFIX}/lib/libgltk.a
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 5b038abe87ea..24a1a6cda518 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/libwmf/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		png.4:${PORTSDIR}/graphics/png \
-		ttf.4:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XLIB=	yes
+USE_XPM=	yes
+USE_FREETYPE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype \
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index bbf612ebb2c2..3fc7596ddc2e 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -13,10 +13,10 @@ DISTNAME=	dx-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3 \
-		netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS=	netcdf.1:${PORTSDIR}/math/netcdf
 
 USE_XLIB=	yes
+USE_MESA=	yes
 REQUIRES_MOTIF=	yes
 USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 0a4b7117a525..b1fdbce1bb23 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -14,10 +14,9 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	jmz@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/pixmap
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		pixmap.1
 
 .include <bsd.port.mk>
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 56999d717772..28210e38e692 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 		${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
 		${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
+USE_MESA=	yes
 ALL_TARGET=	default
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 OSMAJOR!=	/usr/bin/uname -r | sed -e 's/\..*//'
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 478ad42546ae..1203cec901c9 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -15,9 +15,9 @@ DISTNAME=	Togl-${PORTVERSION}
 MAINTAINER=	aa8vb@ipass.net
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
-		tcl82.1:${PORTSDIR}/lang/tcl82 \
-		GL.14:${PORTSDIR}/graphics/Mesa3
+		tcl82.1:${PORTSDIR}/lang/tcl82
 
+USE_MESA=	yes
 ALL_TARGET=	default
 
 TOGL_INSTDIR=	${PREFIX}/lib/tk8.2/${DISTNAME}
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index 4a9ff575e7e9..f58b7293238c 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmGrabImage
 
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
+USE_XPM=	YES
 
 MAN1=		wmGrabImage.1
 
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 59c846671259..5fd880f4d3c0 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xbmbrowser.1
 
 USE_GMAKE=	yes
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index a54a63748166..56efa0972782 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -15,14 +15,14 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}.full
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xfig.1
 
 pre-fetch:
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index a54a63748166..56efa0972782 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -15,14 +15,14 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}.full
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xfig.1
 
 pre-fetch:
diff --git a/graphics/xmrm/Makefile b/graphics/xmrm/Makefile
index 9e548e4d3fc0..e75ce3eedda7 100644
--- a/graphics/xmrm/Makefile
+++ b/graphics/xmrm/Makefile
@@ -17,9 +17,9 @@ MAINTAINER=	treif@mayn.de
 
 RUN_DEPENDS=	mpeg:${PORTSDIR}/graphics/mpeg
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+USE_XPM=	yes
 NO_WRKSUBDIR=	yes
 
 do-install:
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 2c586e63b073..89bd0d6ca60e 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES=	http://home.worldonline.dk/~torsten/xpaint/ \
 MAINTAINER=	jseger@FreeBSD.org
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		Xpm.4:${PORTSDIR}/graphics/xpm   \
 		png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/xpaint
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xpaint.1
 
 .include <bsd.port.mk>
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index f2686ab585cc..2f610e020705 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -19,12 +19,15 @@ PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	chuckr@freebsd.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		t1x.1:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS=	t1x.1:${PORTSDIR}/devel/t1lib
 
-###RESTRICTED=     "Contains cryptography"
+### crypto
+#.if !defined(PACKAGE_BUILDING)
+#RESTRICTED=     "Contains cryptography"
+#.endif
 USE_XLIB=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-gzip --enable-japanese		\
 		--with-t1-library=${LOCALBASE}/lib	\