From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 4 18:06:36 2011 Return-Path: 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 DCEE9106567E for ; Thu, 4 Aug 2011 18:06:36 +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 795BB8FC1B for ; Thu, 4 Aug 2011 18:06:36 +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 p74I6ZRn083602 for ; Thu, 4 Aug 2011 18:06:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p74I6SX9080925 for freebsd-gecko@freebsd.org; Thu, 4 Aug 2011 18:06:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 4 Aug 2011 18:06:28 GMT Message-Id: <201108041806.p74I6SX9080925@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] r608 - in branches/experimental: Mk deskutils/lightning deskutils/lightning-thunderbird mail/thunderbird mail/thunderbird-beta mail/thunderbird3 www/firefox www/firefox-aurora www/firefox-beta www/firefox36 www/kompozer www/libxul www/seamonkey www/seamonkey-beta www/seamonkey2 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 18:06:37 -0000 Author: flo Date: Thu Aug 4 18:06:28 2011 New Revision: 608 Log: Get rid of GECKO_PTHREAD_LIBS, just use PTHREAD_LIBS, this will enable us to compile various gecko ports with clang. Right now firefox and thunderbird >= 6 can be compiled using clang Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/deskutils/lightning-thunderbird/Makefile branches/experimental/deskutils/lightning/Makefile branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-aurora/Makefile branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey2/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 4 18:06:28 2011 (r608) @@ -530,7 +530,6 @@ PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig MOZILLA_PLIST_DIRS?= bin include lib share/idl -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall MASTER_MOZDIR?= ${PORTSDIR}/www/seamonkey Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile ============================================================================== --- branches/experimental/deskutils/lightning-thunderbird/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/deskutils/lightning-thunderbird/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -61,8 +61,6 @@ EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else @@ -71,7 +69,7 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/deskutils/lightning/Makefile ============================================================================== --- branches/experimental/deskutils/lightning/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/deskutils/lightning/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -61,8 +61,6 @@ EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus .else @@ -70,7 +68,7 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/mail/thunderbird-beta/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -70,8 +70,6 @@ .endif .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -108,7 +106,7 @@ @${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/mail/thunderbird/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -71,8 +71,6 @@ .endif .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -109,7 +107,7 @@ @${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/mail/thunderbird3/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -66,8 +66,6 @@ .endif .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -87,7 +85,7 @@ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/www/firefox-aurora/Makefile ============================================================================== --- branches/experimental/www/firefox-aurora/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox-aurora/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -60,8 +60,6 @@ WRKSRC:= ${WRKDIR}/firefox-7.0a2 -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -113,7 +111,7 @@ @${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox-beta/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -59,8 +59,6 @@ WRKSRC:= ${WRKDIR}/mozilla-beta -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -112,7 +110,7 @@ @${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -60,8 +60,6 @@ WRKSRC:= ${WRKDIR}/mozilla-release -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -113,7 +111,7 @@ @${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox36/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -75,8 +75,6 @@ WRKSRC:= ${WRKSRC}-1.9.2 -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -97,7 +95,7 @@ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/kompozer/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -40,16 +40,11 @@ .include -.if ${ARCH}=="powerpc" -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED -} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} -.endif - pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in @${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/libxul/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -51,8 +51,6 @@ .include -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 EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio @@ -77,7 +75,7 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in ${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \ Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/seamonkey-beta/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -71,8 +71,6 @@ MOZSRC:= ${WRKDIR}/comm-beta/mozilla WRKSRC= ${WRKDIR}/comm-beta -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -130,7 +128,7 @@ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/seamonkey/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -71,8 +71,6 @@ MOZSRC:= ${WRKDIR}/comm-release/mozilla WRKSRC= ${WRKDIR}/comm-release -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -130,7 +128,7 @@ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/seamonkey2/Makefile ============================================================================== --- branches/experimental/www/seamonkey2/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/seamonkey2/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -74,9 +74,6 @@ MOZSRC:= ${WRKDIR}/comm-1.9.1/mozilla WRKSRC= ${WRKDIR}/comm-1.9.1 -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED -} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -125,7 +122,7 @@ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/mozilla/storage/build/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/src/init/all.js