Don't build the DGA extension on the unsupported architectures.

3 files changed, 58 insertions, 50 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 2322533925f..fa89b2afa1d 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/14 21:35:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/15 15:26:48 hira Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
@@ -18,13 +18,12 @@ BUILD_DEPENDS=		xorg-imake>=${XORG_VER}:../../x11/xorg-imake
 
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 XORG_PLIST_ENTRY=	${OPSYS}
-.if ${OPSYS} == "NetBSD"
-.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
-XORG_PLIST_ENTRY+=	NetBSD-i386
-.  endif
-.endif
 .if ${OPSYS} != "Darwin"
 XORG_PLIST_ENTRY+=	i18n
+.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \
+      !empty(MACHINE_ARCH:Msparc64)
+XORG_PLIST_ENTRY+=	DGA-common
+.  endif
 .endif
 
 .include "../../meta-pkgs/xorg/Makefile.common"
diff --git a/x11/xorg-libs/PLIST b/x11/xorg-libs/PLIST
index e3afc355c07..e95a9a12d79 100644
--- a/x11/xorg-libs/PLIST
+++ b/x11/xorg-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2005/03/30 20:29:19 hira Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/04/15 15:26:48 hira Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -734,9 +734,9 @@ ${X11ROOT_PREFIX}/lib/libXv.so.1
 ${X11ROOT_PREFIX}/lib/libXvMC.a
 ${X11ROOT_PREFIX}/lib/libXvMC.so
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
 ${X11ROOT_PREFIX}/lib/libXxf86misc.a
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
@@ -861,9 +861,9 @@ ${X11ROOT_PREFIX}/lib/libXv.so.1
 ${X11ROOT_PREFIX}/lib/libXvMC.a
 ${X11ROOT_PREFIX}/lib/libXvMC.so
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
 ${X11ROOT_PREFIX}/lib/libXxf86misc.a
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
@@ -1010,9 +1010,9 @@ ${X11ROOT_PREFIX}/lib/libXv.so.1.0
 ${X11ROOT_PREFIX}/lib/libXvMC.so
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
@@ -1166,6 +1166,10 @@ ${X11ROOT_PREFIX}/lib/libXvMC.a
 ${X11ROOT_PREFIX}/lib/libXvMC.so
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
 ${X11ROOT_PREFIX}/lib/libXxf86misc.a
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
@@ -1205,37 +1209,6 @@ ${X11ROOT_PREFIX}/lib/libxkbui.so
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
 @comment end NetBSD
-@comment begin NetBSD-i386
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dga.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1str.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dgastr.h
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGA.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAChangePixmapMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACloseFramebuffer.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyArea.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyTransparentArea.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACreateColormap.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAFillRectangle.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAGetViewportStatus.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAInstallColormap.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAKeyEventToXKeyEvent.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAOpenFramebuffer.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryModes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASelectInput.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetClientVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetViewport.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASync.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86DGA.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XFree86-DGA.${LIBMAN_SUFFIX}
-@comment end NetBSD-i386
 @comment begin OpenBSD
 ${X11ROOT_PREFIX}/lib/libFS.a
 ${X11ROOT_PREFIX}/lib/libFS.so.8.0
@@ -1289,8 +1262,8 @@ ${X11ROOT_PREFIX}/lib/libXv.a
 ${X11ROOT_PREFIX}/lib/libXv.so.3.0
 ${X11ROOT_PREFIX}/lib/libXvMC.a
 ${X11ROOT_PREFIX}/lib/libXvMC.so.3.0
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.3.0
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.3.0
 ${X11ROOT_PREFIX}/lib/libXxf86misc.a
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.3.0
 ${X11ROOT_PREFIX}/lib/libXxf86vm.a
@@ -1322,6 +1295,33 @@ ${X11ROOT_PREFIX}/lib/libXdamage.a
 ${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
 ${X11ROOT_PREFIX}/lib/libXcomposite.a
 @comment end OpenBSD
+@comment begin DGA-common
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1str.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dgastr.h
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGA.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAChangePixmapMode.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACloseFramebuffer.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyArea.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyTransparentArea.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACreateColormap.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAFillRectangle.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAGetViewportStatus.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAInstallColormap.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAKeyEventToXKeyEvent.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAOpenFramebuffer.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryExtension.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryModes.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASelectInput.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetClientVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetMode.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetViewport.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASync.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86DGA.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XFree86-DGA.${LIBMAN_SUFFIX}
+@comment end DGA-common
 @comment begin i18n
 ${X11ROOT_PREFIX}/lib/X11/locale/C/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XI18N_OBJS
diff --git a/x11/xorg-libs/files/host.def b/x11/xorg-libs/files/host.def
index cb858e84dc6..9eb20e994ce 100644
--- a/x11/xorg-libs/files/host.def
+++ b/x11/xorg-libs/files/host.def
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.3 2005/04/15 15:26:48 hira Exp $ */
 
 #define ProjectRoot @PREFIX@
 
@@ -74,3 +74,12 @@
 #define FontconfigDir @BLNK@
 
 #define BuildHtmlManPages NO
+
+#ifndef DarwinArchitecture
+#  if defined(i386Architecture) || defined(AMD64Architecture) || \
+      defined(Sparc64Architecture)
+#define BuildXF86DGA YES
+#  else
+#define BuildXF86DGA NO
+#  endif
+#endif