From owner-freebsd-gecko@FreeBSD.ORG Fri Aug 3 13:19:32 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A076106564A for ; Fri, 3 Aug 2012 13:19:32 +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 DA5CD8FC0A for ; Fri, 3 Aug 2012 13:19:31 +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 q73DJUNs061709 for ; Fri, 3 Aug 2012 13:19:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q73DJPCa061402 for freebsd-gecko@freebsd.org; Fri, 3 Aug 2012 13:19:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 3 Aug 2012 13:19:25 GMT Message-Id: <201208031319.q73DJPCa061402@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] r911 - in branches/experimental: Mk www/seamonkey 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: Fri, 03 Aug 2012 13:19:32 -0000 Author: jbeich Date: Fri Aug 3 13:19:25 2012 New Revision: 911 Log: consistently ignore soversion for dlopen'ed system libraries Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Fri Aug 3 13:19:15 2012 (r910) +++ branches/experimental/Mk/bsd.gecko.mk Fri Aug 3 13:19:25 2012 (r911) @@ -526,9 +526,6 @@ MOZ_PIS_DIR?= lib/${MOZILLA}/init.d -ESD_LIB?= libesd.so.2 -FREETYPE_LIB?= libfreetype.so.9 - GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/seamonkey/files/mozconfig-generic.in PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig @@ -861,17 +858,11 @@ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/build/unix/run-mozilla.sh - @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 + @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/' # handles mozilla pis scripts. gecko-moz-pis-patch: Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Fri Aug 3 13:19:15 2012 (r910) +++ branches/experimental/www/seamonkey/Makefile Fri Aug 3 13:19:25 2012 (r911) @@ -116,14 +116,6 @@ ${WRKSRC}/suite/app/nsSuiteApp.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ - ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \ - ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop