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

3 files changed, 11 insertions, 13 deletions

diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile
index 89c49fabebd2..65c82129b95a 100644
--- a/hebrew/culmus/Makefile
+++ b/hebrew/culmus/Makefile
@@ -7,21 +7,21 @@
 
 PORTNAME=	culmus
 PORTVERSION=	0.101
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	hebrew
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Free Hebrew Type1 fonts
 
-BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/X11/fonts/culmus
+	${MKDIR} ${LOCALBASE}/lib/X11/fonts/culmus
 .	for filename in AharoniCLM-Bold AharoniCLM-BoldOblique AharoniCLM-Book AharoniCLM-BookOblique CaladingsCLM DavidCLM-Bold DavidCLM-Medium DavidCLM-MediumItalic DrugulinCLM-Bold DrugulinCLM-BoldItalic ElliniaCLM-Bold ElliniaCLM-BoldItalic ElliniaCLM-Light ElliniaCLM-LightItalic FrankRuehlCLM-Bold FrankRuehlCLM-BoldOblique FrankRuehlCLM-Medium FrankRuehlCLM-MediumOblique MiriamCLM-Bold MiriamCLM-Book MiriamMonoCLM-Bold MiriamMonoCLM-BoldOblique MiriamMonoCLM-Book MiriamMonoCLM-BookOblique NachlieliCLM-Bold NachlieliCLM-BoldOblique NachlieliCLM-Light NachlieliCLM-LightOblique YehudaCLM-Bold YehudaCLM-Light
 		${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${PREFIX}/lib/X11/fonts/culmus
 		${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${PREFIX}/lib/X11/fonts/culmus
diff --git a/hebrew/elmar-fonts/Makefile b/hebrew/elmar-fonts/Makefile
index 595a72178462..4815904131f2 100644
--- a/hebrew/elmar-fonts/Makefile
+++ b/hebrew/elmar-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmar-fonts
 PORTVERSION=	3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	hebrew x11-fonts
 MASTER_SITES=	ftp://ftp.elmar.co.il/Portable/fonts/
 DISTNAME=	H.fonts
@@ -17,12 +17,11 @@ MAINTAINER=	nadav@cs.technion.ac.il
 COMMENT=	A collection of Hebrew fonts from El-Mar software Ltd
 
 NO_WRKSUBDIR=	yes
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/X11/fonts/hebrew
-	${TAR} -C ${PREFIX}/lib/X11/fonts/hebrew -xZpf \
+	${MKDIR} ${LOCALBASE}/lib/X11/fonts/hebrew
+	${TAR} -C ${LOCALBASE}/lib/X11/fonts/hebrew -xZpf \
 		${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/hebrew/he2/Makefile b/hebrew/he2/Makefile
index cd9e12fddb4c..2422dadbd3f9 100644
--- a/hebrew/he2/Makefile
+++ b/hebrew/he2/Makefile
@@ -9,13 +9,12 @@ PORTNAME=	he2
 PORTVERSION=	0.61
 PORTREVISION=	2
 CATEGORIES=	hebrew editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An editor for editing (primarily LaTeX) Hebrew files
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/hebrew:${PORTSDIR}/hebrew/elmar-fonts
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/hebrew:${PORTSDIR}/hebrew/elmar-fonts
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes