aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/asapm/Makefile5
-rw-r--r--sysutils/asfsm/Makefile3
-rw-r--r--sysutils/asmem/Makefile3
-rw-r--r--sysutils/asmon/Makefile3
-rw-r--r--sysutils/bbapm/Makefile1
-rw-r--r--sysutils/disktool/Makefile4
-rw-r--r--sysutils/gkfreq/Makefile3
-rw-r--r--sysutils/gkleds2/Makefile1
-rw-r--r--sysutils/gkrellmouse/Makefile1
-rw-r--r--sysutils/gkrellmwho/Makefile1
-rw-r--r--sysutils/glload/Makefile1
-rw-r--r--sysutils/gnomefind/Makefile1
-rw-r--r--sysutils/gtk-imonc/Makefile1
-rw-r--r--sysutils/gtoaster/Makefile1
-rw-r--r--sysutils/ticker.app/Makefile5
-rw-r--r--sysutils/wmapm/Makefile5
-rw-r--r--sysutils/wmapmload/Makefile5
-rw-r--r--sysutils/wmbattery/Makefile3
-rw-r--r--sysutils/wmbsdbatt/Makefile5
-rw-r--r--sysutils/wmcube-gdk/Makefile3
-rw-r--r--sysutils/wmcube/Makefile3
-rw-r--r--sysutils/wmdiskmon/Makefile5
-rw-r--r--sysutils/wmfire/Makefile1
-rw-r--r--sysutils/wmflame/Makefile5
-rw-r--r--sysutils/wmfsm/Makefile5
-rw-r--r--sysutils/wmhm/Makefile5
-rw-r--r--sysutils/wminet/Makefile5
-rw-r--r--sysutils/wmlmmon/Makefile3
-rw-r--r--sysutils/wmlongrun/Makefile5
-rw-r--r--sysutils/wmmemfree/Makefile2
-rw-r--r--sysutils/wmmemmon/Makefile5
-rw-r--r--sysutils/wmpccard/Makefile3
-rw-r--r--sysutils/wmshutdown/Makefile3
-rw-r--r--sysutils/wmtop/Makefile5
-rw-r--r--sysutils/wmupmon/Makefile5
-rw-r--r--sysutils/wmzazof/Makefile5
-rw-r--r--sysutils/xsu/Makefile1
-rw-r--r--sysutils/xsysstats/Makefile4
38 files changed, 43 insertions, 82 deletions
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 3e68b2c563d6..6cae038fed76 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asapm
PORTVERSION= 3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/
@@ -16,8 +16,7 @@ COMMENT= Laptop battery status display for X11
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
INSTALL_TARGET= install install.man
diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile
index 29e9e6377dc0..7694fd845718 100644
--- a/sysutils/asfsm/Makefile
+++ b/sysutils/asfsm/Makefile
@@ -14,8 +14,7 @@ DISTNAME= asfsm-1.0pre15
MAINTAINER= ports@FreeBSD.org
COMMENT= File-system monitor for the AfterStep window manager
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm x11 sm ice xext xaw xt
GNU_CONFIGURE= yes
MAN1= asfsm.1
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index 4fa57ae01304..e21a255d7902 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.tigr.net/afterstep/download/asmem/
MAINTAINER= ports@FreeBSD.org
COMMENT= An AfterStep look-n-feel memory utilization monitor
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xpm \
--with-xpm-includes=${X11BASE}/include \
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index d677295de11f..b70d644c03c0 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= apps/asmon
MAINTAINER= ports@FreeBSD.org
COMMENT= A swallowable applet monitors the CPU usage, memory and swap, etc
-USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XORG= xpm x11
BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon
CFLAGS+= -I${X11BASE}/include
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 7b16bee5cb04..0c2808c98a32 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -21,7 +21,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= APM monitor for the Blackbox slit
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/sysutils/disktool/Makefile b/sysutils/disktool/Makefile
index b7d708d62041..ccd70b6cfecd 100644
--- a/sysutils/disktool/Makefile
+++ b/sysutils/disktool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= disktool
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://ftp.auxio.org/pub/mirrors/step.polymtl.ca/pub/Xview/apps/disktool/
DISTNAME= disktool-2.0c
@@ -17,8 +17,6 @@ COMMENT= XView sysadmin tool for monitoring diskfull situations
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
-USE_X_PREFIX= yes
-
WRKSRC= ${WRKDIR}/${DISTNAME}
ALL_TARGET= disktool
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index 6a929bbdd821..08dea43ee9c4 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -8,7 +8,6 @@
PORTNAME= gkfreq
PORTVERSION= 1.0
PORTREVISION= 1
-#PORTREVISION= 0
CATEGORIES= sysutils
DISTNAME= gkrellm-gkfreq-${PORTVERSION}
MASTER_SITES= http://www.peakunix.net/downloads/
@@ -21,6 +20,4 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
PLIST_FILES= libexec/gkrellm2/plugins/gkfreq.so
-USE_X_PREFIX= yes
-
.include <bsd.port.mk>
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index f5be829a5350..6ed03b9276be 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -18,7 +18,6 @@ COMMENT= GKrellM Leds for CapsLock, NumLock and ScrollLock
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
-USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/sysutils/gkrellmouse/Makefile b/sysutils/gkrellmouse/Makefile
index 262a82335bcf..15057aa65a48 100644
--- a/sysutils/gkrellmouse/Makefile
+++ b/sysutils/gkrellmouse/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
PLIST_FILES= libexec/gkrellm/plugins/gkmouse.so
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
-USE_X_PREFIX= yes
USE_GNOME= imlib
USE_GMAKE= yes
diff --git a/sysutils/gkrellmwho/Makefile b/sysutils/gkrellmwho/Makefile
index f4b4e83d5367..a360bf1180ba 100644
--- a/sysutils/gkrellmwho/Makefile
+++ b/sysutils/gkrellmwho/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
-USE_X_PREFIX= yes
USE_GNOME= imlib
USE_GMAKE= yes
ALL_TARGET= #empty
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index 96a8312abb39..c8363ba0e0ab 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_X_PREFIX= yes
USE_GL= yes
MAKEFILE= Makefile.FreeBSD
MAKE_ARGS= CC="${CC}" \
diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index 5a77f08ce2cb..521703ca4700 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -16,7 +16,6 @@ DISTNAME= gnome-find-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical version of the GNU "find" utility
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libglade
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index d46b2166ebc4..be9634d8a94e 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GNOME= gtk20 gnomehier
-USE_XLIB= yes
post-patch:
@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>|' \
diff --git a/sysutils/gtoaster/Makefile b/sysutils/gtoaster/Makefile
index a60b82d32809..2e88cbfc5a98 100644
--- a/sysutils/gtoaster/Makefile
+++ b/sysutils/gtoaster/Makefile
@@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= bin/gtoaster
USE_GETTEXT= yes
-USE_X_PREFIX= yes
WANT_GNOME= yes
USE_GNOME= gnomehack gnometarget gtk12
USE_GMAKE= yes
diff --git a/sysutils/ticker.app/Makefile b/sysutils/ticker.app/Makefile
index 1adff1ba8ec6..23293d5e52a4 100644
--- a/sysutils/ticker.app/Makefile
+++ b/sysutils/ticker.app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ticker.app
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://seiichisato.jp/dockapps/src/
@@ -15,8 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Ticker dockapp for Window Maker
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index 71e47e51d82c..80090eeb3794 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmapm
PORTVERSION= 3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://dockapps.org/files/18/25/
@@ -18,8 +18,7 @@ ONLY_FOR_ARCHS= i386
WRKSRC= ${WRKDIR}/${DISTNAME}/wmapm
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= wmapm.1
PLIST_FILES= bin/wmapm
diff --git a/sysutils/wmapmload/Makefile b/sysutils/wmapmload/Makefile
index 3bf69f48dc3b..2f3e2912487d 100644
--- a/sysutils/wmapmload/Makefile
+++ b/sysutils/wmapmload/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmapmload
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
@@ -15,8 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= APM battery status monitor dockapp with a similar look to wmcpuload
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=""
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index afa244c7acca..7a35a2ac343f 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -17,8 +17,7 @@ COMMENT= Window Maker dockapp that displays info about your battery
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib \
--x-includes=${X11BASE}/include
diff --git a/sysutils/wmbsdbatt/Makefile b/sysutils/wmbsdbatt/Makefile
index 7d9c27eb571b..7b0a18134dfa 100644
--- a/sysutils/wmbsdbatt/Makefile
+++ b/sysutils/wmbsdbatt/Makefile
@@ -6,15 +6,14 @@
PORTNAME= wmbsdbatt
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://homepage.univie.ac.at/l.ertl/wmbsdbatt/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Dockapp for battery & temperature monitoring through ACPI
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
PLIST_FILES= bin/wmbsdbatt
diff --git a/sysutils/wmcube-gdk/Makefile b/sysutils/wmcube-gdk/Makefile
index 4c35f6a70aab..292e8f612b91 100644
--- a/sysutils/wmcube-gdk/Makefile
+++ b/sysutils/wmcube-gdk/Makefile
@@ -16,8 +16,7 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= wmcube-gdk is a modified version of the dockapp wmCube
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GNOME= gtk12
MAKEFILE= Makefile.FREEBSD
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index efb1ab515dfc..25829a7e2d77 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -19,8 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Window Maker dockapp that displays cpu load and a realtime 3d object
WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME}
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAKEFILE= Makefile.FREEBSD
do-install:
diff --git a/sysutils/wmdiskmon/Makefile b/sysutils/wmdiskmon/Makefile
index 99d5c0e4ee3d..fda10d87a0e0 100644
--- a/sysutils/wmdiskmon/Makefile
+++ b/sysutils/wmdiskmon/Makefile
@@ -7,15 +7,14 @@
PORTNAME= wmdiskmon
PORTVERSION= 0.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
MAINTAINER= ports@FreeBSD.org
COMMENT= Disk usage monitor dockapp
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XPM= x11 xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=""
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 04aaa83714b2..08cb8504efac 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -16,7 +16,6 @@ COMMENT= Window Maker dock app showing load average as a flame
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
-USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/wmflame/Makefile b/sysutils/wmflame/Makefile
index 976ae0c3d285..d6cc2e2abe8e 100644
--- a/sysutils/wmflame/Makefile
+++ b/sysutils/wmflame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmflame
PORTVERSION= 0.60
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://web.novalis.org/programs/
@@ -17,8 +17,7 @@ COMMENT= A dockapp that shows the load average as a flame
PLIST_FILES= bin/wmflame
WRKSRC= ${WRKDIR}/wmflame.app/${PORTNAME}
USE_GMAKE= yes
-USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XORG= x11 xpm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmflame ${PREFIX}/bin
diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile
index 5ad949c7f535..b8d68dc609fa 100644
--- a/sysutils/wmfsm/Makefile
+++ b/sysutils/wmfsm/Makefile
@@ -7,15 +7,14 @@
PORTNAME= wmfsm
PORTVERSION= 0.34
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.cs.ubc.ca/~cmg/
MAINTAINER= ports@FreeBSD.org
COMMENT= Displays filesystem usage of mountpoints in a nice WindowMaker dockapp
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile
index a361f7c4c087..dea47bc7054c 100644
--- a/sysutils/wmhm/Makefile
+++ b/sysutils/wmhm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmhm
PORTVERSION= 1.46
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils windowmaker
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= fenner
@@ -21,8 +21,7 @@ GNU_CONFIGURE= yes
MAN8= wmhm.8
MANCOMPRESSED= yes
PLIST_FILES= bin/wmhm
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= "requires speaker(4)"
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
diff --git a/sysutils/wminet/Makefile b/sysutils/wminet/Makefile
index b94866036ca3..c2c7ae19d50a 100644
--- a/sysutils/wminet/Makefile
+++ b/sysutils/wminet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wminet
PORTVERSION= 2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
http://mirror2.unixfreunde.de/
@@ -17,8 +17,7 @@ COMMENT= Window Maker dockable inetd monitor
WRKSRC= ${WRKDIR}/wminet.app/wminet
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
post-install:
.if !defined(NOPORTDOCS)
diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile
index 7c23832dbfa3..d596f086a81d 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -16,8 +16,7 @@ COMMENT= WM dock app to display info from MB power management controllers
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xpm-includes=${X11BASE}/include \
diff --git a/sysutils/wmlongrun/Makefile b/sysutils/wmlongrun/Makefile
index 78f8646d2009..bf5b89dcf394 100644
--- a/sysutils/wmlongrun/Makefile
+++ b/sysutils/wmlongrun/Makefile
@@ -7,15 +7,14 @@
PORTNAME= wmlongrun
PORTVERSION= 0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://seiichisato.jp/dockapps/src/
MAINTAINER= ports@FreeBSD.org
COMMENT= A dockapp to monitor the LongRun(tm) status on Crusoe
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index e5874e9de8a9..d4d4b2bef224 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -17,7 +17,7 @@ COMMENT= Memory and swap monitoring dockapp
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/wmmemfree
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index 27addb9b95e7..b24973945560 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmmemmon
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://seiichisato.jp/dockapps/src/
@@ -15,8 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Mem/Swap monitoring dockapp for WindowMaker
#USE_BZIP2= yes # ATM the .bz2 distfile is broken.
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index a25860eadb00..85f71ad230b8 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.sra.co.jp/people/m-kasahr/wmpccard/src/
MAINTAINER= ports@FreeBSD.org
COMMENT= PCcard monitor for FreeBSD + PAO
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= x11 xpm
MAN1= wmpccard.1.gz
NOMANCOMPRESS= yes
PLIST_FILES= bin/wmpccard
diff --git a/sysutils/wmshutdown/Makefile b/sysutils/wmshutdown/Makefile
index ec6bfbdc5d7f..f30d1b3c663b 100644
--- a/sysutils/wmshutdown/Makefile
+++ b/sysutils/wmshutdown/Makefile
@@ -17,8 +17,7 @@ COMMENT= Window Maker dock application to shutdown or reboot
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
do-install:
@${ECHO} "wmShutdown -- Rafael V. Aroca <rafael@linuxqos.cjb.net>"
diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile
index 29d359312324..14b4db548e62 100644
--- a/sysutils/wmtop/Makefile
+++ b/sysutils/wmtop/Makefile
@@ -6,7 +6,7 @@
PORTNAME= wmtop
PORTVERSION= 0.84
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://ftp1.sourceforge.net/wmtop/ \
${MASTER_SITE_SOURCEFORGE}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Windowmaker dock app to display top 3 CPU consuming processes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm x11
ALL_TARGET= freebsd
MAN1= wmtop.1
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 52fe9d7867a6..2aa18ae4ffe3 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmupmon
PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://j-z-s.com/projects/downloads/
@@ -15,8 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An uptime showing dockapp with a similar look to wmcpuload
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_AUTOTOOLS= automake:15 autoheader:261
CONFIGURE_ARGS= --program-prefix=""
diff --git a/sysutils/wmzazof/Makefile b/sysutils/wmzazof/Makefile
index b6edce0ac116..f189036afd62 100644
--- a/sysutils/wmzazof/Makefile
+++ b/sysutils/wmzazof/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmzazof
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://members.chello.be/cr49940/wmzazof/
@@ -16,8 +16,7 @@ COMMENT= A simple dockapp that displays the uptime, free and used memory
LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/wmzazof ${PREFIX}/bin
diff --git a/sysutils/xsu/Makefile b/sysutils/xsu/Makefile
index d76a18179e07..39bc7a7464a3 100644
--- a/sysutils/xsu/Makefile
+++ b/sysutils/xsu/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= xsu
MAINTAINER= ports@FreeBSD.org
COMMENT= Xsu runs commands as root after prompting for the root password
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs
CONFIGURE_ARGS= --su-pwd-out="Password:"
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index 1c1d0f7baec8..05e26a7cef3f 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xsysstats
PORTVERSION= 1.51
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
@@ -19,7 +19,7 @@ COMMENT= A system information display tool
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= x11
MAN1= xsysstats.1
ALL_TARGET= xsysstats