- 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)

5 files changed, 16 insertions, 16 deletions

diff --git a/vietnamese/gtk-im-vi/Makefile b/vietnamese/gtk-im-vi/Makefile
index 87f136d04b39..f3bd785e8b3b 100644
--- a/vietnamese/gtk-im-vi/Makefile
+++ b/vietnamese/gtk-im-vi/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG=	YES
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; s,ChangeLog,,' \
+	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},; s,ChangeLog,,' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/po/Makefile.in.in
 
 post-install:
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index e6d6fb5ce26f..0ac4b7ed574b 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	unicode-uhoai
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	http://www.geocities.com/~starkville/mozilla/
 DISTNAME=	uhoaiw21
@@ -18,12 +18,11 @@ COMMENT=	Unicode TrueType Font with UHoai Vietnamese encoding
 
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
-USE_X_PREFIX=	yes
 NO_BUILD=	taken care of in do-install target
 
 BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \
-		bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/TrueType
diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile
index 2e71cb47c8a9..3d4f19c27569 100644
--- a/vietnamese/vnterm/Makefile
+++ b/vietnamese/vnterm/Makefile
@@ -21,7 +21,9 @@ USE_IMAKE=	yes
 .include <bsd.port.pre.mk>
 
 BUILD_DEPENDS=  ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet \
-		mkfontdir:${X_CLIENTS_PORT}
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 RUN_DEPENDS=	${PREFIX}/lib/X11/fonts/vietnamese/fonts.dir:${PORTSDIR}/vietnamese/vnxfonts
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/programs/xterm
diff --git a/vietnamese/vnxfonts/Makefile b/vietnamese/vnxfonts/Makefile
index e21c8a4d6651..4875b75fd990 100644
--- a/vietnamese/vnxfonts/Makefile
+++ b/vietnamese/vnxfonts/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vnxfonts
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
@@ -20,11 +20,11 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	X fonts for displaying Vietnamese
 
-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
 
 WRKSRC=		${WRKDIR}/fonts/X
-USE_X_PREFIX=	yes
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/vietnamese
diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile
index 87b0b4430777..447db6072ce3 100644
--- a/vietnamese/xvnkb/Makefile
+++ b/vietnamese/xvnkb/Makefile
@@ -8,10 +8,9 @@
 
 PORTNAME=	xvnkb
 PORTVERSION=	0.2.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	vietnamese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	chinhngt@sectorb.msk.ru
 COMMENT=	A Vietnamese input method for X-Window
@@ -21,12 +20,12 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}" XLIB_DIR="${X11BASE}"
+CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}" XLIB_DIR="${LOCALBASE}"
 
 .if defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--no-xft
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+USE_XORG=	xft
 .endif
 
 SUB_LIST=	PORTVERSION=${PORTVERSION}
@@ -43,7 +42,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/locale/la_LN.UTF-8/LC_CTYPE:${PORTSDIR}/misc/ut
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/tools/Makefile.dep
+	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/tools/Makefile.dep
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/xvnkb