[pkgsrc/trunk]: pkgsrc Define a variable EMUL_IS_NATIVE if the emulated opera...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4a4b297be21
branches:  trunk
changeset: 532560:a4a4b297be21
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 23 13:43:57 2007 +0000

description:
Define a variable EMUL_IS_NATIVE if the emulated operating system
matches the native operating system.  Use it in place of checking
whether EMUL_DISTRO matches "native-*" as EMUL_DISTRO is no longer
defined after bsd.prefs.mk is included.

This should fix PR pkg/36823 by Robert Elz.

diffstat:

 mk/emulator/emulator-vars.mk      |  10 +++++++++-
 www/seamonkey-bin/Makefile.common |   6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 505822ea9d2b -r a4a4b297be21 mk/emulator/emulator-vars.mk
--- a/mk/emulator/emulator-vars.mk      Thu Aug 23 13:12:47 2007 +0000
+++ b/mk/emulator/emulator-vars.mk      Thu Aug 23 13:43:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: emulator-vars.mk,v 1.6 2007/08/22 14:47:10 jlam Exp $
+# $NetBSD: emulator-vars.mk,v 1.7 2007/08/23 13:43:57 jlam Exp $
 #
 # This file is included by bsd.prefs.mk only if EMUL_PLATFORMS is defined
 # and non-empty.
@@ -42,6 +42,10 @@
 #      package isn't supported on this machine, then its value is
 #      "none".
 #
+# EMUL_IS_NATIVE
+#      Whether or not the operating system being emulated matches the
+#      native operating system.  It is either defined or undefined.
+#
 
 # _EMUL_OPSYS
 #      A table that maps ${OPSYS} to the operating system names
@@ -112,3 +116,7 @@
 EMUL_ARCH?=            ${EMUL_PLATFORM:C/.*-//}
 EMUL_OPSYS?=           ${EMUL_PLATFORM:C/-.*//}
 .endif
+
+.if ${_EMUL_OPSYS} == ${EMUL_OPSYS}
+EMUL_IS_NATIVE=                defined
+.endif
diff -r 505822ea9d2b -r a4a4b297be21 www/seamonkey-bin/Makefile.common
--- a/www/seamonkey-bin/Makefile.common Thu Aug 23 13:12:47 2007 +0000
+++ b/www/seamonkey-bin/Makefile.common Thu Aug 23 13:43:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2007/08/06 08:51:40 tron Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/08/23 13:43:57 jlam Exp $
 
 DISTNAME=              ${MOZILLA}${MOX_EXTRA}-bin      # overridden below
 PKGNAME=               ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
@@ -29,7 +29,7 @@
 SUSE_VERSION_REQD=     7.3
 .endif
 
-.if !empty(EMUL_DISTRO:Mnative-*)
+.if defined(EMUL_IS_NATIVE)
 .  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
 DEPENDS+=              gtk2+>=2.2:../../x11/gtk2
 .  else
@@ -98,7 +98,7 @@
 # builds typically want exactly 'libgtk-1.2.so.0', etc. symlink them
 # into the mozilla directory.
 post-install:
-.if !empty(EMUL_DISTRO:Mnative-*)
+.if defined(EMUL_IS_NATIVE)
 .  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
        @cd ${MOZILLA_LIB} && \
        ${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .;                       \