Convert most of remaining ports that depend on xorg-libraries to

modular xorg.

- supply corresponding USE_XORG for all imake-using ports that need it
- USE_IMAKE no longer implies USE_XLIB in absence of USE_XORG
- retire USE_X_PREFIX which is not really used anywhere after the
  above change
- a few minor nits like whitespace and SF macro

Tested by:	2 tinderbox runs by pav
Approved by:	portmgr (pav)

7 files changed, 13 insertions, 8 deletions

diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index adac9e8f6d3..9cee93f7897 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libworkman
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jim
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index c498f5afcd7..1e7eeb6a4f2 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	timidity++
 PORTVERSION=	2.13.2
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES+=	audio
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=timidity
@@ -56,7 +56,7 @@ MAN5=		timidity.cfg.5
 CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic
 .else
 CONFIGURE_ARGS+=--with-x    --enable-spectrogram  --enable-wrd  --enable-dynamic
-USE_XLIB=	yes
+USE_XORG=	x11 xext
 LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png
 .endif
 
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 5656e1021d9..2fa0de882da 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	workman
 PORTVERSION=	1.3a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications/WorkMan
@@ -20,6 +20,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/workman
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		workman.1
 MAN5=		workmandb.5
 PLIST_FILES=	bin/workman lib/help/workman.info
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index bce4e6fd838..00103205592 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wsoundprefs
 PORTVERSION=	1.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	WSoundPrefs-${PORTVERSION}
@@ -21,6 +21,7 @@ LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 NO_INSTALL_MANPAGES=yes
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 8117705f02e..fc9f07f7401 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmcd
 PORTVERSION=	3.3.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/
 
@@ -20,6 +20,7 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xaw xmu xp xpm xt sm ice
 MAN1=		cda.1 xmcd.1
 MANCOMPRESSED=	no
 PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH}
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 808e4c5420d..3211a4ba97d 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmix
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/mixers
@@ -21,6 +21,7 @@ COMMENT=	Mixer for X Window System
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xmix
+USE_XORG=	x11 xext xmu xaw xt sm ice
 
 MAN1=		xmix.1
 PLIST_FILES=	bin/xmix lib/X11/app-defaults/XMix
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index f0788321ef1..10be67451f9 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmmix
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmmix/1.2.2/src/
 
@@ -18,6 +18,7 @@ WRKSRC=		${WRKDIR}/xmmix-1.2
 
 USE_IMAKE=	yes
 USE_MOTIF=	yes
+USE_XORG=	x11 xext sm ice xt xp
 
 MAN1=		xmmix.1