From owner-freebsd-gecko@FreeBSD.ORG  Fri Mar 23 07:26:58 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 2E1201065670
	for <freebsd-gecko@freebsd.org>; Fri, 23 Mar 2012 07:26:58 +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 AA4048FC1F
	for <freebsd-gecko@freebsd.org>; Fri, 23 Mar 2012 07:26:57 +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 q2N7QuGv002805
	for <freebsd-gecko@freebsd.org>; Fri, 23 Mar 2012 07:26:56 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q2N7Qp5f002664
	for freebsd-gecko@freebsd.org; Fri, 23 Mar 2012 07:26:51 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 23 Mar 2012 07:26:51 GMT
Message-Id: <201203230726.q2N7Qp5f002664@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] r705 - branches/experimental/Mk
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, 23 Mar 2012 07:26:58 -0000

Author: beat
Date: Fri Mar 23 07:26:50 2012
New Revision: 705

Log:
- Make the nsDeviceContextSpecG.cpp check work in a reliable way. For the
  sake of consistency also change the nsSound.cpp check.

Reported by:	flo

Modified:
   branches/experimental/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Thu Mar 22 07:41:39 2012	(r704)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Mar 23 07:26:50 2012	(r705)
@@ -832,14 +832,14 @@
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${MOZSRC}/build/unix/run-mozilla.sh
-.if exists(${MOZSRC}/widget/src/gtk2/nsSound.cpp)
-	@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
-		${MOZSRC}/widget/src/gtk2/nsSound.cpp
-.endif
-.if !exists(${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp)
-	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
-		${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp
-.endif
+	@if [ -f ${MOZSRC}/widget/src/gtk2/nsSound.cpp ] ; then \
+		${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
+			${MOZSRC}/widget/src/gtk2/nsSound.cpp ; \
+	fi
+	@if ! [ -f ${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp ] ; then \
+		${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
+			${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp ; \
+	fi
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
 		s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
 		${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp