[pkgsrc/trunk]: pkgsrc/x11/xorg-clients Don't build the DGA extension on the ...

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/929a8d17654a
branches:  trunk
changeset: 492569:929a8d17654a
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri Apr 15 15:31:14 2005 +0000

description:
Don't build the DGA extension on the unsupported architectures.
Unify the PLIST files.

diffstat:

 x11/xorg-clients/Makefile       |   7 +------
 x11/xorg-clients/PLIST          |   4 +++-
 x11/xorg-clients/PLIST.dga      |   2 --
 x11/xorg-clients/files/host.def |  11 ++++++++++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 4dfb0a70c779 -r 929a8d17654a x11/xorg-clients/Makefile
--- a/x11/xorg-clients/Makefile Fri Apr 15 15:26:48 2005 +0000
+++ b/x11/xorg-clients/Makefile Fri Apr 15 15:31:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/15 15:31:14 hira Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-clients-${XORG_VER}
@@ -63,11 +63,6 @@
 .  include "../../security/PAM/buildlink3.mk"
 .endif
 
-PLIST_SRC+=    PLIST
-.if ${OPSYS} != "Darwin"
-PLIST_SRC+=    PLIST.dga
-.endif
-
 .include "../../meta-pkgs/xorg/Makefile.common"
 
 .include "../../fonts/Xft2/buildlink3.mk"
diff -r 4dfb0a70c779 -r 929a8d17654a x11/xorg-clients/PLIST
--- a/x11/xorg-clients/PLIST    Fri Apr 15 15:26:48 2005 +0000
+++ b/x11/xorg-clients/PLIST    Fri Apr 15 15:31:14 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/03/22 09:51:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/04/15 15:31:14 hira Exp $
 ${X11ROOT_PREFIX}/bin/Xmark
 ${X11ROOT_PREFIX}/bin/appres
 ${X11ROOT_PREFIX}/bin/atobm
@@ -9,6 +9,7 @@
 ${X11ROOT_PREFIX}/bin/bmtoa
 ${X11ROOT_PREFIX}/bin/chooser
 ${X11ROOT_PREFIX}/bin/cxpm
+${DGA}${X11ROOT_PREFIX}/bin/dga
 ${X11ROOT_PREFIX}/bin/dpsexec
 ${X11ROOT_PREFIX}/bin/dpsinfo
 ${X11ROOT_PREFIX}/bin/editres
@@ -751,6 +752,7 @@
 ${X11ROOT_PREFIX}/${MAN_DIR}/bitmap.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/bmtoa.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/cxpm.${MAN_SUFFIX}
+${DGA}${X11ROOT_PREFIX}/${MAN_DIR}/dga.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/dpsexec.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/dpsinfo.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/editres.${MAN_SUFFIX}
diff -r 4dfb0a70c779 -r 929a8d17654a x11/xorg-clients/PLIST.dga
--- a/x11/xorg-clients/PLIST.dga        Fri Apr 15 15:26:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-${X11ROOT_PREFIX}/bin/dga
-${X11ROOT_PREFIX}/${MAN_DIR}/dga.${MAN_SUFFIX}
diff -r 4dfb0a70c779 -r 929a8d17654a x11/xorg-clients/files/host.def
--- a/x11/xorg-clients/files/host.def   Fri Apr 15 15:26:48 2005 +0000
+++ b/x11/xorg-clients/files/host.def   Fri Apr 15 15:31:14 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.5 2005/03/01 19:00:11 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.6 2005/04/15 15:31:14 hira Exp $ */
 
 #define ProjectRoot @PREFIX@
 #define BuildHtmlManPages NO
@@ -66,3 +66,12 @@
 
 #define XdmDir @PKG_SYSCONFDIR@
 #define XdmEgDir @EGDIR@
+
+#ifndef DarwinArchitecture
+#  if defined(i386Architecture) || defined(AMD64Architecture) || \
+      defined(Sparc64Architecture)
+#define BuildXF86DGA YES
+#  else
+#define BuildXF86DGA NO
+#  endif
+#endif