Remove USE_X11BASE and X11PREFIX.

55 files changed, 60 insertions, 116 deletions

diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index b7344e1b2c4..dacae19e3de 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/06/01 16:35:31 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	libXg.utf.fonts
 PKGNAME=	libXgFonts-1.0
@@ -11,7 +11,6 @@ COMMENT=	These are the UNICODE fonts for use with 9term and sam
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
-USE_X11BASE=	yes
 
 USE_TOOLS+=	bdftopcf gzip
 FONTS_DIRS.x11=	${PREFIX}/share/fonts/X11/Xg
diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 7f8ab2b21ad..ea9166a0a37 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/07/04 16:18:30 joerg Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
@@ -19,7 +19,6 @@ MISC_FILES=	ARPHICPL.TXT logo.gif release.txt
 DIST_SUBDIR=	arphic-ttf
 WRKSRC=		${WRKDIR}
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile
index f6d7dd3ed7f..c9bac4baf5f 100644
--- a/fonts/artwiz-fonts/Makefile
+++ b/fonts/artwiz-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:30 joerg Exp $
 #
 
 DISTNAME=	artwiz-aleczapka-1.3
@@ -13,7 +13,6 @@ HOMEPAGE=	http://www.vastwaters.com/
 COMMENT=	Set of free fonts for X11 desktops
 
 WRKSRC=		${WRKDIR}/artwiz-aleczapka
-USE_X11BASE=	yes
 
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index e65227d1de6..3520b1191b5 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	baekmuk-ttf-2.2
 PKGREVISION=	3
@@ -9,7 +9,6 @@ MAINTAINER=	yui@yui.pe.kr
 HOMEPAGE=	http://kldp.net/projects/baekmuk/
 COMMENT=	Baekmuk family Korean TrueType fonts
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile
index 9a8c5a689e1..890004ae91f 100644
--- a/fonts/biznet-iso8859_2/Makefile
+++ b/fonts/biznet-iso8859_2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:30 joerg Exp $
 #
 
 DISTNAME=	ISO8859-2-pcf
@@ -11,7 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://web.archive.org/web/20041204153923/http://www.biz.net.pl/english/x-fonts/index.html
 COMMENT=	Full set of ISO 8859-2 fonts for X Window System
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/croscorefonts/Makefile b/fonts/croscorefonts/Makefile
index 56be8184ddd..f2bf9f1024f 100644
--- a/fonts/croscorefonts/Makefile
+++ b/fonts/croscorefonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/04 16:18:30 joerg Exp $
 #
 
 DISTNAME=	croscorefonts-1.21.0
@@ -11,7 +11,6 @@ HOMEPAGE=	http://fedoraproject.org/wiki/Google_Croscore_fonts
 COMMENT=	Google Croscore fonts
 LICENSE=	ofl-v1.1
 
-USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index 0b4ab6f41ea..b4b8dbaafcf 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2014/10/05 16:41:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2015/07/04 16:18:31 joerg Exp $
 #
 # used by fonts/cyberbit-ttf/Makefile
 # used by fonts/cyberbase-ttf/Makefile
@@ -25,7 +25,6 @@ DIST_SUBDIR=	cyberbit-ttf
 EXTRACT_ONLY=		${FONT_FILE}
 #EXTRACT_OPTS_ZIP=	-Laq
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common
index 91092dd9eba..e13f6f3f153 100644
--- a/fonts/cyr-rfx-share/Makefile.common
+++ b/fonts/cyr-rfx-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile.common,v 1.17 2015/07/04 16:18:31 joerg Exp $
 
 # used by fonts/cyr-rfx-bulgarian-mik/Makefile
 # used by fonts/cyr-rfx-ibm-cp866/Makefile
@@ -25,8 +25,6 @@ HOMEPAGE=	http://www.inp.nsk.su/~bolkhov/files/fonts/cyr-rfx/00index.en.html
 COMMENT=	Cyrillic X11 fonts in ${CYR_RFX_ENCODING} encoding
 DIST_SUBDIR=	cyr-rfx
 
