pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/seamonkey-bin Correct order of includes and checks...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d451c259c3d
branches:  trunk
changeset: 531773:8d451c259c3d
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Aug 06 08:51:40 2007 +0000

description:
Correct order of includes and checks. The "firefox-bin" package now gets
the necessary dependence on the "suse_gtk2" package.

diffstat:

 www/seamonkey-bin/Makefile.common |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r 3a8f6cd669f7 -r 8d451c259c3d www/seamonkey-bin/Makefile.common
--- a/www/seamonkey-bin/Makefile.common Mon Aug 06 05:28:36 2007 +0000
+++ b/www/seamonkey-bin/Makefile.common Mon Aug 06 08:51:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2007/07/29 05:20:04 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/08/06 08:51:40 tron Exp $
 
 DISTNAME=              ${MOZILLA}${MOX_EXTRA}-bin      # overridden below
 PKGNAME=               ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
@@ -14,6 +14,13 @@
 FILESDIR=              ${.CURDIR}/../../www/seamonkey-bin/files
 MOZILLA_SCRIPT?=       ${FILESDIR}/mozilla.sh
 
+.include "../../mk/bsd.prefs.mk"
+
+# Include Makefile.${EMUL_PLATFORM} to get definitions for DISTNAME,
+# MOZ_PLATFORM and MOZ_GTK2.
+#
+.sinclude "${.CURDIR}/Makefile.${EMUL_PLATFORM}"
+
 .if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
 EMUL_MODULES.linux=    compat gtk2 locale
 SUSE_VERSION_REQD=     9.1
@@ -22,8 +29,6 @@
 SUSE_VERSION_REQD=     7.3
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-
 .if !empty(EMUL_DISTRO:Mnative-*)
 .  if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
 DEPENDS+=              gtk2+>=2.2:../../x11/gtk2
@@ -32,11 +37,6 @@
 .  endif
 .endif
 
-# Include Makefile.${EMUL_PLATFORM} to get definitions for DISTNAME
-# and MOZ_PLATFORM.
-#
-.sinclude "${.CURDIR}/Makefile.${EMUL_PLATFORM}"
-
 MOZILLA_SHORT=         ${MOZILLA}
 MOZ_DIR?=              ${MOZ_VER}
 MOZ_PLATFORM?=         ${LOWER_OPSYS}



Home | Main Index | Thread Index | Old Index