[pkgsrc/trunk]: pkgsrc/www Split seamonkey specific parts of Makefile.common ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb2ac5389948
branches:  trunk
changeset: 519027:cb2ac5389948
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Sep 26 22:21:32 2006 +0000

description:
Split seamonkey specific parts of Makefile.common into
Makefile-seamonkey.common, modelled after firefox and thunderbird.

www/seamonkey and www/seamonkey-gtk1 test-built by me on i386.
www/seamonkey, www/seamonkey-gtk1, mail/thunderbird, mail/thunderbird-gtk1
and time/sunbird by <oster> on amd64, thanks!

Fixes PR pkg/34622

diffstat:

 www/seamonkey-gtk1/Makefile             |   4 ++--
 www/seamonkey/Makefile                  |   4 ++--
 www/seamonkey/Makefile-seamonkey.common |  24 ++++++++++++++++++++++++
 www/seamonkey/Makefile.common           |  15 ++-------------
 4 files changed, 30 insertions(+), 17 deletions(-)

diffs (103 lines):

diff -r d9bc8a312aab -r cb2ac5389948 www/seamonkey-gtk1/Makefile
--- a/www/seamonkey-gtk1/Makefile       Tue Sep 26 21:44:30 2006 +0000
+++ b/www/seamonkey-gtk1/Makefile       Tue Sep 26 22:21:32 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/09/15 14:05:23 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2006/09/26 22:21:32 salo Exp $
 
 MOZILLA=               seamonkey-gtk1
 COMMENT=               Full featured gecko-based browser built with GTK1
 
-.include "../../www/seamonkey/Makefile.common"
+.include "../../www/seamonkey/Makefile-seamonkey.common"
 .include "../../mk/bsd.pkg.mk"
diff -r d9bc8a312aab -r cb2ac5389948 www/seamonkey/Makefile
--- a/www/seamonkey/Makefile    Tue Sep 26 21:44:30 2006 +0000
+++ b/www/seamonkey/Makefile    Tue Sep 26 22:21:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/09/24 16:21:33 salo Exp $
+# $NetBSD: Makefile,v 1.10 2006/09/26 22:21:32 salo Exp $
 
 MOZILLA=               seamonkey
 PKGREVISION=           1
@@ -8,5 +8,5 @@
 MOZILLA_USE_GTK2=      # yes
 MOZILLA_USE_XFT=       YES
 
-.include "../../www/seamonkey/Makefile.common"
+.include "../../www/seamonkey/Makefile-seamonkey.common"
 .include "../../mk/bsd.pkg.mk"
diff -r d9bc8a312aab -r cb2ac5389948 www/seamonkey/Makefile-seamonkey.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/seamonkey/Makefile-seamonkey.common   Tue Sep 26 22:21:32 2006 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile-seamonkey.common,v 1.1 2006/09/26 22:21:32 salo Exp $
+
+MOZILLA_BIN=           seamonkey-bin
+MOZ_VER=               1.0.5
+EXTRACT_SUFX=          .tar.bz2
+DISTNAME=              seamonkey-${MOZ_DIST_VER}.source
+
+MASTER_SITES=          ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
+CATEGORIES=            www
+
+MAINTAINER=            ghen%NetBSD.org@localhost
+HOMEPAGE=              http://www.mozilla.org/projects/seamonkey
+
+
+DISTINFO_FILE=         ${.CURDIR}/../../www/seamonkey/distinfo
+PATCHDIR=              ${.CURDIR}/../../www/seamonkey/patches
+
+CONFIGURE_ARGS+=       --enable-application=suite
+
+BUILD_SVG=             # yes
+BUILD_CALENDAR=                # yes
+BUILD_MATHML=          # yes
+
+.include "../../www/seamonkey/Makefile.common"
diff -r d9bc8a312aab -r cb2ac5389948 www/seamonkey/Makefile.common
--- a/www/seamonkey/Makefile.common     Tue Sep 26 21:44:30 2006 +0000
+++ b/www/seamonkey/Makefile.common     Tue Sep 26 22:21:32 2006 +0000
@@ -1,21 +1,15 @@
-# $NetBSD: Makefile.common,v 1.13 2006/09/25 14:13:32 salo Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/09/26 22:21:32 salo Exp $
 
-MOZ_VER?=              1.0.5
 MOZ_DIST_VER?=         ${MOZ_VER}
 DISTNAME?=             seamonkey-${MOZ_DIST_VER}.source
 PKGNAME=               ${MOZILLA}-${MOZ_VER}
 MASTER_SITES?=         ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
 CATEGORIES?=           www
-EXTRACT_SUFX?=         .tar.bz2
 
 MAINTAINER?=           ghen%NetBSD.org@localhost
 HOMEPAGE?=             http://www.mozilla.org/projects/seamonkey
 
-MOZILLA_BIN=           seamonkey-bin
-
-DISTINFO_FILE?=                ${.CURDIR}/../../www/seamonkey/distinfo
-PATCHDIR?=             ${.CURDIR}/../../www/seamonkey/patches
-FILESDIR?=             ${.CURDIR}/../../www/seamonkey/files
+FILESDIR=              ${.CURDIR}/../../www/seamonkey/files
 
 BUILD_DEPENDS+=                zip>=2.3:../../archivers/zip
 
@@ -46,7 +40,6 @@
 # rpaths until this has happened.
 PKGCONFIG_OVERRIDE_STAGE=      post-build
 
-CONFIGURE_ARGS+=       --enable-application=suite
 CONFIGURE_ARGS+=       --disable-tests
 CONFIGURE_ARGS+=       --disable-pedantic
 CONFIGURE_ARGS+=       --with-system-jpeg=${BUILDLINK_PREFIX.jpeg:Q}
@@ -84,10 +77,6 @@
 CONFIGURE_ENV+=                LIBRUNPATH=${MOZ_LIBDIR:Q}
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
 
-BUILD_SVG=             # yes
-BUILD_CALENDAR=                # yes
-BUILD_MATHML=          # yes
-
 .if defined(BUILD_SVG)
 MAKE_ENV+=             MOZ_INTERNAL_LIBART_LGPL=1
 CONFIGURE_ENV+=                MOZ_INTERNAL_LIBART_LGPL=1