From owner-freebsd-gecko@FreeBSD.ORG  Mon Dec 20 18:26:55 2010
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97366106566B
	for <gecko@freebsd.org>; Mon, 20 Dec 2010 18:26:55 +0000 (UTC)
	(envelope-from jhein@gossamer.timing.com)
Received: from mout.perfora.net (mout.perfora.net [74.208.4.194])
	by mx1.freebsd.org (Postfix) with ESMTP id 67F768FC27
	for <gecko@freebsd.org>; Mon, 20 Dec 2010 18:26:55 +0000 (UTC)
Received: from gossamer.timing.com ([206.168.13.144])
	by mrelay.perfora.net (node=mrus4) with ESMTP (Nemesis)
	id 0LtqTF-1QSvZL2f9Z-0113qV; Mon, 20 Dec 2010 13:14:17 -0500
Message-ID: <19727.40182.87570.306554@gossamer.timing.com>
Date: Mon, 20 Dec 2010 11:14:14 -0700
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: John Hein <jhein@symmetricom.com>
To: gecko@freebsd.org
X-Mailer: VM 8.0.12 under 22.3.1 (i386-redhat-linux-gnu)
X-Provags-ID: V02:K0:ehprM0ondAL0BUeC735kdt7oNRRZGQ0d7yMEzrHKBNM
	Zdf55eNcCMW+ZiD6wjvCt0IfvwrU7BRMKp30KqabDqGfc+E3tV
	zDwPv1U6SAteRlmGjSwbWDZiSRcnR2WHxz8FINeFUB6T2Qln3n
	bDRlxmX3MZerOIwmMDMH/2Isck5nhQHfaT9ZEeNdFfecYFg1tv
	LFaeDV9FCEWmMY+xt8X/w==
Cc: 
Subject: [patch] www/libxul/Makefile syntax error
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 20 Dec 2010 18:26:55 -0000

There is a syntax error (since 2010/08/08) in www/libxul/Makefile that
is silently ignored.

The effects are that -pthread is not added to EXTRA_DSO_LDOPTS
in storage/build/Makefile.  It may be that the %%PTHREAD_LIBS%%
patch just isn't needed at all, but I haven't verified that.

This patch (below) fixes the syntax error.

It's possible that an alternative is to remove
files/patch-storage_build_Makefile.in and GECKO_PTHREAD_LIBS related
stuff in the Makefile.

Index: Makefile
===================================================================
RCS file: /base/FreeBSD-CVS/ports/www/libxul/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile	10 Dec 2010 16:57:23 -0000	1.24
+++ Makefile	20 Dec 2010 18:01:46 -0000
@@ -51,8 +51,7 @@ OPTIONS=	DBUS "Enable D-BUS support" on
 
 .include <bsd.port.pre.mk>
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
-} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 
 .if ${OSVERSION} < 700000
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio