Require hacks for fixing autoconf + space in variable name issue.

25 files changed, 75 insertions, 25 deletions

diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index 5e2d8ec50a1..9ba3811e19a 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/05/29 14:22:27 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/06/09 07:00:46 obache Exp $
 
 DISTNAME=		imake-1.0.5
 CATEGORIES=		x11 devel
@@ -41,6 +41,8 @@ SUBST_STAGE.xmkmf=	post-build
 SUBST_FILES.xmkmf=	xmkmf
 SUBST_SED.xmkmf=	-e "s/^configdirspec= */configdirspec=/"
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index a1cc0cf5b9e..3a56016b93b 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/05/29 14:20:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:46 obache Exp $
 #
 
 DISTNAME=		makedepend-1.0.4
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 8bf16b69318..97c99bae7f3 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 17:55:41 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:49 obache Exp $
 #
 
 DISTNAME=		bitmap-1.0.6
@@ -17,6 +17,8 @@ USE_TOOLS+=		pkg-config
 
 MAKE_FLAGS+=		appdefaultdir=${PREFIX}/lib/X11/app-defaults
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libFS/Makefile b/x11/libFS/Makefile
index d9cb1fd16fe..a42a732639e 100644
--- a/x11/libFS/Makefile
+++ b/x11/libFS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/03 17:22:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/06/09 07:00:46 obache Exp $
 #
 
 DISTNAME=		libFS-1.0.4
@@ -25,6 +25,8 @@ PKGCONFIG_OVERRIDE+=	libfs.pc.in
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 272585c319c..671d9dbb586 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/03 17:23:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/06/09 07:00:46 obache Exp $
 #
 
 DISTNAME=		libICE-1.0.8
@@ -21,6 +21,8 @@ PKGCONFIG_OVERRIDE+=	ice.pc.in
 
 .include "options.mk"
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
 
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 5712767bb0c..69834acc5d0 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/03 17:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/06/09 07:00:47 obache Exp $
 #
 
 DISTNAME=		libSM-1.2.1
@@ -23,6 +23,8 @@ CONFIGURE_ARGS+=	--without-libuuid
 
 .include "options.mk"
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index e269ffd23ec..d1b35e54810 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 17:31:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:47 obache Exp $
 #
 
 DISTNAME=		libXScrnSaver-1.2.2
@@ -27,6 +27,8 @@ PKGCONFIG_OVERRIDE+=	xscrnsaver.pc.in
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.2.0
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 7edc3227902..53798cdd212 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/03 17:25:09 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/06/09 07:00:47 obache Exp $
 #
 
 DISTNAME=		libXau-1.0.7
@@ -24,6 +24,8 @@ PKGCONFIG_OVERRIDE+=	xau.pc.in
 
 CPPFLAGS.OSF1+=		-pthread # Required by compiler if including pthread.h
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index e481b8db34c..657a7c3600c 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/06/03 17:39:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/09 07:00:48 obache Exp $
 #
 
 DISTNAME=		libXcursor-1.1.13
@@ -20,6 +20,8 @@ USE_TOOLS+=		pkg-config
 
 PKGCONFIG_OVERRIDE+=	xcursor.pc.in
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index c540530361e..3048651f2b6 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/06/03 17:26:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/09 07:00:47 obache Exp $
 #
 
 DISTNAME=		libXdmcp-1.1.1
@@ -17,6 +17,8 @@ USE_TOOLS+=		pkg-config
 PKGCONFIG_OVERRIDE+=	xdmcp.pc.in
 GNU_CONFIGURE=		yes
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index ae13ae5d9f1..dab98d3a4ba 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/06/03 17:30:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/06/09 07:00:47 obache Exp $
 #
 
 DISTNAME=		libXext-1.3.1
@@ -34,6 +34,8 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.2
 .include "../../x11/libX11/buildlink3.mk"
 BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.0.99.2
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index c6fcec96536..3ab00e56355 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 17:44:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:48 obache Exp $
 
 DISTNAME=	libXinerama-1.1.2
 CATEGORIES=	x11
