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

2 files changed, 22 insertions, 23 deletions

diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index 152d07736327..ef247225dc6a 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.00
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 DISTNAME=	xpdf-japanese
@@ -17,9 +17,8 @@ COMMENT=	Japanese xpdf font support
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
+		${LOCALBASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR}
diff --git a/japanese/xpdf/files/dot.xpdfrc.in b/japanese/xpdf/files/dot.xpdfrc.in
index be3aca389cec..0bcf1b25579b 100644
--- a/japanese/xpdf/files/dot.xpdfrc.in
+++ b/japanese/xpdf/files/dot.xpdfrc.in
@@ -5,24 +5,24 @@ unicodeMap	EUC-JP		%%PREFIX%%/share/xpdf/japanese/EUC-JP.unicodeMap
 unicodeMap	Shift-JIS	%%PREFIX%%/share/xpdf/japanese/Shift-JIS.unicodeMap
 cMapDir		Adobe-Japan1	%%ADOBECMAPDIR%%
 toUnicodeDir			%%ADOBECMAPDIR%%
-displayNamedCIDFontTT	Ryumin-Light			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-H			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-V			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	HeiseiMin-W3H			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold			"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light-H			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light-V			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light-Identity		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	HeiseiMin-W3H			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
 #Japanese PDF resources