-USE_X11BASE=	yes
-
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/fonts/droid-ttf/Makefile b/fonts/droid-ttf/Makefile
index 0270d9e880b..c77c3aabf61 100644
--- a/fonts/droid-ttf/Makefile
+++ b/fonts/droid-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/04 16:18:31 joerg Exp $
 #
 
 DISTNAME=	droid-fonts-20111115
@@ -14,7 +14,6 @@ COMMENT=	The Droid fonts family from Ascender Corporation
 LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
-USE_X11BASE=	YES
 NO_BUILD=	YES
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile
index 1a7997ce727..e61db2d7d43 100644
--- a/fonts/efont-unicode/Makefile
+++ b/fonts/efont-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:31 joerg Exp $
 
 DISTNAME=	efont-unicode-bdf-0.4.2
 PKGNAME=	${DISTNAME:S/-bdf//}
@@ -11,7 +11,6 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/efont/unicode/
 COMMENT=	Free unicode BDF font
 
-USE_X11BASE=	YES
 USE_TOOLS+=	bdftopcf gzip
 
 MESSAGE_SUBST+=	FONTDIR=${FONTDIR}
diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile
index fb98062928b..168fba8de1d 100644
--- a/fonts/freefonts/Makefile
+++ b/fonts/freefonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/08/19 10:42:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:31 joerg Exp $
 
 DISTNAME=	freefonts-0.10
 PKGREVISION=	3
@@ -15,7 +15,6 @@ EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-USE_X11BASE=	yes
 USE_TOOLS+=	gzcat tar
 FONTS_DIRS.x11=	${PREFIX}/share/fonts/X11/freefont
 REQD_DIRS=	${PREFIX}/share/fonts/X11/freefont
diff --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile
index 5f08b7dc4f4..ac1ab3fa59d 100644
--- a/fonts/geoslab703-ttf/Makefile
+++ b/fonts/geoslab703-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:31 joerg Exp $
 #
 
 DISTNAME=	geoslab703-ttf-20010522
@@ -14,7 +14,6 @@ COMMENT=	Free TrueType fonts from Bitstream, useful for web viewing
 DIST_SUBDIR=	geoslab703-ttf
 EXTRACT_ONLY=	# empty
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/ipaexfont/Makefile b/fonts/ipaexfont/Makefile
index c2a31a2c658..3120da8b11f 100644
--- a/fonts/ipaexfont/Makefile
+++ b/fonts/ipaexfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/06/29 11:06:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/04 16:18:31 joerg Exp $
 #
 
 IPAEXVER=	00201
@@ -15,7 +15,6 @@ HOMEPAGE=	http://ipafont.ipa.go.jp/
 COMMENT=	IPAex fonts (fixed JIS X0213 Kanji, and proportional ASCII)
 LICENSE=	ipafont
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/ipafont/Makefile b/fonts/ipafont/Makefile
index f9d8db5ff41..2775dc29575 100644
--- a/fonts/ipafont/Makefile
+++ b/fonts/ipafont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:31 joerg Exp $
 #
 
 DISTNAME=	IPAfont00303
@@ -13,7 +13,6 @@ HOMEPAGE=	http://ipafont.ipa.go.jp/
 COMMENT=	IPA JIS X 0213 fonts (Gothic, P Gothic, Mincho, and P Mincho)
 LICENSE=	ipafont
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index 5ad11e93464..9ce2c02b026 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:31 joerg Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
@@ -11,7 +11,6 @@ COMMENT=		8x8 dots X11 bitmap font for JIS X 0208
 LICENSE=		no-commercial-use
 
 WRKSRC=			${WRKDIR}
-USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
 FONTDIR=		${PREFIX}/share/fonts/X11/local
 FONTS_DIRS.x11=		${FONTDIR}
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 60be3e1bcff..c80d10806e2 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:31 joerg Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -21,7 +21,6 @@ SITES.clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
 WRKSRC=			${WRKDIR}
 USE_TOOLS+=		bdftopcf gzip patch
-USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
 FONTDIR=		${PREFIX}/share/fonts/X11/local
 FONTS_DIRS.x11=		${FONTDIR}
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index 49c07e67403..b22fc1ae2f8 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:31 joerg Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
@@ -11,7 +11,6 @@ COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
 #LICENSE=		no-commercial-use
 
 WRKSRC=			${WRKDIR}
-USE_X11BASE=		YES
 USE_TOOLS+=		bdftopcf gzip
 DOCDIR=			${PREFIX}/share/doc/kaname
 FONTDIR=		${PREFIX}/share/fonts/X11/local
diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile
index 39e2b95e5ab..c77ccd67294 100644
--- a/fonts/ja-kappa20/Makefile
+++ b/fonts/ja-kappa20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:31 joerg Exp $
 
 DISTNAME=		Kappa20-0.394
 PKGNAME=		ja-kappa20-0.394
@@ -11,7 +11,6 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://kappa.allnet.ne.jp/20dot.fonts/
 COMMENT=		20x20 dots X11 bitmap font for Japanese with several extra fonts
 
-USE_X11BASE=		YES
 FONTDIR=		${PREFIX}/share/fonts/X11/local
 ALIAS_KAPPA=		${PREFIX}/share/examples/fonts.alias.Kappa20
 
diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile
index e0d691ac4f9..522f28bdbe6 100644
--- a/fonts/ja-naga10/Makefile
+++ b/fonts/ja-naga10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:31 joerg Exp $
 
 DISTNAME=		knj10-1.1
 PKGNAME=		ja-naga10-1.1
@@ -12,7 +12,6 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://hp.vector.co.jp/authors/VA013391/fonts/#naga10
 COMMENT=		10x10 dots X11 bitmap font for JIS X 0208
 
-USE_X11BASE=		YES
 USE_TOOLS+=		bdftopcf gzip patch
 DOCDIR=			${PREFIX}/share/doc
 FONTDIR=		${PREFIX}/share/fonts/X11/local
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index bb347fe22ad..fbc07868f48 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/06/12 10:50:05 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:31 joerg Exp $
 #
 
 DISTNAME=		shinonome-0.9.11-src
@@ -14,7 +14,6 @@ COMMENT=		12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
 LICENSE=		public-domain
 
 GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
 USE_TOOLS+=		gawk gmake mkfontdir perl gzip
 FONTS_DIRS.x11+=	${PREFIX}/share/fonts/X11/local
 FONTDIR=		${PREFIX}/share/fonts/X11/local
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index a2bcbef0acb..410c2c0f77f 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:32 joerg Exp $
 
 DISTNAME=	jisx0212fonts-0.0
 PKGREVISION=	3
@@ -11,8 +11,6 @@ DISTFILES=	jisksp14.bdf.gz jisksp16-1990.bdf.Z min-1-24.bdf.gz \
 MAINTAINER=	uebayasi@NetBSD.org
 COMMENT=	X11 bitmap fonts for JIS X 0212
 
-USE_X11BASE=	yes
-
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	${DISTFILES}
 
diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile
index 9d520efbc9e..cd09a5942f6 100644
--- a/fonts/jisx0213fonts/Makefile
+++ b/fonts/jisx0213fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	jisx0213fonts-0.0
@@ -11,7 +11,6 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/
 COMMENT=	X11 bitmap fonts for JIS X 0213
 
-USE_X11BASE=	yes
 USE_TOOLS+=	gzip bdftopcf
 
 FONTS=		K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2
diff --git a/fonts/jmk-fonts/Makefile b/fonts/jmk-fonts/Makefile
index 4db9ba3e6c7..e5fd16fc4bf 100644
--- a/fonts/jmk-fonts/Makefile
+++ b/fonts/jmk-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	jmk-x11-fonts-3.0
@@ -16,7 +16,6 @@ MAKE_FLAGS+=	INSTALL_DIR=${PREFIX}/share/fonts/X11/jmk
 
 USE_TOOLS+=	bdftopcf gzip
 
-USE_X11BASE=		yes
 FONTS_DIRS.x11+=	${PREFIX}/share/fonts/X11/jmk
 REQD_DIRS+=		${PREFIX}/share/fonts/X11/jmk
 
diff --git a/fonts/kanjistrokeorders-ttf/Makefile b/fonts/kanjistrokeorders-ttf/Makefile
index 7ee19ca55a0..7908dadee4e 100644
--- a/fonts/kanjistrokeorders-ttf/Makefile
+++ b/fonts/kanjistrokeorders-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/03/07 01:15:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:32 joerg Exp $
 
 DISTNAME=	KanjiStrokeOrders_v${KSOVER}
 PKGNAME=	${DISTNAME:tl:S/_v/-ttf-/}
@@ -11,7 +11,6 @@ HOMEPAGE=	https://sites.google.com/site/nihilistorguk/
 COMMENT=	Japanese Kanji characters stroke order font
 LICENSE=	modified-bsd
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/kcfonts/Makefile b/fonts/kcfonts/Makefile
index 2fb21d87b6d..fad7bc8e6f6 100644
--- a/fonts/kcfonts/Makefile
+++ b/fonts/kcfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:32 joerg Exp $
 
 DISTNAME=	kcfonts-1.05
 PKGREVISION=	4
@@ -9,7 +9,6 @@ MAINTAINER=	kevlo@midassol.com
 COMMENT=	Kuo Chauo Chinese Fonts collection
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	yes
 FONTS_DIRS.x11=	${PREFIX}/share/fonts/X11/local
 REQD_DIRS+=	${PREFIX}/share/fonts/X11/local
 
diff --git a/fonts/kiloji-ttf/Makefile b/fonts/kiloji-ttf/Makefile
index 288976754b3..84e3a17e2ea 100644
--- a/fonts/kiloji-ttf/Makefile
+++ b/fonts/kiloji-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:32 joerg Exp $
 
 DISTNAME=	# empty
 PKGNAME=	kiloji-ttf-2.1.0
@@ -16,7 +16,6 @@ HOMEPAGE=	http://www.ez0.net/distribution/font/kiloji/
 COMMENT=	JIS X 0208 Japanese script fonts made by kilo
 LICENSE=	modified-bsd # with some difference
 
-USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/fonts/ko-hanyang/Makefile b/fonts/ko-hanyang/Makefile
index 8973612a7c1..972425793aa 100644
--- a/fonts/ko-hanyang/Makefile
+++ b/fonts/ko-hanyang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	hanyang-font-pcf
@@ -13,7 +13,6 @@ COMMENT=	X11 fonts for KSC 5601 standard
 
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
-USE_X11BASE=	yes
 USE_TOOLS+=	gzip
 EXTRACT_ONLY=	# empty
 
diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile
index cf8af8d563a..27d5aa1d63f 100644
--- a/fonts/ko-kaist/Makefile
+++ b/fonts/ko-kaist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	ko-kaist-20010718
@@ -13,7 +13,6 @@ COMMENT=	X11 fonts for Korean KSC 5601 standard (kaist foundry)
 
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
-USE_X11BASE=		yes
 USE_TOOLS+=		gzip gunzip bdftopcf
 EXTRACT_ONLY=		# empty
 
diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile
index d800b623a83..9b966cf6438 100644
--- a/fonts/ko-mizi/Makefile
+++ b/fonts/ko-mizi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/02/27 21:42:57 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	xfntmizi-1.1-2.noarch
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=	rpm2cpio>=1.3:../../converters/rpm2cpio
 
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
-USE_X11BASE=		yes
 USE_TOOLS+=		gzip gunzip
 
 MAKE_ENV+=	FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
diff --git a/fonts/konatu-ttf/Makefile b/fonts/konatu-ttf/Makefile
index 574411d3688..47a6ed6857f 100644
--- a/fonts/konatu-ttf/Makefile
+++ b/fonts/konatu-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	Konatu_ver_26
@@ -13,7 +13,6 @@ HOMEPAGE=	http://www.masuseki.com/?u=be/konatu.htm
 COMMENT=	Japanese TrueType gothic (sans-serif) fonts, Konatu fonts
 LICENSE=	cc-by-sa-v3.0
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/koruri-ttf/Makefile b/fonts/koruri-ttf/Makefile
index 05e2d0b762c..929ae443c19 100644
--- a/fonts/koruri-ttf/Makefile
+++ b/fonts/koruri-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/07/01 05:22:03 nonaka Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	Koruri-${KORURI_VERSION}
@@ -14,7 +14,6 @@ LICENSE=	apache-2.0
 
 KORURI_VERSION=	20150701
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/lohit-fonts/Makefile b/fonts/lohit-fonts/Makefile
index abd104c5108..b8dafa75732 100644
--- a/fonts/lohit-fonts/Makefile
+++ b/fonts/lohit-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/18 12:43:07 mef Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/04 16:18:32 joerg Exp $
 
 DISTNAME=		lohit-fonts-2.3.8
 CATEGORIES=		fonts
@@ -10,7 +10,6 @@ HOMEPAGE=		https://fedorahosted.org/lohit
 COMMENT=		Free fonts for Indian languages
 LICENSE=		gnu-gpl-v2
 
-USE_X11BASE=		yes
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
diff --git a/fonts/migu-ttf/Makefile b/fonts/migu-ttf/Makefile
index ebd63f4b45c..203bc2b380b 100644
--- a/fonts/migu-ttf/Makefile
+++ b/fonts/migu-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/29 11:06:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:32 joerg Exp $
 #
 
 DISTNAME=	# empty
@@ -15,7 +15,6 @@ HOMEPAGE=	http://mix-mplus-ipa.osdn.jp/
 COMMENT=	Fonts generated from M+ and IPA Gothic (Universal Design)
 LICENSE=	ipafont
 
-USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/fonts/misaki-fonts/Makefile b/fonts/misaki-fonts/Makefile
index c35934e0ed1..269aece92de 100644
--- a/fonts/misaki-fonts/Makefile
+++ b/fonts/misaki-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:32 joerg Exp $
 
 DISTNAME=		misaki_bdf_2012-06-03
 PKGNAME=		${DISTNAME:S/-//g:S/misaki_bdf_/misaki-fonts-1.0./}
@@ -12,7 +12,6 @@ COMMENT=		8x8 dots X11 bitmap font for JIS X 0208
 LICENSE=		mplusfont
 
 WRKSRC=			${WRKDIR}
-USE_X11BASE=		YES
 NO_CONFIGURE=		YES
 USE_TOOLS+=		bdftopcf gzip
 
diff --git a/fonts/monafonts-ttf/Makefile b/fonts/monafonts-ttf/Makefile
index 556337292b2..9cf28d206ed 100644
--- a/fonts/monafonts-ttf/Makefile
+++ b/fonts/monafonts-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:33 joerg Exp $
 # $FreeBSD: ports/japanese/monafonts-ttf/Makefile,v 1.1 2003/10/14 13:35:38 nobutaka Exp $
 
 DISTNAME=		monafont-ttf-2.90
@@ -12,7 +12,6 @@ MAINTAINER=		yamajun@ofug.net
 HOMEPAGE=		http://monafont.sourceforge.net/index-e.html
 COMMENT=		Japanese TrueType fonts for "Mona" seen at 2ch.net
 
-USE_X11BASE=		YES
 NO_BUILD=		YES
 NO_CONFIGURE=		YES
 
diff --git a/fonts/motoya-fonts/Makefile b/fonts/motoya-fonts/Makefile
index 8d46355a68c..c3bffa9c77f 100644
--- a/fonts/motoya-fonts/Makefile
+++ b/fonts/motoya-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=	motoya-fonts-20111115
@@ -13,7 +13,6 @@ COMMENT=	Motoya L Cider W3 and L Mulberry W3 fonts
 LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
-USE_X11BASE=	YES
 NO_BUILD=	YES
 
 FONTDIR=	${PREFIX}/share/fonts/X11/TTF
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index 3eee9ff9582..2fa39931d34 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:36 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:33 joerg Exp $
 
 DISTNAME=	# empty
 PKGNAME=	ms-ttf-20020306
@@ -25,7 +25,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-USE_X11BASE=	yes
 DIST_SUBDIR=	ms-ttf
 EVAL_PREFIX+=	CABEXTRACT_PREFIX=cabextract
 CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE}
diff --git a/fonts/noto-ttf/Makefile b/fonts/noto-ttf/Makefile
index d7046a64001..7a93c733a45 100644
--- a/fonts/noto-ttf/Makefile
+++ b/fonts/noto-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/07/02 13:20:31 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/04 16:18:33 joerg Exp $
 
 DISTNAME=	noto-ttf-20150630
 CATEGORIES=	fonts
@@ -12,7 +12,6 @@ COMMENT=	Noto fonts for all languages
 LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
-USE_X11BASE=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/noto-fonts-2015-06-30
diff --git a/fonts/profont/Makefile b/fonts/profont/Makefile
index 0b28de21869..ed79febe82c 100644
--- a/fonts/profont/Makefile
+++ b/fonts/profont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/06/01 16:35:36 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=	profontlinux
@@ -14,7 +14,6 @@ COMMENT=	Monospaced bitmap font readable in very small sizes
 
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
-USE_X11BASE=		yes
 
 FONTS_DIRS.x11=		${PREFIX}/share/fonts/X11/misc
 INSTALLATION_DIRS=	share/fonts/X11/misc
diff --git a/fonts/proggy-fonts/Makefile b/fonts/proggy-fonts/Makefile
index 2a247427915..806ccf101f7 100644
--- a/fonts/proggy-fonts/Makefile
+++ b/fonts/proggy-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:33 joerg Exp $
 
 DISTNAME=	proggy-fonts-1
 PKGREVISION=	1
@@ -14,7 +14,6 @@ LICENSE=	mit
 WRKSRC=			${WRKDIR}/proggy-fonts
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
-USE_X11BASE=		yes
 
 FONTS_DIRS.x11=		${PREFIX}/share/fonts/X11/misc
 INSTALLATION_DIRS=	share/fonts/X11/misc
diff --git a/fonts/ricty-ttf/Makefile b/fonts/ricty-ttf/Makefile
index 221de1d47b4..83dc7a11c4c 100644
--- a/fonts/ricty-ttf/Makefile
+++ b/fonts/ricty-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/03/19 23:41:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:33 joerg Exp $
 
 DISTNAME=	Ricty-3.2.4
 PKGNAME=	${DISTNAME:S/Ricty/ricty-ttf/}
@@ -23,7 +23,6 @@ RESTRICTED=		Redistribution not permitted per open-font-license PERMISSION & CON
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 
 INSTALLATION_DIRS=	share/fonts/X11/TTF
diff --git a/fonts/roboto-fonts/Makefile b/fonts/roboto-fonts/Makefile
index df4508c26f6..f8d94c5d5a0 100644
--- a/fonts/roboto-fonts/Makefile
+++ b/fonts/roboto-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/17 14:31:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=	RobotoTTF
@@ -17,7 +17,6 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}
 
 USE_LANGUAGES=	# none
-USE_X11BASE=	yes
 NO_BUILD=	yes
 
 FONTDIR=	${PREFIX}/share/fonts/X11/TTF
diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile
index 9bf83249623..3d4026f8966 100644
--- a/fonts/sgi-fonts/Makefile
+++ b/fonts/sgi-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/03/15 18:42:12 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=	sgi-fonts-1.0-457.src
@@ -15,7 +15,6 @@ COMMENT=	Linux compatibility package for SGI fonts
 WRKSRC=		${WRKDIR}/sgi-fonts
 USE_LANGUAGES=	c
 
-USE_X11BASE=	yes
 FONTS_DIRS.x11=	${PREFIX}/share/fonts/X11/misc/sgi
 
 USE_IMAKE=	yes
diff --git a/fonts/sourcehansans-fonts/Makefile b/fonts/sourcehansans-fonts/Makefile
index 35ecfdea4af..b67f285aece 100644
--- a/fonts/sourcehansans-fonts/Makefile
+++ b/fonts/sourcehansans-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/07/17 14:52:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/04 16:18:33 joerg Exp $
 
 DISTNAME=	SourceHanSansOTF-1.000
 PKGNAME=	${DISTNAME:S/SourceHanSansOTF/sourcehansans-fonts/}
@@ -12,7 +12,6 @@ COMMENT=	Set of Pan-CJK fonts from Adobe
 LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
