Centralize some more things in Makefile.common.

3 files changed, 14 insertions, 26 deletions

diff --git a/www/seamonkey-gtk1/Makefile b/www/seamonkey-gtk1/Makefile
index b3564223f11..1e9213f30be 100644
--- a/www/seamonkey-gtk1/Makefile
+++ b/www/seamonkey-gtk1/Makefile
@@ -1,20 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/08/03 09:37:35 ghen Exp $
+# $NetBSD: Makefile,v 1.7 2006/09/15 14:05:23 ghen Exp $
 
 MOZILLA=		seamonkey-gtk1
-MOZILLA_BIN=		seamonkey-bin
-MOZ_VER=		1.0.4
-EXTRACT_SUFX=		.tar.bz2
-
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-DISTINFO_FILE=		${.CURDIR}/../../www/seamonkey/distinfo
-PATCHDIR=		${.CURDIR}/../../www/seamonkey/patches
-FILESDIR=		${.CURDIR}/../../www/mozilla/files
-
 COMMENT=		Full featured gecko-based browser built with GTK1
 
-BUILD_SVG=		# yes
-BUILD_MATHML=		# yes
-BUILD_CALENDAR=		# yes
-
 .include "../../www/seamonkey/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index bdc94b42b9d..9906fb67fcb 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,18 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/08/03 09:37:35 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2006/09/15 14:05:23 ghen Exp $
 
 MOZILLA=		seamonkey
-MOZILLA_BIN=		seamonkey-bin
-MOZ_VER=		1.0.4
-EXTRACT_SUFX=		.tar.bz2
-
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 
 COMMENT=		Full featured gecko-based browser
 
-BUILD_SVG=		# yes
-BUILD_MATHML=		# yes
-BUILD_CALENDAR=		# yes
-
 MOZILLA_USE_GTK2=	# yes
 MOZILLA_USE_XFT=	YES
 
diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index c22525f82c2..09f60b15608 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.7 2006/06/28 21:23:29 joerg Exp $
+# $NetBSD: Makefile.common,v 1.8 2006/09/15 14:05:23 ghen Exp $
 
+MOZ_VER=		1.0.4
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		seamonkey-${MOZ_DIST_VER}.source
 PKGNAME=		${MOZILLA}-${MOZ_VER}
@@ -8,10 +9,15 @@ MASTER_SITES+=		ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/${MOZ_V
 MASTER_SITES+=		http://public.planetmirror.com.au/pub/seamonkey/releases/${MOZ_VER}/
 MASTER_SITES+=		ftp://public.planetmirror.com.au/pub/seamonkey/releases/${MOZ_VER}/
 CATEGORIES=		www
-
+EXTRACT_SUFX=          .tar.bz2
+ 
 MAINTAINER=		ghen@NetBSD.org
 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/mozilla/files
 
 BUILD_DEPENDS+=		zip>=2.3:../../archivers/zip
@@ -81,6 +87,10 @@ MAKE_ENV+=		LIBRUNPATH=${MOZ_LIBDIR:Q}
 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