68 files changed, 80 insertions, 131 deletions

diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 9f0eed45a73b..2942952e4c67 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -14,10 +14,10 @@ DISTNAME=		3Dc-${PORTVERSION}
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm \
-			Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_X_PREFIX=		yes
+USE_XPM=		yes
 WRKSRC=			${WRKDIR}/3Dc/src
 
 do-install:
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index 2b6d0faaa3e6..96a6ff32c14a 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -15,10 +15,7 @@ DISTNAME=	KnightCap-${PORTVERSION}
 
 MAINTAINER=	bugg@bugg.strangled.net
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3\
-		GLU.14:${PORTSDIR}/graphics/Mesa3 \
-		glut.3:${PORTSDIR}/graphics/Mesa3
-
+USE_MESA=	yes
 ALL_TARGET=	KnightCap
 WRKSRC=		${WRKDIR}/Export
 
diff --git a/games/actx/Makefile b/games/actx/Makefile
index a91be0b135ba..bade5b45b7e4 100644
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.astr.tohoku.ac.jp/~taji/ActX/
 
 MAINTAINER=	esu@yk.rim.or.jp
 
-LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=yes
 NO_CDROM=	'contains commercial character data'
 ACTXDIR=	${PREFIX}/share/examples/actx
diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile
index 5c5c7650aa71..ed69b654cd2b 100644
--- a/games/amphetamine/Makefile
+++ b/games/amphetamine/Makefile
@@ -14,12 +14,12 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=  	SDL-1.0.2:${PORTSDIR}/devel/sdl \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=  	SDL-1.0.2:${PORTSDIR}/devel/sdl
 
 DATAVERSION=	0.8.6
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index cc3a31426849..1153b4b3808c 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -13,10 +13,9 @@ DISTFILES=	battalionSource1.4.tar.Z battalionSUN4.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 WRKSRC=		${WRKDIR}/battalionSource
 
 MAN6=		battalion.6
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 257872335e49..0e9827050ecb 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}.${PORTVERSION:S/.//}.src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 WRKSRC=		${WRKDIR}/battleball-2.1-src
 
 do-install:
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index c546fb9e0af6..ff3671f03635 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -21,11 +21,11 @@ DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
 USE_IMAKE=	yes
+USE_XPM=	yes
 PREFIX=		${LOCALBASE}
 MAN6=		crossfire.6 crossedit.6
 
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index c546fb9e0af6..ff3671f03635 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -21,11 +21,11 @@ DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
 USE_IMAKE=	yes
+USE_XPM=	yes
 PREFIX=		${LOCALBASE}
 MAN6=		crossfire.6 crossedit.6
 
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index c546fb9e0af6..ff3671f03635 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -21,11 +21,11 @@ DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
 USE_IMAKE=	yes
+USE_XPM=	yes
 PREFIX=		${LOCALBASE}
 MAN6=		crossfire.6 crossedit.6
 
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index 49acd9875c20..a67113f2ae3d 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -17,11 +17,11 @@ PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	sheldonh@freebsd.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 .if defined(WITH_GTK)
-LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
 .endif
 
+USE_XPM=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 .if defined(WITH_GTK)
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 49acd9875c20..a67113f2ae3d 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -17,11 +17,11 @@ PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	sheldonh@freebsd.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 .if defined(WITH_GTK)
-LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
 .endif
 
+USE_XPM=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 .if defined(WITH_GTK)
diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile
index ec73c2f14081..67345f7bbd3a 100644
--- a/games/glasteroids/Makefile
+++ b/games/glasteroids/Makefile
@@ -13,13 +13,12 @@ DISTNAME=	Glasteriods
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 MAKEFILE=	Makefile.FreeBSD
 
 WRKSRC=		${WRKDIR}/Glasteroids
 
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 
 pre-build:
 	@ ${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC}
diff --git a/games/gleyes/Makefile b/games/gleyes/Makefile
index c20a59be0d29..9bfd6e14adaf 100644
--- a/games/gleyes/Makefile
+++ b/games/gleyes/Makefile
@@ -16,10 +16,9 @@ MASTER_SITES=	ftp://ftp.kddlabs.co.jp/.1/X11/acontrib/gleyes/ \
 
 MAINTAINER=	malte.lance@gmx.net
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 MAN1=		gleyes.1
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/gleyes ${PREFIX}/bin
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 7dcbe0ace7b2..78adf5128a0f 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	http://gltron.sourceforge.net/download/
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		glut.3:${PORTSDIR}/graphics/Mesa3 \
 		png.4:${PORTSDIR}/graphics/png
 
 .if defined(NO_SOUND)
@@ -23,6 +22,7 @@ SOUND="-DSOUND"
 .endif
 
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_ENV+=	OPT="${CFLAGS}" SOUND="${SOUND}"
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 943308beb8ee..78d349c003b0 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -13,12 +13,12 @@ MASTER_SITES=	http://arch.comp.kyutech.ac.jp/~matsu/my_products/gtk/race/
 MAINTAINER=	nox@jelal.kn-bremen.de
 
 BUILD_DEPENDS=	${X11BASE}/lib/libsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3 \
-		ungif.5:${PORTSDIR}/graphics/libungif \
+LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tcl82.1:${PORTSDIR}/lang/tcl82
 
+USE_MESA=	YES
 USE_AUTOCONF=	YES
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			  -I${LOCALBASE}/include/tcl8.2 \
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 0b2f33962309..98f53fe420f9 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -13,10 +13,9 @@ DISTNAME=	shhcards-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 INSTALLS_SHLIB=	yes
 
 post-install:
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 658ecff3d5d2..5c7fdee051a1 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -13,10 +13,10 @@ DISTNAME=		Maelstrom-${PORTVERSION}
 
 MAINTAINER=		sobomax@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm \
-			SDL-1.0.2:${PORTSDIR}/devel/sdl
+LIB_DEPENDS=		SDL-1.0.2:${PORTSDIR}/devel/sdl
 
 USE_X_PREFIX=		yes
+USE_XPM=		yes
 USE_NEWGCC=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile
index 0910c57f2b82..6e9c53660ce4 100644
--- a/games/mindfocus/Makefile
+++ b/games/mindfocus/Makefile
@@ -13,9 +13,8 @@ DISTFILES=	mindfocus-0.88.tar.gz mindfocus-data1.tar.gz
 
 MAINTAINER=	ixtl@utmc.or.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 RESTRICTED=    'contains commercial character data'
 
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index e7b0ba223813..31203a5ff59a 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 post-extract:
 .for file in DoubleRayDoor DoubleRayFont DoubleRayFont2 DoubleRayScreen
diff --git a/games/nadar/Makefile b/games/nadar/Makefile
index eda5dac22ff4..803ec0aedaf1 100644
--- a/games/nadar/Makefile
+++ b/games/nadar/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://www.seki.ee.kagu.sut.ac.jp/~sakai/myfreesoft/
 
 MAINTAINER=	sakai@seki.ee.kagu.sut.ac.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 ALL_TARGET=	all
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN1=		nadars.1 nadar.1
 MANCOMPRESSED=	yes
diff --git a/games/nethack-gtk/Makefile b/games/nethack-gtk/Makefile
index 576363836f20..c864c289b064 100644
--- a/games/nethack-gtk/Makefile
+++ b/games/nethack-gtk/Makefile
@@ -21,9 +21,9 @@ PATCHFILES=	nh-3.2.2-3.2.3.diff \
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index b73d80f7ee16..c6c5f6ebed9b 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -19,7 +19,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
 
 QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
@@ -27,6 +26,7 @@ QT_SOUND=	nhs.tar.gz
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz
 
 USE_QT=		yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index afb0abd5cef4..9243c853cdd6 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -19,8 +19,7 @@ PATCHFILES=	nh-3.2.2-3.2.3.diff
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index f3cdb9061559..fa40cd4ff0ea 100644
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	nethack
 
 MAINTAINER=	dscheidt@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index f3cdb9061559..fa40cd4ff0ea 100644
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	nethack
 
 MAINTAINER=	dscheidt@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack32-gtk/Makefile b/games/nethack32-gtk/Makefile
index 576363836f20..c864c289b064 100644
--- a/games/nethack32-gtk/Makefile
+++ b/games/nethack32-gtk/Makefile
@@ -21,9 +21,9 @@ PATCHFILES=	nh-3.2.2-3.2.3.diff \
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index afb0abd5cef4..9243c853cdd6 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -19,8 +19,7 @@ PATCHFILES=	nh-3.2.2-3.2.3.diff
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index f3cdb9061559..fa40cd4ff0ea 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	nethack
 
 MAINTAINER=	dscheidt@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index b73d80f7ee16..c6c5f6ebed9b 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -19,7 +19,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
 
 QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
@@ -27,6 +26,7 @@ QT_SOUND=	nhs.tar.gz
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz
 
 USE_QT=		yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index f3cdb9061559..fa40cd4ff0ea 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	nethack
 
 MAINTAINER=	dscheidt@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index f3cdb9061559..fa40cd4ff0ea 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	nethack
 
 MAINTAINER=	dscheidt@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index b73d80f7ee16..c6c5f6ebed9b 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -19,7 +19,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
 
 QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
@@ -27,6 +26,7 @@ QT_SOUND=	nhs.tar.gz
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz
 
 USE_QT=		yes
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index f3cdb9061559..fa40cd4ff0ea 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	nethack
 
 MAINTAINER=	dscheidt@enteract.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
+USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/powerpak/Makefile b/games/powerpak/Makefile
index cd79ba6d2f10..e56b2c330d81 100644
--- a/games/powerpak/Makefile
+++ b/games/powerpak/Makefile
@@ -13,11 +13,10 @@ DISTNAME=	PowerPak
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl \
-		ttf.4:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl
 
+USE_FREETYPE=	yes
 MAKEFILE=	Makefile.FreeBSD
-
 INSTALLS_SHLIB=	yes
 
 post-extract:
diff --git a/games/sol/Makefile b/games/sol/Makefile
index 863aa6a580c8..ef5dadc52be4 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -12,14 +12,14 @@ MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		shhopt.1:${PORTSDIR}/devel/libshhopt \
+LIB_DEPENDS=	shhopt.1:${PORTSDIR}/devel/libshhopt \
 		shhmsg.1:${PORTSDIR}/devel/libshhmsg \
 		xalloc.1:${PORTSDIR}/devel/libxalloc \
 		shhcards.1:${PORTSDIR}/games/libshhcards
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN6=		sol.6
 
diff --git a/games/speyes/Makefile b/games/speyes/Makefile
index 1cc50d087de4..2394dc0ed72e 100644
--- a/games/speyes/Makefile
+++ b/games/speyes/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	http://www.halcyon.com/amalmin/speyes/
 
 MAINTAINER=	jedgar@fxp.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 NO_INSTALL_MANPAGES= yes
 USE_IMAKE=	yes
+USE_XPM=	yes
 
 pre-configure:
 	@${PERL} -pi.orig -e 's:__CFLAGS__:${CFLAGS}:g' ${WRKSRC}/Imakefile
diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile
index 74d5ed9a4aa8..8646368d9a1f 100644
--- a/games/sxsame/Makefile
+++ b/games/sxsame/Makefile
@@ -15,9 +15,8 @@ MASTER_SITES=	ftp://stardust.sfc.wide.ad.jp/pub/JG/JG-0.9.1/sources/\
 
 MAINTAINER=	aconitum@po.teleway.ne.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 INSTALL_TARGET=	install install.dir
 BINOWN=		root
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 8ddf22023f82..a7af3fb41d46 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -13,12 +13,11 @@ DISTNAME=	${PKGNAME}-src
 
 MAINTAINER=	dburr@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
-
 BROKEN=	can\'t find glaux.h
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
+USE_MESA=	YES
 USE_GMAKE=	YES
 ALL_TARGET=	linux-mesa-elf
 
diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile
index 20ed3ca43885..a132b65f8a9b 100644
--- a/games/wmeyes/Makefile
+++ b/games/wmeyes/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	ftp://thrush.omix.com/pub/misc/
 
 MAINTAINER=	zenin@archive.rhps.org
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		wmeyes.1
 
 .include <bsd.port.mk>
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index 4f3754c32004..7bdaa6959224 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -13,11 +13,11 @@ DISTNAME=	miniCHESS-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	${LOCALBASE}/bin/gnuchessx:${PORTSDIR}/games/gnuchess
 
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
+USE_XPM=	YES
 MAKE_ENV=	PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		LOCAL="${LOCALBASE}" MKDIR="${MKDIR}" \
 		INSTALL_DATA="${INSTALL_DATA}"
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index 7d0af6ba6983..83941876c4f5 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -15,11 +15,10 @@ DISTNAME=	wmtictactoe-1.1-1
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/wmtictactoe.app/wmtictactoe
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 post-install:
 	@${ECHO} "===>   Run 'wmtictactoe --help' for the available options"
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 4ab08af045c7..8c03bf286277 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -15,9 +15,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	obrien@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xbill.1
 
 post-install:
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 93fc0d6d5a8c..4bc90e7be192 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -13,13 +13,12 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	janek@gaja.ipan.lublin.pl
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 .if ${MACHINE_ARCH} == "alpha"
 PLIST=		${PKGDIR}/PLIST.alpha
 .endif
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 WRKSRC= ${WRKDIR}/xboing
 MAN1=		xboing.1
 
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index 5684f4a15752..e07031648669 100644
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	mph
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/XCOGITATE_SOURCE
 
 do-build:
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index 460a8af608e8..c77af624bde0 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -13,10 +13,9 @@ DISTFILES=	${PORTNAME}.tgz
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/xdeblo_v1.0
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-patch:
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 25170fdcf169..1316c050b76f 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	ftp://ftp.babafou.eu.org/pub/babafou/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xdemineur.1
 
 .include <bsd.port.mk>
diff --git a/games/xeji/Makefile b/games/xeji/Makefile
index aa151dd8b1e7..782e2a903734 100644
--- a/games/xeji/Makefile
+++ b/games/xeji/Makefile
@@ -14,9 +14,8 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	th@cis.ibaraki.ac.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 WRKSRC=		${WRKDIR}/xeji
diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile
index 9ff05da9bbfe..b0078575d247 100644
--- a/games/xeyesplus/Makefile
+++ b/games/xeyesplus/Makefile
@@ -14,9 +14,8 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 0d2888c5eef6..808175151b9f 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 HAS_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 # xgalaga has a very strange usage of these variables...
 CONFIGURE_ARGS=	--prefix=${X11BASE}/lib/X11/xgalaga \
 		--exec_prefix=${X11BASE}/bin
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 32e86f400ca9..143d992bd196 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/xminehunter
 REQUIRES_MOTIF=	yes
 ALL_TARGET=	xminehunter
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 19343c6910fd..98c73b8f314c 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -13,11 +13,10 @@ DISTNAME=	xnibbles-1.0BETA3
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 ALL_TARGET=	linux
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/xnibbles
 
 MAN6=		xnibbles.6
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 5834e2d2ec65..45f35f52df9d 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=		yes
+USE_XPM=		yes
 MAN6=			xoids.6
 MANCOMPRESSED=		no
 
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index 51cf3bb986b8..661190203783 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
 MAINTAINER=	joerg@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=      yes
+USE_XPM=	yes
 MAN1=		xonix.1
 
 .include <bsd.port.mk>
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 0133ff84579e..fac91481cfcd 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	games/solitaires
 
 MAINTAINER=	mph@freebsd.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 MAN6=		xpat2.6
 
 post-install:
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index d31a93d370ee..8a0b4a30ca55 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	http://chaos2.org/xpuyopuyo/ \
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 .if defined(WITH_GNOME)
 LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
@@ -27,6 +26,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index ee02f06959fc..509052e47379 100644
--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/os/linux/JG/JG-0.9.1/sources/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/xpuzzletama
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index 67ff4ce2466b..50744aeeb930 100644
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.math.lsa.umich.edu/~mattiasj/games/xquarto/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN6=		xquarto.6
 
 pre-configure:
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 51a32793daef..acfe719e228c 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -13,10 +13,10 @@ DISTFILES=		xracer-0.94.tar.gz xracer-data.tar.gz
 
 MAINTAINER=		troll@digitalspark.net
 
-LIB_DEPENDS=		jpeg.9:${PORTSDIR}/graphics/jpeg \
-			GL.14:${PORTSDIR}/graphics/Mesa3
+LIB_DEPENDS=		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_XLIB=		yes
+USE_MESA=		yes
 MAKEFILE=		Makefile
 WRKSRC=			${WRKDIR}/xracer-0.94
 
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 563ec90d355c..a0d4946bf8b6 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -15,9 +15,8 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=		yes
+USE_XPM=		yes
 NO_INSTALL_MANPAGES=	yes
 
 post-patch:
diff --git a/games/xsheep/Makefile b/games/xsheep/Makefile
index 307413e7b23f..d57fba1bd095 100644
--- a/games/xsheep/Makefile
+++ b/games/xsheep/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/xsheep/
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	YES
+USE_XPM=	YES
 WRKSRC=		${WRKDIR}/xsheep
 
 do-install:
diff --git a/games/xshipwars-client/Makefile b/games/xshipwars-client/Makefile
index c90cf642729c..74a0b0539e99 100644
--- a/games/xshipwars-client/Makefile
+++ b/games/xshipwars-client/Makefile
@@ -13,10 +13,9 @@ DISTFILES=	xsw1.23.tgz stimages1.3.tgz
 
 MAINTAINER=	troll@digitalspark.net
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 WRKSRC=		${WRKDIR}/xsw1.23/client
 USE_XLIB=	YES
+USE_XPM=	yes
 USE_GMAKE=	YES
 MAKEFILE=	Makefile.FreeBSD
 
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 31ca682ec390..b43a79d4021f 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://www.techfirm.co.jp/~masaoki/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 # runs fine on ssh connection
 #IS_INTERACTIVE=	YES	# Has to create an app-defaults file
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-lxpg4"
 CONFIGURE_ARGS=	--datadir="${X11BASE}/lib/X11" \
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index 8e9250628a6b..e53e3f626e1a 100644
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@@ -15,9 +15,8 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 MAN6=		xsok.6x
 
 post-install:
diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile
index 73f36ee7daf1..b4ffa9b66a54 100644
--- a/games/xsokoban/Makefile
+++ b/games/xsokoban/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	ftp://ftp.pmg.lcs.mit.edu/pub/xsokoban/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 WRKSRC=		${WRKDIR}/xsokoban
 ALL_TARGET=	xsokoban
 MAN1=		xsokoban.1
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 5553e0d5e0c1..16c3bf8f5bda 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.surfline.ne.jp/hachi/xsoldier/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 1b4308404d6f..29c0746c7656 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	ftp://ftp.leo.org/pub/comp/usenet/comp.sources.x/xteddy/
 
 MAINTAINER=	Isegrim@Wunder-Nett.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 NO_CDROM=	"Can only be distributed for free"
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		xteddy.1
 
 post-install:
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 03d76583f59f..a9adb7295aca 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/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=		xtic.1
 
 .include <bsd.port.mk>
diff --git a/games/xtron/Makefile b/games/xtron/Makefile
index 2b574896c607..be1d9b4e41d2 100644
--- a/games/xtron/Makefile
+++ b/games/xtron/Makefile
@@ -14,9 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc