10 files changed, 15 insertions, 21 deletions
diff --git a/wm/aewm++/distinfo b/wm/aewm++/distinfo
index 143ce189e01..774153d04f0 100644
--- a/wm/aewm++/distinfo
+++ b/wm/aewm++/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/03/13 16:50:37 tnn Exp $
+$NetBSD: distinfo,v 1.7 2015/07/04 16:18:40 joerg Exp $
 
 SHA1 (aewm++-1.0.24.tar.bz2) = 366da85a5edf47e3214c772007aebb2daf7d18d0
 RMD160 (aewm++-1.0.24.tar.bz2) = 6e37b29343948f469dcceba90732209b4b7324b9
 Size (aewm++-1.0.24.tar.bz2) = 36642 bytes
-SHA1 (patch-aa) = 9ca0d09a37893c8de049fcaa9eff7e2958c317b8
+SHA1 (patch-aa) = 0594007d3da7e03ab41a52103985a8fc68f3b0e3
 SHA1 (patch-ab) = fb68b8580de648b9af46f0e994388bb586294644
 SHA1 (patch-client.cc) = ab9d467920ecb1d402e33cb3ee429264ab42f9a8
 SHA1 (patch-main.cc) = 4cbc321d877543aa1224c8c2548df85335e9b2ef
diff --git a/wm/aewm++/patches/patch-aa b/wm/aewm++/patches/patch-aa
index 3bc024e1649..14f20a80448 100644
--- a/wm/aewm++/patches/patch-aa
+++ b/wm/aewm++/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2015/03/13 16:50:37 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:41 joerg Exp $
 
 --- Makefile.orig	2002-11-15 23:28:08.000000000 +0000
 +++ Makefile
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.3 2015/03/13 16:50:37 tnn Exp $
 -INCLUDES = -I$(prefix)/include
 -LDPATH   = -L/usr/X11R6/lib
 +prefix   = ${PREFIX}
-+INCLUDES = -I${X11PREFIX}/include
++INCLUDES = -I${X11BASE}/include
 +LDPATH   = ${LDFLAGS}
  LIBS     = -lXext -lX11
  
diff --git a/wm/fvwm-themes/Makefile b/wm/fvwm-themes/Makefile
index f65046563d0..76f719fcfc8 100644
--- a/wm/fvwm-themes/Makefile
+++ b/wm/fvwm-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/06/12 10:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/07/04 16:18:41 joerg Exp $
 #
 
 DISTNAME=	fvwm-themes-${THEM_VER}
@@ -20,7 +20,6 @@ THEM_VER=	0.6.2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_TOOLS+=	perl:run
-USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-ft-datadir=${PREFIX}/share/fvwm2
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index c1214df6df9..d45cf0b725b 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/06/12 10:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2015/07/04 16:18:41 joerg Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 PKGREVISION=	6
@@ -18,7 +18,6 @@ CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* xpmroot-[0-9]*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 FVWM_VER=	2.6.5
 
-USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		perl:run tar
 
diff --git a/wm/icewmconf/Makefile b/wm/icewmconf/Makefile
index b9a4cbbfc2d..db14ac52981 100644
--- a/wm/icewmconf/Makefile
+++ b/wm/icewmconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/08 12:42:21 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:41 joerg Exp $
 
 DISTNAME=	icewmconf-2.1.0
 PKGREVISION=	2
@@ -22,7 +22,7 @@ post-extract:
 
 post-patch:
 	${MV} ${FILENAME} ${FILENAME}.orig
-	${SED} 's#PREFIX#${X11PREFIX}#g' \
+	${SED} 's#PREFIX#${PREFIX}#g' \
 		< ${FILENAME}.orig > ${FILENAME}
 
 do-install:
diff --git a/wm/spectrwm/Makefile b/wm/spectrwm/Makefile
index 502d491339b..a126fc413cc 100644
--- a/wm/spectrwm/Makefile
+++ b/wm/spectrwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/01/14 08:30:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:41 joerg Exp $
 
 DISTNAME=	spectrwm-2.5.1
 CATEGORIES=	wm
@@ -25,8 +25,8 @@ MAKE_FLAGS+=	MANINSTALL=maninstall
 CFLAGS+=	-DSWM_LIB=\"${PREFIX}/lib/libswmhack.so.0.0\"
 .else
 USE_TOOLS+=	gmake
-CFLAGS+=	-I${X11PREFIX}/include
-LDFLAGS+=	-L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib
+CFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 .  if ${OPSYS} == "Darwin"
 BUILD_DIRS=	osx
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index e0769b291d1..055e64d46b1 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:16 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2015/07/04 16:18:41 joerg Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -14,7 +14,6 @@ BUILD_TARGET=	depend wm2
 
 USE_TOOLS+=	makedepend
 USE_LANGUAGES=	c c++
-USE_X11BASE=	YES
 MAKE_ENV+=	CCC=${CXX:Q}
 
 INSTALLATION_DIRS=	bin share/doc/wm2
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 38894ad74b6..5db3d49c59c 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2015/06/12 10:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2015/07/04 16:18:41 joerg Exp $
 
 DISTNAME=	wmakerconf-2.11
 PKGREVISION=	40
@@ -11,7 +11,6 @@ COMMENT=	Gtk+ based configuration tool for Window Maker
 LICENSE=	gnu-gpl-v2
 
 USE_PKGLOCALEDIR=	yes
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gzip tar perl:run pkg-config msgfmt
 
diff --git a/wm/wmextra/Makefile b/wm/wmextra/Makefile
index 8b93edf25fe..6e7f3136a4e 100644
--- a/wm/wmextra/Makefile
+++ b/wm/wmextra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/08 12:42:25 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:41 joerg Exp $
 #
 
 DISTNAME=		WindowMaker-extra-0.1
@@ -13,7 +13,6 @@ COMMENT=		Extras for Window Maker window manager
 
 DEPENDS+=		windowmaker>=0.80.0nb1:../../wm/windowmaker
 
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index 50a05cc4bbd..72a97421879 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2014/10/09 14:07:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.25 2015/07/04 16:18:41 joerg Exp $
 #
 # used by wm/wmx/Makefile
 # used by wm/wmx-gnome/Makefile
@@ -14,7 +14,6 @@ HOMEPAGE=	http://www.all-day-breakfast.com/wmx/
 CONFLICTS+=	wmx-[0-9]* wmx-gnome-[0-9]*
 
 USE_LANGUAGES=		c c++
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 BUILD_TARGET=		depend all