Remove USE_X11BASE and X11PREFIX.

18 files changed, 21 insertions, 38 deletions

diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 711544fe639..8c45f7da3bb 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2014/06/01 16:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	mule-2.3
 PKGREVISION=	8
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--terminal-face --mcpath --canna-libraries=${PREFIX}/lib
 .if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64"
 CONFIGURE_ARGS+=	--valbits=26
 .endif
-CONFIGURE_ARGS+=	--bdf-path=${X11PREFIX}/share/fonts/X11/intlfonts/bdf
+CONFIGURE_ARGS+=	--bdf-path=${PREFIX}/share/fonts/X11/intlfonts/bdf
 
 .include "options.mk"
 
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 5f72107e465..299ebd25b9b 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/03/12 17:32:58 tnn Exp $
+# $NetBSD: Makefile,v 1.42 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
@@ -18,14 +18,11 @@ WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${GZCAT} $$extract_file | ${SH}
 
 MANCOMPRESSED=		yes
-USE_X11BASE=		yes
-MAKE_ENV+=		X11PREFIX=${X11PREFIX:Q}
 
 INSTALLATION_DIRS=	bin include lib/X11/app-defaults \
 	${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man4 ${PKGMANDIR}/man6
 
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX:Q}		\
-			X11PREFIX=${DESTDIR}${X11PREFIX:Q}	\
 			MAN=${PKGMANDIR}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/editors/sam/distinfo b/editors/sam/distinfo
index d48b34e92de..41b57cdb59d 100644
--- a/editors/sam/distinfo
+++ b/editors/sam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/10/10 16:18:04 joerg Exp $
+$NetBSD: distinfo,v 1.6 2015/07/04 16:18:29 joerg Exp $
 
 SHA1 (sam.msg.gz) = c6d2baa07a3b7410658e31e6ebfb997809c8323e
 RMD160 (sam.msg.gz) = f3a6f354bd11b45966818188392c4655267f0571
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 76fa25ab4737f925eefe2e3876d862e7814d3d31
 SHA1 (patch-ac) = fa5ccdc02a82d4bd4a713f53a180126b85df0880
 SHA1 (patch-ad) = 3a456316d0806b6b6bc6f6143bb3dd3701f8c1e1
 SHA1 (patch-ae) = b95056d090d73ffa8920669027b43d16d6cf81f5
-SHA1 (patch-af) = b7f32619782b542773a85ea2d24c55f05782af94
+SHA1 (patch-af) = 9afde00ab2b86519dcf558c0e1e2232b3839b579
 SHA1 (patch-ag) = 348b5400cccdd8cdcc6e63244a6e28551bbfb354
 SHA1 (patch-ah) = 0126f1eee5bbcf59e3e08063d2cddffba83dc94b
 SHA1 (patch-ai) = ca76a0c22c4e962ec590e9aeff719c71bd6fdafc
diff --git a/editors/sam/patches/patch-af b/editors/sam/patches/patch-af
index 4eaeee2123e..4bf5ccd495d 100644
--- a/editors/sam/patches/patch-af
+++ b/editors/sam/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2001/05/01 09:16:25 agc Exp $
+$NetBSD: patch-af,v 1.5 2015/07/04 16:18:29 joerg Exp $
 
 --- Makefile.orig	Tue May  1 09:42:03 2001
 +++ Makefile	Tue May  1 09:43:37 2001
@@ -12,7 +12,7 @@ $NetBSD: patch-af,v 1.4 2001/05/01 09:16:25 agc Exp $
 +MAN3=add balloc bitblt cachechars event frame graphics rgbpix rune
 +MAN4=font keyboard utf
 +MAN6=bitmap regexp
-+APP_DEFAULT_DIR=${X11PREFIX}/lib/X11/app-defaults
++APP_DEFAULT_DIR=${PREFIX}/lib/X11/app-defaults
 +AD=Sam
 +
  all:	lXg lframe samdir samtermdir
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index b35277dc729..fde00537ddd 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:43 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	Ted_cs_CZ
 PKGNAME=	ted-cs-2.16
@@ -13,7 +13,6 @@ COMMENT=	Czech spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index c11bfeda887..f891859dc7e 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:43 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	Ted_da_DK
 PKGNAME=	ted-da-2.16
@@ -13,7 +13,6 @@ COMMENT=	Danish spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index eaf61fea8aa..634afcf1f07 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	Ted_de_DE
 PKGNAME=	ted-de-2.16
@@ -13,7 +13,6 @@ COMMENT=	German spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index e7997cb319b..b4dcbe1345f 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	Ted_en_GB
 PKGNAME=	ted-en-gb-2.16
@@ -13,7 +13,6 @@ COMMENT=	UK English spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
index 710b783d6b9..3763913fce3 100644
--- a/editors/ted-en-us/Makefile
+++ b/editors/ted-en-us/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/02/19 22:31:32 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-en-us-2.16
@@ -13,7 +13,6 @@ COMMENT=	US English spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}/Ted-2.16
-USE_X11BASE=	YES
 NO_BUILD=	YES
 
 USE_TOOLS+=		tar
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index d7a7b7a1420..3db69afce6d 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	Ted_es_ES
 PKGNAME=	ted-es-2.16
@@ -13,7 +13,6 @@ COMMENT=	Spanish spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index 94ed1e54472..ee76f32a02e 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $
 
 DISTNAME=	Ted_fr_FR
 PKGNAME=	ted-fr-2.16
@@ -13,7 +13,6 @@ COMMENT=	French spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index d1e3c5dd12b..d88c8d9d317 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	Ted_it_IT
 PKGNAME=	ted-it-2.16
@@ -13,7 +13,6 @@ COMMENT=	Italian spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index 9507ee7f32a..9654f56ea8d 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	Ted_nl_NL
 PKGNAME=	ted-nl-2.16
@@ -13,7 +13,6 @@ COMMENT=	Dutch spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 7a92b564019..edd52eef6c7 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	Ted_no_NO
 PKGNAME=	ted-no-2.16
@@ -13,7 +13,6 @@ COMMENT=	Norwegian spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile
index 0ff671ce673..084ae0a36dc 100644
--- a/editors/ted-pl/Makefile
+++ b/editors/ted-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/03 11:43:45 asau Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	Ted_pl_PL
 PKGNAME=	ted-pl-2.16
@@ -13,7 +13,6 @@ COMMENT=	Polish spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index 8cf9c95f213..dae9b63b9fc 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:45 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	Ted_pt_PT
 PKGNAME=	ted-pt-2.16
@@ -13,7 +13,6 @@ COMMENT=	Portuguese spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index 4969b18d954..e9d97ea30f2 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:45 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=	Ted_sv_SE
 PKGNAME=	ted-sv-2.16
@@ -13,7 +13,6 @@ COMMENT=	Swedish spelling dictionary for the Ted word processor
 DEPENDS+=	ted>=2.6:../../editors/ted
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	YES
 
 DIST_SUBDIR=	Ted-2.16
 NO_BUILD=	YES
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 5928981de08..cf643afaa28 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/04/06 13:24:18 rodent Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:30 joerg Exp $
 
 DISTNAME=		xcoral-3.2
 PKGREVISION=		1
@@ -10,7 +10,6 @@ COMMENT=	Multiwindow mouse-based text editor for X
 
 MAKE_JOBS_SAFE=		no
 
-USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 
 LIBFILES=	DEPEND README cmd.sc color.sc comments.sc compare-win.sc \