diff options
| author | hira <hira> | 2005-04-15 16:38:07 +0000 |
|---|---|---|
| committer | hira <hira> | 2005-04-15 16:38:07 +0000 |
| commit | 34a825189522ec6ea5630989617fb6da09cbbf5a (patch) | |
| tree | bf94313b8d6e299e6a3fc3310fdbdd4091c8969c | |
| parent | 68501f7acf72f5db4521eaa3d88b38f45a896e07 (diff) | |
| download | pkgsrc-34a825189522ec6ea5630989617fb6da09cbbf5a.tar.gz | |
Simplify comparison.
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 6 | ||||
| -rw-r--r-- | x11/xorg-libs/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index 1101a982fcd..c753c1e53a3 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -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 @@ PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX} 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 --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index fa89b2afa1d..410d2462dc0 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -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 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC 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 |