diff options
author | hira <hira@pkgsrc.org> | 2005-04-15 15:31:14 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2005-04-15 15:31:14 +0000 |
commit | 1cf23810056eb1cecb91a6c8519905adc9b0d11e (patch) | |
tree | 881ea0a091528ee8f685594f71964abab070b576 | |
parent | c93d4202c7e0cd10a1874a983888152aba1dbffa (diff) | |
download | pkgsrc-1cf23810056eb1cecb91a6c8519905adc9b0d11e.tar.gz |
Don't build the DGA extension on the unsupported architectures.
Unify the PLIST files.
-rw-r--r-- | x11/xorg-clients/Makefile | 7 | ||||
-rw-r--r-- | x11/xorg-clients/PLIST | 4 | ||||
-rw-r--r-- | x11/xorg-clients/PLIST.dga | 2 | ||||
-rw-r--r-- | x11/xorg-clients/files/host.def | 11 |
4 files changed, 14 insertions, 10 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index a1317e69869..2008b29abf6 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -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 @@ post-install: . 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 --git a/x11/xorg-clients/PLIST b/x11/xorg-clients/PLIST index 4e977ba6df7..864a141c77f 100644 --- a/x11/xorg-clients/PLIST +++ b/x11/xorg-clients/PLIST @@ -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/bitmap ${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}/beforelight.${MAN_SUFFIX} ${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 --git a/x11/xorg-clients/PLIST.dga b/x11/xorg-clients/PLIST.dga deleted file mode 100644 index ef4284f7655..00000000000 --- a/x11/xorg-clients/PLIST.dga +++ /dev/null @@ -1,2 +0,0 @@ -${X11ROOT_PREFIX}/bin/dga -${X11ROOT_PREFIX}/${MAN_DIR}/dga.${MAN_SUFFIX} diff --git a/x11/xorg-clients/files/host.def b/x11/xorg-clients/files/host.def index 0302f7ec006..ead3cc9c2cd 100644 --- a/x11/xorg-clients/files/host.def +++ b/x11/xorg-clients/files/host.def @@ -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 |