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)

2 files changed, 3 insertions, 2 deletions

diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index 9247b4cb21d9..1542fd9a4773 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hanterm
 PORTVERSION=	3.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean x11
 MASTER_SITES=	http://hanterm.org/download/ \
 		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
@@ -19,6 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean
 
 CONFLICTS=	ko-hanterm-xf-2.*
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 NO_INSTALL_MANPAGES= yes
 ALL_TARGET=	hanterm
 
diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile
index 31c056dbe560..7d0cf25b044c 100644
--- a/korean/johabfonts/Makefile
+++ b/korean/johabfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	johabfonts
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	http://hanterm.org/download/font/
 DISTNAME=	hanterm-font-${PORTVERSION}