summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/afterstep-i18n/Makefile3
-rw-r--r--x11-wm/afterstep-stable/Makefile4
-rw-r--r--x11-wm/afterstep/Makefile3
-rw-r--r--x11-wm/ctwm/Makefile2
-rw-r--r--x11-wm/e16/Makefile2
-rw-r--r--x11-wm/enlightenment-devel/Makefile2
-rw-r--r--x11-wm/enlightenment/Makefile2
-rw-r--r--x11-wm/fvwm/Makefile3
-rw-r--r--x11-wm/fvwm2-beta/Makefile3
-rw-r--r--x11-wm/fvwm2-devel/Makefile3
-rw-r--r--x11-wm/fvwm2-i18n/Makefile2
-rw-r--r--x11-wm/fvwm2/Makefile5
-rw-r--r--x11-wm/fvwm24/Makefile5
-rw-r--r--x11-wm/fvwm95-i18n/Makefile2
-rw-r--r--x11-wm/fvwm95/Makefile2
-rw-r--r--x11-wm/gwm/Makefile3
-rw-r--r--x11-wm/icewm-i18n/Makefile4
-rw-r--r--x11-wm/icewm/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile3
-rw-r--r--x11-wm/mlvwm/Makefile3
-rw-r--r--x11-wm/olvwm/Makefile4
-rw-r--r--x11-wm/piewm/Makefile3
-rw-r--r--x11-wm/qvwm/Makefile4
-rw-r--r--x11-wm/scwm/Makefile4
-rw-r--r--x11-wm/tvtwm/Makefile3
-rw-r--r--x11-wm/ude/Makefile4
-rw-r--r--x11-wm/vtwm/Makefile3
-rw-r--r--x11-wm/windowmaker-i18n/Makefile4
-rw-r--r--x11-wm/windowmaker/Makefile4
-rw-r--r--x11-wm/wmakerconf/Makefile2
-rw-r--r--x11-wm/wmcp/Makefile3
-rw-r--r--x11-wm/wmg/Makefile2
-rw-r--r--x11-wm/wmx/Makefile5
-rw-r--r--x11-wm/xfce/Makefile4
-rw-r--r--x11-wm/xfce4/Makefile4
35 files changed, 49 insertions, 64 deletions
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 80f99f162172..41b44b444dff 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -23,12 +23,11 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= issei@jp.FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
EXTRACT_ONLY= ${DISTNAME}.tar.gz \
unofficial-I18N.98Feb27.tar.gz
DIST_SUBDIR= afterstep
USE_X_PREFIX= yes
+USE_XPM= yes
INSTALL_TARGET= install install.man
MANCOMPRESSED= yes
MAN1= afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 \
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 247d6140f14e..681387f6a3ed 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -14,13 +14,13 @@ DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= dima@Chg.ru
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= X_EXTRA_LIBS="-lxpg4"
CONFIGURE_ARGS= --with-png-includes="${LOCALBASE}/include" \
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index ea4abc7ad7f0..ae307cac9d99 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -15,10 +15,9 @@ DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= jfitz@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
NO_LATEST_LINK= yes
USE_X_PREFIX= yes
+USE_XPM= yes
INSTALL_TARGET= install install.man
MANCOMPRESSED= yes
MAN1= afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 5f064f7c0579..26fba88f1157 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -13,13 +13,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
MAINTAINER= torstenb@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
MAKE_ENV= LOCALBASE=${LOCALBASE}
USE_IMAKE= yes
+USE_XPM= yes
MAN1= ctwm.1
post-extract:
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 457533eac3cc..2f7317afd5d0 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -18,12 +18,12 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \
Fnlib.0:${PORTSDIR}/graphics/fnlib \
Imlib.5:${PORTSDIR}/graphics/imlib \
- ttf.4:${PORTSDIR}/print/freetype \
ghttp.1:${PORTSDIR}/www/libghttp \
intl.1:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --with-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 457533eac3cc..2f7317afd5d0 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -18,12 +18,12 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \
Fnlib.0:${PORTSDIR}/graphics/fnlib \
Imlib.5:${PORTSDIR}/graphics/imlib \
- ttf.4:${PORTSDIR}/print/freetype \
ghttp.1:${PORTSDIR}/www/libghttp \
intl.1:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --with-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 457533eac3cc..2f7317afd5d0 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -18,12 +18,12 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \
Fnlib.0:${PORTSDIR}/graphics/fnlib \
Imlib.5:${PORTSDIR}/graphics/imlib \
- ttf.4:${PORTSDIR}/print/freetype \
ghttp.1:${PORTSDIR}/www/libghttp \
intl.1:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --with-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index 4ce49ec7e8c8..f9eead8b2066 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -13,10 +13,9 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-1/ \
MAINTAINER= me@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
NO_LATEST_LINK= yes
USE_IMAKE= yes
+USE_XPM= yes
XMKMF= xmkmf
ALL_TARGET= Makefiles all
MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmClean.1 \
diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index 0b0d10cbc505..347cc5a9ddcd 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -15,9 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= Cy.Schubert@uumail.gov.bc.ca
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
PLIST_SUB= VER=${PORTVERSION}
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 0b0d10cbc505..347cc5a9ddcd 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -15,9 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= Cy.Schubert@uumail.gov.bc.ca
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
PLIST_SUB= VER=${PORTVERSION}
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index c0b2bda7b93e..4e92ea226aa6 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -17,7 +17,7 @@ PATCHFILES= fvwm-${PORTVERSION}-I18N_MB-${FVWM_PATCHVER}.patch
MAINTAINER= matusita@jp.freebsd.org
.if !defined(WITHOUT_XPM)
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
+USE_XPM= yes
.endif
GNU_CONFIGURE= yes
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 49cdb04dbb00..62b0733cda37 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -14,11 +14,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
MAINTAINER= jcwells@u.washington.edu
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--enable-extras --prefix=${PREFIX}
+CONFIGURE_ARGS= --enable-extras --prefix=${PREFIX}
USE_GMAKE= yes
MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 49cdb04dbb00..62b0733cda37 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -14,11 +14,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
MAINTAINER= jcwells@u.washington.edu
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--enable-extras --prefix=${PREFIX}
+CONFIGURE_ARGS= --enable-extras --prefix=${PREFIX}
USE_GMAKE= yes
MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 7447aa98df79..836a37daa1d4 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -25,12 +25,12 @@ PATCHFILES= fvwm95-2.0.43a-Autoconf.I18N.diff.gz
MAINTAINER= ryo2@on.rim.or.jp
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
EXTRACT_ONLY= ${DISTNAME}.tgz ${PKGNAME}-portKit-19981123.tgz
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
--mandir=${MANPREFIX}/man \
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index 45936b993f55..f671b4f03dfe 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -14,11 +14,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dima@Chg.RU
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
--libdir=${LOCALBASE}/lib
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index a26df4e190e8..0cda28c49cad 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= window_managers/gwm
MAINTAINER= markm@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_IMAKE= yes
+USE_XPM= yes
MAN1= gwm.1
.include <bsd.port.mk>
diff --git a/x11-wm/icewm-i18n/Makefile b/x11-wm/icewm-i18n/Makefile
index e6983d6239ca..87ca573c55c7 100644
--- a/x11-wm/icewm-i18n/Makefile
+++ b/x11-wm/icewm-i18n/Makefile
@@ -21,8 +21,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= yatt@msc.biglobe.ne.jp
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
.if defined(WITH_GNOME)
LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs
@@ -31,6 +30,7 @@ LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_XPM= yes
CONFIGURE_ARGS= --enable-i18n --enable-nls
CONFIGURE_ENV= CXXFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 0272c7a3f339..a070c160a562 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -18,12 +18,12 @@ MAINTAINER= nakai@FreeBSD.org
.if defined(GNOME)
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
.endif
-LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-CONFIGURE_ARGS+= --enable-i18n
+USE_XPM= yes
+CONFIGURE_ARGS= --enable-i18n
post-install:
${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 020dbe5acd62..108029e9a29a 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -14,10 +14,9 @@ MASTER_SITE_SUBDIR= jim
MAINTAINER= jim@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_XPM= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index f849fe7c7c52..f211879fe2de 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -15,9 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_IMAKE= yes
+USE_XPM= yes
MAN1= mlvwm.1
MLVWMLIBDIR= ${PREFIX}/lib/X11/mlvwm
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 59e0a4d06187..5098b23418d8 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -21,11 +21,11 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= green@FreeBSD.org
-LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview \
- Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
NO_WRKSUBDIR= yes
USE_IMAKE= yes
+USE_XPM= yes
MAN1= olvwm.1 olvwmrc.1
.include <bsd.port.mk>
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index e0411687f88c..159e4e5169aa 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.crynwr.com/piewm/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_IMAKE= yes
+USE_XPM= yes
MAN1= piewm.1
.include <bsd.port.mk>
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 94defe760f07..7a0ff431d83d 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -12,11 +12,11 @@ MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- Imlib.5:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
esd.2:${PORTSDIR}/audio/esound
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
MAN1= qvwm.1x
diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile
index ca1bbeffa22f..229fecb9dc9d 100644
--- a/x11-wm/scwm/Makefile
+++ b/x11-wm/scwm/Makefile
@@ -14,8 +14,7 @@ MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= guile.6:${PORTSDIR}/lang/guile \
Imlib.5:${PORTSDIR}/graphics/imlib \
- esd.2:${PORTSDIR}/audio/esound \
- Xpm.4:${PORTSDIR}/graphics/xpm
+ esd.2:${PORTSDIR}/audio/esound
RUN_DEPENDS= ${X11BASE}/share/scwm/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -35,6 +34,7 @@ CONFIGURE_ENV+= LIBS="-L${X11BASE}/lib -lxpg4"
.endif
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_XPM= yes
MAN1= scwm.1 scwmexec.1 scwmrepl.1
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 68167dbf74d8..ab07506f6642 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= gpalmer@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
WRKSRC= ${WRKDIR}/tvtwm
USE_IMAKE= yes
+USE_XPM= yes
MAN1= tvtwm.1
.include <bsd.port.mk>
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index c7f9062b8df7..f0582ce6e561 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -15,10 +15,10 @@ DISTNAME= ${PORTNAME}-0.2.7-BETA
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index ce3273c68c5f..d05ccf7c8855 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.visi.com/users/hawkeyd/X/
MAINTAINER= bmah@acm.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_IMAKE= yes
+USE_XPM= yes
MAN1= vtwm.1
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 5ef3ce2a732d..9ef83abb7328 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -14,8 +14,7 @@ DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= mac@jp.freebsd.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- ungif.5:${PORTSDIR}/graphics/libungif \
+LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
@@ -27,6 +26,7 @@ RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR
USE_BZIP2= yes
USE_PERL5= yes
USE_X_PREFIX= yes
+USE_XPM= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 989bc43edfd2..ee77eee9a08a 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -16,8 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- ungif.5:${PORTSDIR}/graphics/libungif \
+LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
@@ -25,6 +24,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_XPM= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index b08f6a0ba5a9..123ad2e48f0f 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker \
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
Imlib.5:${PORTSDIR}/graphics/imlib \
PropList.2:${PORTSDIR}/devel/libPropList \
- Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
png.4:${PORTSDIR}/graphics/png \
@@ -33,6 +32,7 @@ USE_GMAKE= yes
USE_BZIP2= yes
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
+USE_XPM= yes
CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
.if exists(${X11BASE}/bin/gnome-config)
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index 5f0a6d36f732..ec55329a0969 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES= http://users.linuxbox.com/~bac/src/wmcp/
MAINTAINER= jim@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_XPM= yes
pre-build:
(cd ${WRKSRC} && ${GMAKE} clean)
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 22cd4bc14000..7842a2c982e6 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -15,7 +15,6 @@ DISTNAME= wmG-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \
- Xpm.4:${PORTSDIR}/graphics/xpm \
esd.2:${PORTSDIR}/audio/esound \
gnome.4:${PORTSDIR}/x11/gnomelibs
@@ -23,6 +22,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
USE_X_PREFIX= yes
+USE_XPM= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOLFILES= configure
diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile
index e92d73d3aaa4..542eee4be4ab 100644
--- a/x11-wm/wmx/Makefile
+++ b/x11-wm/wmx/Makefile
@@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-5sec6
MAINTAINER= sec@42.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-
USE_X_PREFIX= yes
-GNU_CONFIGURE= YES
+USE_XPM= yes
+GNU_CONFIGURE= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 4ca5aea3c125..d66cb6ddba66 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -12,14 +12,14 @@ MASTER_SITES= http://www.xfce.org/archive/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- Imlib.5:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
RUN_DEPENDS= ${LOCALBASE}/bin/esdplay:${PORTSDIR}/audio/esound
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 4ca5aea3c125..d66cb6ddba66 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -12,14 +12,14 @@ MASTER_SITES= http://www.xfce.org/archive/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- Imlib.5:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
RUN_DEPENDS= ${LOCALBASE}/bin/esdplay:${PORTSDIR}/audio/esound
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
+USE_XPM= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \