pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Simplify comparison.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0ba1c9d3c4d
branches:  trunk
changeset: 492573:d0ba1c9d3c4d
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri Apr 15 16:38:07 2005 +0000

description:
Simplify comparison.

diffstat:

 meta-pkgs/xorg/Makefile.common |  6 +++---
 x11/xorg-libs/Makefile         |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r cc82546d48b8 -r d0ba1c9d3c4d meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common    Fri Apr 15 16:37:09 2005 +0000
+++ b/meta-pkgs/xorg/Makefile.common    Fri Apr 15 16:38:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/04/15 15:20:47 hira Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/04/15 16:38:32 hira Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will
 #   be built in.
@@ -160,8 +160,8 @@
 MESSAGE_SUBST+=                X11ROOT=${X11ROOT}
 
 .if ${OPSYS} != "Darwin"
-.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \
-      !empty(MACHINE_ARCH:Msparc64)
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+      ${MACHINE_ARCH} == "sparc64"
 PLIST_SUBST+=           DGA=
 .  else
 PLIST_SUBST+=           DGA='@comment '
diff -r cc82546d48b8 -r d0ba1c9d3c4d x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Fri Apr 15 16:37:09 2005 +0000
+++ b/x11/xorg-libs/Makefile    Fri Apr 15 16:38:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/15 15:26:48 hira Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/15 16:38:07 hira Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
@@ -20,8 +20,8 @@
 XORG_PLIST_ENTRY=      ${OPSYS}
 .if ${OPSYS} != "Darwin"
 XORG_PLIST_ENTRY+=     i18n
-.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \
-      !empty(MACHINE_ARCH:Msparc64)
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+      ${MACHINE_ARCH} == "sparc64"
 XORG_PLIST_ENTRY+=     DGA-common
 .  endif
 .endif



Home | Main Index | Thread Index | Old Index