32 files changed, 38 insertions, 53 deletions

diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index ebb52e800fdd..17aa073a025e 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -12,11 +12,11 @@ MASTER_SITES=	http://download.sourceforge.net/aterm/
 
 MAINTAINER=	jim@FreeBSD.org
 
-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 \
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index e0ab0f59206f..bef70ce8db4c 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -15,9 +15,8 @@ EXTRACT_SUFX=	-athena-3.0.tar.gz
 
 MAINTAINER=     shanee@augusta.de
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 MAN1=		bricons.1
 
 post-patch:
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 30d956348644..5eca7664198c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	gnome-libs-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		ORBit.2:${PORTSDIR}/devel/ORBit \
 		esd.2:${PORTSDIR}/audio/esound
 
@@ -23,6 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 30d956348644..5eca7664198c 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	gnome-libs-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		ORBit.2:${PORTSDIR}/devel/ORBit \
 		esd.2:${PORTSDIR}/audio/esound
 
@@ -23,6 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index ad2be10d63cc..9864f8a8794f 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 USE_XLIB=	yes
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index cff80a6652b5..9658bb835c33 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
+USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 30d956348644..5eca7664198c 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	gnome-libs-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		ORBit.2:${PORTSDIR}/devel/ORBit \
 		esd.2:${PORTSDIR}/audio/esound
 
@@ -23,6 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/x11/login.app/Makefile b/x11/login.app/Makefile
index c2c8705e126b..0fe9ef9d4fea 100644
--- a/x11/login.app/Makefile
+++ b/x11/login.app/Makefile
@@ -14,10 +14,10 @@ DISTNAME=	Login.app-2.0.0-Alpha-4
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	wraster.3:${PORTSDIR}/x11-wm/windowmaker \
-		PropList.2:${PORTSDIR}/devel/libPropList \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		PropList.2:${PORTSDIR}/devel/libPropList
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 ALL_TARGET=	Login
 
diff --git a/x11/offix-execute/Makefile b/x11/offix-execute/Makefile
index ed94e0dc718a..42dd6c2482c9 100644
--- a/x11/offix-execute/Makefile
+++ b/x11/offix-execute/Makefile
@@ -14,11 +14,11 @@ DISTNAME=	Execute-${PORTVERSION}
 
 MAINTAINER=	ruslan@shevchenko.kiev.ua
 
-LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
+USE_XPM=	YES
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 47127029066a..483d92ade470 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -22,9 +22,8 @@ PATCH_DIST_STRIP+=      -p1
 
 MAINTAINER=	lioux@linf.unb.br
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-utmp --enable-wtmp \
 		--with-xpm --enable-xpm-background --enable-transparency
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 47127029066a..483d92ade470 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -22,9 +22,8 @@ PATCH_DIST_STRIP+=      -p1
 
 MAINTAINER=	lioux@linf.unb.br
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-utmp --enable-wtmp \
 		--with-xpm --enable-xpm-background --enable-transparency
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 47127029066a..483d92ade470 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -22,9 +22,8 @@ PATCH_DIST_STRIP+=      -p1
 
 MAINTAINER=	lioux@linf.unb.br
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-utmp --enable-wtmp \
 		--with-xpm --enable-xpm-background --enable-transparency
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index afc0329ad4a0..5e76c7792afc 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -13,10 +13,10 @@ MASTER_SITE_SUBDIR=	X11/desktop
 
 MAINTAINER=	steve@farrell.org
 
-LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms
 
 USE_IMAKE=	yes
+USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 pre-install:
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 79f63ebc1c62..165eb0c2193a 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR=	jim
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 do-build:
 	@(cd ${WRKSRC} && make)
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index 0459aa4357c2..360fba55c771 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -13,10 +13,9 @@ DISTNAME=	wmMatrix-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 ALL_TARGET=	clean all
 
 do-install:
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 37084defa693..53369d9104bc 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -14,9 +14,9 @@ MASTER_SITES= 	ftp://ftp.kddlabs.co.jp/.10/X11/acontrib/wterm/ \
 MAINTAINER=	cpiazza@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-transparency --enable-xpm-background \
 		--disable-delete-key --disable-backspace-key \
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 37b841fc3f47..d2afd09fe32b 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
 
 MAINTAINER=	sakai@miya.ee.kagu.sut.ac.jp
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
-
 ALL_TARGET=	xballoon
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN1=		xballoon.1
 MANCOMPRESSED=	yes
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 2ee5b46d1033..081b7a0657ae 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -16,9 +16,8 @@ DISTNAME=	XBanner${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 #USE_IMAKE=	yes
 
 post-patch:
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index c07845c8baeb..273c013e484e 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=		gpalmer@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=		yes
+USE_XPM=		yes
 WRKSRC=			${WRKDIR}/xdtm
 MAN1=			xdtm.1
 
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile
index 048cd8e0db3e..0d2cd7ae4da3 100644
--- a/x11/xfedor/Makefile
+++ b/x11/xfedor/Makefile
@@ -14,11 +14,10 @@ CATEGORIES=	x11
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/x11/util/
 DISTNAME=	${PORTNAME}
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 MAINTAINER=     ache@FreeBSD.org
 
 USE_IMAKE=      yes
+USE_XPM=	yes
 
 XFHELP= ${X11BASE}/lib/X11/xfedor # See patches too
 XCAT1= ${X11BASE}/man/cat1
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 160001694bdb..59356da485aa 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --without-gl --without-motif --without-sx \
 		--without-editres --without-dtsaver --without-rplay \
@@ -27,6 +25,7 @@ CONFIGURE_ARGS+= --enable-kerberos4
 CONFIGURE_ARGS+= --enable-kerberos5
 .endif
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 MAN1=		xlock.1
 
 .include <bsd.port.pre.mk>
@@ -38,7 +37,7 @@ MAN1=		xlock.1
 WITH_MESAGL?=	yes
 .if ${WITH_MESAGL} == yes
 CONFIGURE_ARGS+=	--with-mesagl
-LIB_DEPENDS+=		GL.14:${PORTSDIR}/graphics/Mesa3
+USE_MESA=	yes
 .else
 CONFIGURE_ARGS+=	--without-mesagl
 .endif
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 7be3f45f1607..4feafb4627c8 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	http://www.rostock.zgdv.de/~runge/xlupe/
 
 MAINTAINER=	runge@rostock.zgdv.de
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
-
 USE_IMAKE=	yes
+USE_XPM=	yes
 REQUIRES_MOTIF=	no
 
 # you can build it with a motif interface as well!
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 70f81df9d30a..2e18e9df0d8e 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
 
 MAINTAINER=	sakai@miya.ee.kagu.sut.ac.jp
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 ALL_TARGET=	xmangekyou
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN1=		xmangekyou.1
 MANCOMPRESSED=	yes
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index ea63e517f2d5..dcf62e58e024 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		GL.14:${PORTSDIR}/graphics/Mesa3
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm
 USE_X_PREFIX=	yes
+USE_XPM=	yes
+USE_MESA=	yes
 MAN1= 		attraction.1 blitspin.1 bouboule.1 braid.1 \
 		bsod.1 bubbles.1 critical.1 decayscreen.1 \
 		deco.1 distort.1 drift.1 epicycle.1 flag.1 flame.1 \
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index 863a9e4ccfd0..7aa131be3f1b 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
 
 MAINTAINER=	sakai@miya.ee.kagu.sut.ac.jp
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
-
 ALL_TARGET=	xstarroll
 
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 
 MAN1=		xstarroll.1
 MANCOMPRESSED=	yes