@@ -25,6 +25,8 @@ PKGCONFIG_OVERRIDE+=	xinerama.pc.in
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index 40dd7c4e32e..adc05d14a19 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 17:34:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:47 obache Exp $
 #
 
 DISTNAME=		libXmu-1.1.1
@@ -19,6 +19,8 @@ PKGCONFIG_OVERRIDE+=	xmuu.pc.in
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 58846300b4d..e54128b6cd0 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/06/03 17:35:38 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/06/09 07:00:48 obache Exp $
 #
 
 DISTNAME=		libXpm-3.5.10
@@ -43,6 +43,8 @@ CONFIGURE_ARGS+=	XPM_CFLAGS=${XPM_CFLAGS:Q} \
 			SXPM_LIBS=${SXPM_LIBS:Q}
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 5ebe77b5cff..c630f084e55 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 17:38:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:48 obache Exp $
 #
 
 DISTNAME=		libXrender-0.9.7
@@ -27,6 +27,8 @@ PKGCONFIG_OVERRIDE+=	xrender.pc.in
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index b1d56c4d993..46e83d87fdb 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 17:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:48 obache Exp $
 #
 
 DISTNAME=		libXres-1.0.6
@@ -24,6 +24,8 @@ PKGCONFIG_OVERRIDE+=	xres.pc.in
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/resourceproto/buildlink3.mk"
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 93677f1922c..a90b568b94b 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/03 17:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/06/09 07:00:48 obache Exp $
 #
 
 DISTNAME=		libXtst-1.2.1
@@ -20,6 +20,8 @@ PKGCONFIG_OVERRIDE+=	xtst.pc.in
 
 CONFIGURE_ENV+=		ac_cv_path_XMLTO=	# empty
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/inputproto/buildlink3.mk"
 BUILDLINK_API_DEPENDS.recordproto+=	recordproto>=1.13.99.1
 .include "../../x11/recordproto/buildlink3.mk"
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 1f800c53cf6..5c214c1a824 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 17:46:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:48 obache Exp $
 #
 
 DISTNAME=		libXv-1.0.7
@@ -24,6 +24,8 @@ USE_TOOLS+=		pkg-config
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 1ae3f91964f..5020f0b6a8c 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 17:47:14 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:49 obache Exp $
 #
 
 DISTNAME=		libXvMC-1.0.7
@@ -25,6 +25,8 @@ PKGCONFIG_OVERRIDE+=	xvmc.pc.in
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index 97f42722acc..27a458ddf2b 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/03 17:48:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/06/09 07:00:49 obache Exp $
 #
 
 DISTNAME=		libXxf86dga-1.1.3
@@ -26,6 +26,8 @@ PKGCONFIG_OVERRIDE+=	xxf86dga.pc.in
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index e1b27b6ac45..f4a4d4d5522 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 17:49:08 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:49 obache Exp $
 #
 
 DISTNAME=		libXxf86vm-1.1.2
@@ -26,6 +26,8 @@ CONFIGURE_ENV+=		LIB_MAN_SUFFIX=3
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index c396a60615c..d8b2a02aaa4 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/06/03 17:49:53 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/09 07:00:49 obache Exp $
 #
 
 DISTNAME=		libxkbfile-1.0.8
@@ -17,6 +17,8 @@ PKGCONFIG_OVERRIDE+=	xkbfile.pc.in
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index 909e07faad8..9dc01aff1f6 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 17:58:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:49 obache Exp $
 #
 
 DISTNAME=		listres-1.0.3
@@ -18,5 +18,7 @@ USE_TOOLS+=		pkg-config
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index 5ae93edd082..a3bea2a4692 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 18:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:49 obache Exp $
 #
 
 DISTNAME=	xev-1.2.0
@@ -17,6 +17,8 @@ USE_TOOLS+=	pkg-config
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
index 08f4e4f581b..f78d9342251 100644
--- a/x11/xwd/Makefile
+++ b/x11/xwd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 18:33:08 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:50 obache Exp $
 #
 
 DISTNAME=	xwd-1.0.5
@@ -17,6 +17,8 @@ USE_TOOLS+=	pkg-config
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
+.include "../../meta-pkgs/modular-xorg/hacks.mk"
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"