-USE_X11BASE=	yes
 NO_BUILD=	yes
 
 FONTDIR=	${PREFIX}/share/fonts/X11/TTF
diff --git a/fonts/takao-ex-fonts-ttf/Makefile b/fonts/takao-ex-fonts-ttf/Makefile
index 36d1475b8ce..bab3ad78f14 100644
--- a/fonts/takao-ex-fonts-ttf/Makefile
+++ b/fonts/takao-ex-fonts-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/03/07 12:12:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=	TakaoExFonts_00201.01
@@ -12,7 +12,6 @@ HOMEPAGE=	https://launchpad.net/takao-fonts
 COMMENT=	Takao Ex Fonts are based on IPA Ex fonts, and includes some bug fix
 LICENSE=	ipafont
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/takao-fonts-ttf/Makefile b/fonts/takao-fonts-ttf/Makefile
index d2f2bc17a14..06f2c12f67e 100644
--- a/fonts/takao-fonts-ttf/Makefile
+++ b/fonts/takao-fonts-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/03/07 12:09:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=	TakaoFonts_00303.01
@@ -12,7 +12,6 @@ HOMEPAGE=	https://launchpad.net/takao-fonts
 COMMENT=	Takao fonts are based on IPA fonts, and includes some bug fix
 LICENSE=	ipafont
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile
index 9c8f8c0e611..3fe29ad573c 100644
--- a/fonts/type1inst/Makefile
+++ b/fonts/type1inst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/06/12 10:50:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=		type1inst-0.6.1
@@ -9,7 +9,6 @@ MASTER_SITES=		${MASTER_SITE_SUNSITE:=X11/xutils/}
 MAINTAINER=		groo@NetBSD.org
 COMMENT=		Automatically generate fonts.scale/fonts.dir for Type1 fonts
 
