- Remove unneeded dependency from gtk12/gtk20 [1]

- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
	Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
	ehaupt, nox, itetcu, flz, pav

PR:		116263
Tested on:	pointyhat
Approved by:	portmgr (pav)

15 files changed, 49 insertions, 50 deletions

diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index 36cd7483f06e..14b76ff0e375 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	baekmukfonts
 PORTVERSION=	2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/obsoletes/ \
 		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
@@ -21,10 +21,9 @@ EXTRACT_ONLY=	baekmuk-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	cjh@freebsd.org
 COMMENT=	Free Hangul fonts for X11(baekmuk)
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-
-USE_X_PREFIX=	yes
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 FONTLIST=	batang10 batang10b batang12 batang12b batang14 batang14b \
 		batang16 batang16b batang18 batang18b batang20 batang20b \
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 5e3fdb5cfe58..b4eb583115bb 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eterm
 PORTVERSION=	0.8.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	korean x11
 MASTER_SITES=	ftp://ftp.holywar.net/pub/FreeBSD/ \
 		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PREFIX}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanya
 
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext ice sm xt
 USE_GNOME=	imlib
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index c00c7ee155a1..9c0f42ec6b40 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://download.kldp.net/gtkcomm/
 MAINTAINER=	cjh@kr.freebsd.org
 COMMENT=	Serial controlling software, with gtk+ widget
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
 USE_PERL5_BUILD=yes
 USE_GNOME=	imlib
diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile
index c3550d1b578c..0bc6d2b2bfff 100644
--- a/korean/hanIM/Makefile
+++ b/korean/hanIM/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES=   ftp://ftp.mizi.com/pub/hanIM/
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Mizi Research's Korean X11 Input Method
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
 USE_IMAKE=	YES
-USE_XPM=	yes
+USE_XORG=	xpm
 WRKSRC=		${WRKDIR}/hanIM
 
 post-install:
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index e104c87f89e8..5ea04ee3f60a 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hanterm
 PORTVERSION=	2.0.5.173
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean x11
 MASTER_SITES=	http://kldp.net/frs/download.php/282/
 PKGNAMESUFFIX=	-xf
@@ -16,11 +16,11 @@ DISTNAME=	hanterm${PKGNAMESUFFIX}-2.0.5-173
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	X11R6-based xterm hacked for managing Korean languages
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
+USE_XORG=	xaw xext x11
 CONFLICTS=	ko-hanterm-3.*
 USE_ICONV=	yes
-USE_X_PREFIX=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-boxchar --enable-ansi-color \
 			--enable-256-color --enable-chat --enable-now-chat
diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index 3ae2bd42c781..9247b4cb21d9 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://hanterm.org/download/ \
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	An xterm hacked for managing Korean languages
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts
 
 CONFLICTS=	ko-hanterm-xf-2.*
 USE_IMAKE=	yes
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index 0f247a677006..1d1363e22a2d 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hanyangfonts
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=   ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ \
 		ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \
@@ -17,9 +17,9 @@ DISTNAME=	hanyang-font-pcf
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Hanyang Hangul fonts for X11
 
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-
-USE_X_PREFIX=	yes
+RUN_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 NO_WRKSUBDIR=   yes
 
diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile
index c3985ab5aa23..60935ed3d975 100644
--- a/korean/iiimf-le-hangul/Makefile
+++ b/korean/iiimf-le-hangul/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-hangul
 PORTVERSION=	12.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	korean textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -20,9 +20,9 @@ RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
 
 ONLY_FOR_ARCHS=	i386
 
+USE_XORG=	x11
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
@@ -34,8 +34,8 @@ BUILDDIR=	${WRKSRC}/leif
 IGNORE=	is supported on FreeBSD 5.3 and later only
 .endif
 
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile
index be34d952f196..31c056dbe560 100644
--- a/korean/johabfonts/Makefile
+++ b/korean/johabfonts/Makefile
@@ -15,8 +15,9 @@ DISTNAME=	hanterm-font-${PORTVERSION}
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Hangul fonts for X11(johab) used in many hangul-related programs
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_IMAKE=	yes
 
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index e4c927cba800..7356c26d1027 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kaistfonts-ksc
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
 DISTNAME=	${PKGNAME}
@@ -17,10 +17,9 @@ DISTFILES=	kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	X11 KAIST font(ksc5601.1987-0 encoding) collection
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-
-USE_X_PREFIX=	yes
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile
index 89ee9b33db12..4ecaf577a33c 100644
--- a/korean/mizifont/Makefile
+++ b/korean/mizifont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mizifonts
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.mizi.co.kr/pub/hanIM/
 DISTNAME=	xfntmizi-1.1-2.noarch
@@ -18,9 +18,10 @@ COMMENT=	Mizi Research's Korean X11 Font(ksc5601.1987-[01] encoding)
 
 EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
 
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-
-USE_X_PREFIX=	yes
+RUN_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+RUN_DEPENDENS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 NO_WRKSUBDIR=	yes
 
