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)

8 files changed, 16 insertions, 8 deletions

diff --git a/deskutils/mrundlg/Makefile b/deskutils/mrundlg/Makefile
index 7b3c2dacf2d6..fa58c7f36cca 100644
--- a/deskutils/mrundlg/Makefile
+++ b/deskutils/mrundlg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrundlg
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://matt.sixxgate.com/files/
 
@@ -17,6 +17,7 @@ COMMENT=	An application / program launcher for Motif
 USE_MOTIF=	yes
 USE_BZIP2=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xmu xt
 MAN1=		mrundlg.1
 MANCOMPRESSED=	yes
 
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index b4b32d91ad13..8b62ed162ae2 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sliderule
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	joerg
@@ -17,6 +17,7 @@ MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	The part of X11R3's xcalc featuring a slide rule
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		sliderule.1
 PLIST_FILES=	bin/sliderule
 
diff --git a/deskutils/xcalendar/Makefile b/deskutils/xcalendar/Makefile
index 93711082cf3c..afadd347afe0 100644
--- a/deskutils/xcalendar/Makefile
+++ b/deskutils/xcalendar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcalendar
 PORTVERSION=	4.0.2008
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 DISTNAME=	${PORTNAME}-4.0+i18n
@@ -18,6 +18,7 @@ COMMENT=	A calendar with a notebook for X11 (internationalized version)
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 USE_GMAKE=	yes
 MAKE_ENV=	FILESDIR=${FILESDIR}
 ALL_TARGET=	all XCal-uj.ad xcalendar-uj.hlp xcalendar-uj.man
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index 31dcf1a5a1c5..a8b366b3dc14 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmaddressbook
 PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	office
@@ -18,6 +18,7 @@ COMMENT=	X11/Motif-based addressbook program
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xext xi xp xt oldx
 WRKSRC=		${WRKDIR}/xmaddressbook
 MAN1=		xmaddressbook.1
 
diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile
index 53d4747c9566..efff342db070 100644
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmdiary
 PORTVERSION=	3.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	office
@@ -20,6 +20,7 @@ NO_CDROM=	"Don't sell for profit"
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 USE_MOTIF=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xp xpm xt
 MAN1=		xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \
 		xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \
 		xdrestore.1
diff --git a/deskutils/xpostit/Makefile b/deskutils/xpostit/Makefile
index a3bbdd7666bc..25973414764f 100644
--- a/deskutils/xpostit/Makefile
+++ b/deskutils/xpostit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpostit
 PORTVERSION=	3.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -17,6 +17,7 @@ MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	PostIt (R) messages onto your X11 screen
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 WRKSRC=		${WRKDIR}/xpostit
 MAN1=		xpostit.1
 
diff --git a/deskutils/xpostitPlus/Makefile b/deskutils/xpostitPlus/Makefile
index ed10c1971163..0f4e48d204a1 100644
--- a/deskutils/xpostitPlus/Makefile
+++ b/deskutils/xpostitPlus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XPostitPlus
 PORTVERSION=	2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	office
@@ -16,6 +16,7 @@ MAINTAINER=	ports2@dclg.ca
 COMMENT=	PostIt (R) messages onto your X11 screen
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xpostit+.1
 
 .include <bsd.port.mk>
diff --git a/deskutils/xrolo/Makefile b/deskutils/xrolo/Makefile
index 92936efd49b0..467f9bb600a6 100644
--- a/deskutils/xrolo/Makefile
+++ b/deskutils/xrolo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrolo
 PORTVERSION=	2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.uni-potsdam.de/pub/X11/open-look/ \
 		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
@@ -22,6 +22,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 WRKSRC=		${WRKDIR}/xrolo
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xrolo.1
 PLIST_FILES=	bin/xrolo