-USE_X11BASE=		yes
 USE_TOOLS+=		perl:run
 REPLACE_PERL=		t1embed type1inst
 
diff --git a/fonts/umefont-ttf/Makefile b/fonts/umefont-ttf/Makefile
index 0bf08c48cde..ad91aac6271 100644
--- a/fonts/umefont-ttf/Makefile
+++ b/fonts/umefont-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2015/07/01 12:33:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2015/07/04 16:18:33 joerg Exp $
 #
 
 DISTNAME=	umefont_520
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME:C/([a-z]+)-//}
 CONFLICTS=	umefont<=0.421
 SUPERSEDES=	umefont<=0.421
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/un-core-ttf/Makefile b/fonts/un-core-ttf/Makefile
index 1b5fcf07651..bfefd442ce6 100644
--- a/fonts/un-core-ttf/Makefile
+++ b/fonts/un-core-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:37 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:34 joerg Exp $
 
 DISTNAME=	un-fonts-core-1.0.2-080608
 PKGNAME=	${DISTNAME:S/fonts-core/core-ttf/:S/-0/.200/}
@@ -13,7 +13,6 @@ COMMENT=	Core set of Un Korean TrueType fonts
 CONFLICTS+=	un-ttf-[0-9]*
 
 WRKSRC=		${WRKDIR}/un-fonts
-USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/fonts/un-extra-ttf/Makefile b/fonts/un-extra-ttf/Makefile
index 69f64f5ab31..ef5e10c3d16 100644
--- a/fonts/un-extra-ttf/Makefile
+++ b/fonts/un-extra-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:37 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:34 joerg Exp $
 
 DISTNAME=	un-fonts-extra-1.0.2-080608
 PKGNAME=	${DISTNAME:S/fonts-extra/extra-ttf/:S/-0/.200/}
@@ -13,7 +13,6 @@ COMMENT=	Extra set of Un Korean TrueType fonts
 CONFLICTS+=	un-ttf-[0-9]*
 
 WRKSRC=		${WRKDIR}/un-fonts
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/vera-ttf/Makefile b/fonts/vera-ttf/Makefile
index 08658d7251f..181d760e662 100644
--- a/fonts/vera-ttf/Makefile
+++ b/fonts/vera-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:37 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:34 joerg Exp $
 #
 
 DISTNAME=	ttf-bitstream-vera-1.10
@@ -12,7 +12,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/fonts/
 COMMENT=	Bitstream Vera TrueType fonts
 
-USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
diff --git a/fonts/vlgothic-ttf/Makefile b/fonts/vlgothic-ttf/Makefile
index ca9328922b3..8289b775d62 100644
--- a/fonts/vlgothic-ttf/Makefile
+++ b/fonts/vlgothic-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/06/29 11:06:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2015/07/04 16:18:34 joerg Exp $
 #
 
 DISTNAME=	VLGothic-20141206