@@ -48,7 +49,7 @@ do-install:
 	for i in ${WRKDIR}/*.gz; do \
 		${INSTALL_DATA} $$i ${PREFIX}/lib/X11/fonts/local/; \
 	done
-	cd ${PREFIX}/lib/X11/fonts/local/ ; mkfontdir
+	cd ${PREFIX}/lib/X11/fonts/local/ ; ${LOCALBASE}/bin/mkfontdir
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile
index 3da39c565f45..cbfa565995ad 100644
--- a/korean/pinetreefonts/Makefile
+++ b/korean/pinetreefonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pinetreefonts
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/ \
 		ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \
@@ -18,10 +18,10 @@ DISTNAME=	pinetree.precomposed-${PORTVERSION}-bdf
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Hangul fonts for X11(pinetree, KSC5601-1987-0 encoding)
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-
-USE_X_PREFIX=	yes
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+RUN_DEPENDENS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 WRKSRC=		${WRKDIR}/pinetree.precomposed/bdf
 
diff --git a/korean/uniksc/Makefile b/korean/uniksc/Makefile
index a3b9fec60477..ff2d52c85d9f 100644
--- a/korean/uniksc/Makefile
+++ b/korean/uniksc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
 MAINTAINER=	cjh@freebsd.org
 COMMENT=	Converts data between Korean KSC-5601 and Unicode 3.0 UTF-16
 
-INSTALLS_SHLIB=	YES
+USE_LDCONFIG=	YES
 
 .if ${MACHINE_ARCH:L} == "amd64"
 CFLAGS+=	"-fPIC"
diff --git a/korean/xpdf/Makefile b/korean/xpdf/Makefile
index 9829d7b98a4e..fc1f6960ed24 100644
--- a/korean/xpdf/Makefile
+++ b/korean/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 DISTNAME=	xpdf-korean
@@ -17,10 +17,9 @@ COMMENT=	Korean xpdf font support
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		${X11BASE}/lib/X11/fonts/TrueType/UnBatang.ttf:${PORTSDIR}/korean/unfonts-ttf
+		${LOCALBASE}/lib/X11/fonts/TrueType/UnBatang.ttf:${PORTSDIR}/korean/unfonts-ttf
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR}
 
diff --git a/korean/xpdf/files/dot.xpdfrc.in b/korean/xpdf/files/dot.xpdfrc.in
index 87d1f4dbee1b..f8ceb1386a50 100644
--- a/korean/xpdf/files/dot.xpdfrc.in
+++ b/korean/xpdf/files/dot.xpdfrc.in
@@ -4,13 +4,13 @@ cidToUnicode	Adobe-Korea1	%%PREFIX%%/share/xpdf/korean/Adobe-Korea1.cidToUnicode
 unicodeMap	ISO-2022-KR	%%PREFIX%%/share/xpdf/korean/ISO-2022-KR.unicodeMap
 cMapDir		Adobe-Korea1	%%ADOBECMAPDIR%%
 toUnicodeDir			%%ADOBECMAPDIR%%
-displayNamedCIDFontTT	Batang		"%%X11BASE%%/lib/X11/fonts/TrueType/UnBatang.ttf"
-displayNamedCIDFontTT	Batang,Bold	"%%X11BASE%%/lib/X11/fonts/TrueType/UnBatangBold.ttf"
-displayNamedCIDFontTT	Dotum		"%%X11BASE%%/lib/X11/fonts/TrueType/UnDotum.ttf"
-displayNamedCIDFontTT	Dotum,Bold	"%%X11BASE%%/lib/X11/fonts/TrueType/UnDotumBold.ttf"
-displayNamedCIDFontTT	Gulim		"%%X11BASE%%/lib/X11/fonts/TrueType/UnGraphic.ttf"
-displayNamedCIDFontTT	Gulim,Bold	"%%X11BASE%%/lib/X11/fonts/TrueType/UnGraphicBold.ttf"
-displayNamedCIDFontTT	Gungsuh		"%%X11BASE%%/lib/X11/fonts/TrueType/UnGungseo.ttf"
+displayNamedCIDFontTT	Batang		"%%LOCALBASE%%/lib/X11/fonts/TrueType/UnBatang.ttf"
+displayNamedCIDFontTT	Batang,Bold	"%%LOCALBASE%%/lib/X11/fonts/TrueType/UnBatangBold.ttf"
+displayNamedCIDFontTT	Dotum		"%%LOCALBASE%%/lib/X11/fonts/TrueType/UnDotum.ttf"
+displayNamedCIDFontTT	Dotum,Bold	"%%LOCALBASE%%/lib/X11/fonts/TrueType/UnDotumBold.ttf"
+displayNamedCIDFontTT	Gulim		"%%LOCALBASE%%/lib/X11/fonts/TrueType/UnGraphic.ttf"
+displayNamedCIDFontTT	Gulim,Bold	"%%LOCALBASE%%/lib/X11/fonts/TrueType/UnGraphicBold.ttf"
+displayNamedCIDFontTT	Gungsuh		"%%LOCALBASE%%/lib/X11/fonts/TrueType/UnGungseo.ttf"
 
 psFont16	Adobe-Korea1	H	Batang-UniKS-UCS2-H		UCS-2
 psFont16	Adobe-Korea1	V	Batang-UniKS-UCS2-V		UCS-2