From owner-freebsd-gecko@FreeBSD.ORG  Fri Aug 24 12:37:21 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EDE29106566B
	for <freebsd-gecko@freebsd.org>; Fri, 24 Aug 2012 12:37:20 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 6402C8FC08
	for <freebsd-gecko@freebsd.org>; Fri, 24 Aug 2012 12:37:20 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q7OCbJ1G038004
	for <freebsd-gecko@freebsd.org>; Fri, 24 Aug 2012 12:37:19 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7OCbEcf037557
	for freebsd-gecko@freebsd.org; Fri, 24 Aug 2012 12:37:14 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 24 Aug 2012 12:37:14 GMT
Message-Id: <201208241237.q7OCbEcf037557@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r951 - in branches/experimental: Mk www/seamonkey/files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 12:37:21 -0000

Author: jbeich
Date: Fri Aug 24 12:37:14 2012
New Revision: 951

Log:
cleanup and get rid of GENERIC_MOZCONFIG

Deleted:
   branches/experimental/www/seamonkey/files/mozconfig-generic.in
Modified:
   branches/experimental/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Fri Aug 24 12:37:06 2012	(r950)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Aug 24 12:37:14 2012	(r951)
@@ -526,7 +526,6 @@
 
 MOZ_PIS_DIR?=		lib/${MOZILLA}/init.d
 
-GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/seamonkey/files/mozconfig-generic.in
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
 MOZCONFIG?=		${WRKSRC}/.mozconfig
 MOZILLA_PLIST_DIRS?=	bin lib
@@ -544,6 +543,10 @@
 MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
 			${MOZILLA}-xpcom ${MOZILLA}-plugin
 
+MOZ_EXPORT+=	${CONFIGURE_ENV} \
+				LIBS="${LIBS}" PERL="${PERL}"
+MOZ_OPTIONS+=	--prefix="${FAKEDIR}"
+
 CPPFLAGS+=		-isystem${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
@@ -641,8 +644,6 @@
 		--disable-necko-wifi		\
 		--disable-updater		\
 		--disable-pedantic
-MOZ_MK_OPTIONS+=	XP_UNIX=1		\
-			PERL=${PERL}
 
 .if ${CXXFLAGS:M-stdlib=libc++}
 LIBS+=		-lcxxrt
@@ -799,9 +800,6 @@
 .endif
 	@${RM} -f ${MOZCONFIG}
 .if !defined(NOMOZCONFIG)
-.if exists(${GENERIC_MOZCONFIG})
-	@${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG}
-.endif
 	@if [ -e ${PORT_MOZCONFIG} ] ; then \
 		${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \
 	fi

Deleted: branches/experimental/www/seamonkey/files/mozconfig-generic.in
==============================================================================
--- branches/experimental/www/seamonkey/files/mozconfig-generic.in	Fri Aug 24 12:37:14 2012	(r950)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,8 +0,0 @@
-ac_add_options	--prefix=@FAKEDIR@
-export CPPFLAGS="@CPPFLAGS@"
-export CFLAGS="@CFLAGS@"
-export LIBS="@LIBS@"
-export LDFLAGS="@LDFLAGS@"
-export CONFIG_SH=/bin/sh
-export XP_UNIX=1
-export PERL="@PERL@"