@@ -12,7 +12,6 @@ HOMEPAGE=	http://vlgothic.dicey.org/
 COMMENT=	Free Japanese TrueType fonts named 'VLGothic'
 LICENSE=	modified-bsd AND mplusfont
 
-USE_X11BASE=	YES
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 
diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile
index 43dc518f315..90101a0492f 100644
--- a/fonts/xmbdfed/Makefile
+++ b/fonts/xmbdfed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/01/19 20:23:34 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:34 joerg Exp $
 
 DISTNAME=	xmbdfed-4.5
 PKGREVISION=	5
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://crl.nmsu.edu/~mleisher/xmbdfed.html
 COMMENT=	Motif-based BDF font editor with lots of features
 
-USE_X11BASE=	YES
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
diff --git a/fonts/xmbdfed/distinfo b/fonts/xmbdfed/distinfo
index bf81afd7075..d7fac5ea4b0 100644
--- a/fonts/xmbdfed/distinfo
+++ b/fonts/xmbdfed/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2014/03/22 22:26:44 spz Exp $
+$NetBSD: distinfo,v 1.8 2015/07/04 16:18:34 joerg Exp $
 
 SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db
 RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26
 Size (xmbdfed-4.5.tar.gz) = 282055 bytes
-SHA1 (patch-aa) = 9c01eb9c4d160e8747fe2f9d68bb16a2b6afc197
+SHA1 (patch-aa) = 55740a6f3bf01bf149bc953078a0cf75eea4dc11
 SHA1 (patch-ab) = 2ddd129850dfc53e46ba0df8d62239ffb5fac0eb
 SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d
