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)

13 files changed, 23 insertions, 15 deletions

diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index b6da9df3803c..6d9ba0fbef1d 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Wnn6-lib
 PORTVERSION=	2000.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
 DISTNAME=	Wnn6-SDK
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index 25c259b4cb7c..78daeef1d0cc 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Wnn7-lib
 PORTVERSION=	2001.10.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/
 DISTNAME=	Wnn7SDK
diff --git a/japanese/chimera/Makefile b/japanese/chimera/Makefile
index 61b702119510..e660d90f8b82 100644
--- a/japanese/chimera/Makefile
+++ b/japanese/chimera/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chimera
 PORTVERSION=	1.70p1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
 DISTNAME=	${PORTNAME}-${PREV_VERSION}
@@ -24,6 +24,7 @@ COMMENT=	X/Athena World-Wide Web client + Japanese patch
 PREV_VERSION=	${PORTVERSION:S/p1/p0/}
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		chimera.1
 
 pre-configure:
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 7854957a8292..41d5dd35efb9 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emcws
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	japanese editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -49,7 +49,7 @@ CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 
 .if !defined(NO_X11)
 CONFIGURE_ARGS=	--with-x-toolkit --with-pop
-USE_X11=	x11
+USE_XORG=	x11 xaw
 .else
 CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 96390df01c86..7db2f2051666 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gxditview
 PORTVERSION=	1.18.1
 DISTVERSIONSUFFIX=	.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/groff
@@ -29,6 +29,7 @@ CONFLICTS=	gxditview-[1-9]*
 
 GNU_CONFIGURE=	yes
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xp xpm xt
 USE_ICONV=	yes
 
 CONFIGURE_ARGS=	--program-prefix=g --enable-multibyte
diff --git a/japanese/kdrill/Makefile b/japanese/kdrill/Makefile
index 574e2e3b0f52..4b3b5ca1b9be 100644
--- a/japanese/kdrill/Makefile
+++ b/japanese/kdrill/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdrill
 PORTVERSION=	6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.bolthole.com/kdrill/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -22,6 +22,7 @@ MAN1=		kdrill.1 makedic.1 makeedict.1
 
 MANCOMPRESSED=	yes
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 RUN_DEPENDS+=	xjdic:${PORTSDIR}/japanese/edict
 
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 64cd6db0b376..de15d30c6a68 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kinput2
 PORTVERSION=	3.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -16,6 +16,7 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A Japanese text input server for X11 applications
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 SUB_FILES=	Kinput2.conf
 PLIST_FILES=	${PLIST_ALL}
 
diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index e0f63967fb0c..8faf2c639139 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sj3
 PORTVERSION=	2.0.1.20
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/nork
 PKGNAMESUFFIX=	-lib
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index 1ef74f40c900..3b25776599cc 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sj3
 PORTVERSION=	2.0.1.20
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/nork
 PKGNAMESUFFIX=	-server
diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 302f43bd375e..5d0eb3a42706 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skkinput
 PORTVERSION=	2.06.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	skkinput2/6273
@@ -16,6 +16,7 @@ MAINTAINER=	koma2@lovepeers.org
 COMMENT=	An SKK-like Japanese input method for X11
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xext xt xmu
 
 OPTIONS=	DBSKKD "Use ja-dbskkd-cdb as skkserver" off \
 		RSKKSERV "Use ja-rskkserv as skkserver" off
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index 670d6da9d57a..ba2c48001eb4 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skkinput3
 PORTVERSION=	3.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://downloads.sourceforge.jp/skkinput3/2222/
 DISTNAME=	skkinput-${PORTVERSION}
@@ -15,7 +15,8 @@ DISTNAME=	skkinput-${PORTVERSION}
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	An SKK-like Japanese input method for X11
 
-USE_IMAKE=		yes
+USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xext xmu xt
 
 OPTIONS=	DBSKKD "Use ja-dbskkd-cdb as skkserver" off \
 		RSKKSERV "Use ja-rskkserv as skkserver" off \
diff --git a/japanese/xmsgsaver/Makefile b/japanese/xmsgsaver/Makefile
index c2b293da005b..8b3006834ffc 100644
--- a/japanese/xmsgsaver/Makefile
+++ b/japanese/xmsgsaver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmsgsaver
 PORTVERSION=	1.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	http://www19.xdsl.ne.jp/~cdr/soft/dl/
 
@@ -18,5 +18,6 @@ LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
 MAN1=		xmsgsaver.1
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xscrnsaver xt
 
 .include <bsd.port.mk>
diff --git a/japanese/xshodo/Makefile b/japanese/xshodo/Makefile
index cd02dc417509..ae13fc3061f8 100644
--- a/japanese/xshodo/Makefile
+++ b/japanese/xshodo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xshodo
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://cclub.cc.tut.ac.jp/pub/xwin/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A paint tool for Shodo, the Japanese traditional writing character
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xshodo.1
 PLIST_FILES=	bin/xshodo