diff --git a/fonts/xmbdfed/patches/patch-aa b/fonts/xmbdfed/patches/patch-aa
index 998058b4097..089f43f7385 100644
--- a/fonts/xmbdfed/patches/patch-aa
+++ b/fonts/xmbdfed/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:34 joerg Exp $
 
 --- Makefile.orig	Fri Mar 17 05:08:49 2000
 +++ Makefile	Wed Mar 20 00:37:53 2002
@@ -14,8 +14,8 @@ $NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $
 -#FTYPE_INCS = -I/usr/local/include
 -#FTYPE_LIBS = -L/user/local/lib -lttf
 -#FTYPE_DEFS = -DHAVE_FREETYPE
-+FTYPE_INCS = -I${X11PREFIX}/include/freetype
-+FTYPE_LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -lttf
++FTYPE_INCS = -I${X11BASE}/include/freetype
++FTYPE_LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lttf
 +FTYPE_DEFS = -DHAVE_FREETYPE
  
 @@ -66,3 +66,3 @@
@@ -25,8 +25,8 @@ $NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $
  
 @@ -73,2 +73,6 @@
  
-+INCS = -I${X11PREFIX}/include -I${PREFIX}/include ${FTYPE_INCS}
-+LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \
++INCS = -I${X11BASE}/include -I${PREFIX}/include ${FTYPE_INCS}
++LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \
 +       -lXm -lXmu -lXt -lXext -lX11 ${FTYPE_LIBS}
 +
  #