From owner-freebsd-gnome@FreeBSD.ORG Sun Nov 13 10:50:34 2005 Return-Path: X-Original-To: gnome@FreeBSD.org Delivered-To: freebsd-gnome@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DF9816A41F; Sun, 13 Nov 2005 10:50:34 +0000 (GMT) (envelope-from nork@FreeBSD.org) Received: from sakura.ninth-nine.com (sakura.ninth-nine.com [219.127.74.120]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BA7E43D45; Sun, 13 Nov 2005 10:50:33 +0000 (GMT) (envelope-from nork@FreeBSD.org) Received: from nadesico.ninth-nine.com (nadesico.ninth-nine.com [219.127.74.122]) by sakura.ninth-nine.com (8.13.3/8.13.3/NinthNine) with ESMTP id jADAoW8A058504; Sun, 13 Nov 2005 19:50:32 +0900 (JST) (envelope-from nork@FreeBSD.org) Date: Sun, 13 Nov 2005 19:50:31 +0900 From: Norikatsu Shigemura To: gnome@FreeBSD.org, ahze@FreeBSD.org Message-Id: <20051113195031.68626359.nork@FreeBSD.org> In-Reply-To: <200511130703.jAD73Wcr012691@repoman.freebsd.org> References: <200511130703.jAD73Wcr012691@repoman.freebsd.org> X-Mailer: Sylpheed version 2.1.6 (GTK+ 2.8.6; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (sakura.ninth-nine.com [219.127.74.121]); Sun, 13 Nov 2005 19:50:32 +0900 (JST) Cc: marcus@FreeBSD.org, mezz@FreeBSD.org Subject: Re: cvs commit: ports/www/linuxpluginwrapper Makefile distinfo pkg-message pkg-plist X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Nov 2005 10:50:34 -0000 On Sun, 13 Nov 2005 07:03:31 +0000 (UTC) Norikatsu Shigemura wrote: > nork 2005-11-13 07:03:31 UTC > FreeBSD ports repository > Modified files: > www/linuxpluginwrapper Makefile distinfo pkg-message pkg-plist > Log: > Update to 20051113. > o Fix many typos. [1] > o Add support is_enabled_lpw, confirms that Linux Plugin > Wrapper is enabled like following test. > $ is_enabled_lpw /usr/X11R6/lib/browser_linux_plugins/*.so | grep "not found" > $ echo $? > 1 > This is for information to mozilla and related browsers, > to use /usr/X11R6/lib/browser_linux_plugins or not. [2] > Pointed out by: many people [1] > Suggested by: mezz [2] > Revision Changes Path > 1.45 +8 -7 ports/www/linuxpluginwrapper/Makefile > 1.23 +1 -0 ports/www/linuxpluginwrapper/distinfo > 1.8 +3 -3 ports/www/linuxpluginwrapper/pkg-message > 1.14 +13 -12 ports/www/linuxpluginwrapper/pkg-plist I supported /usr/X11R6/lib/browser_linux_plugins infrastracture inside linuxpluginwrapper. So please apply following patch to www/firefox, and make patches for mozilla/kazehakase/ galeon/epiphany. Index: files/patch-build_unix_run-mozilla.sh =================================================================== RCS file: /home/ncvs/ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v retrieving revision 1.6 diff -u -r1.6 patch-build_unix_run-mozilla.sh --- files/patch-build_unix_run-mozilla.sh 10 Mar 2005 00:43:22 -0000 1.6 +++ files/patch-build_unix_run-mozilla.sh 13 Nov 2005 07:40:21 -0000 @@ -1,7 +1,7 @@ $FreeBSD: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.6 2005/03/10 00:43:22 marcus Exp $ --- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 ++++ build/unix/run-mozilla.sh Sun Nov 13 16:28:43 2005 @@ -355,7 +355,7 @@ fi ## @@ -11,12 +11,18 @@ if [ -n "$LD_LIBRARYN32_PATH" ] then LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ +@@ -442,6 +442,15 @@ # export MOZILLA_FIVE_HOME LD_LIBRARY_PATH export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH + +MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins ++if type is_enabled_lpw > /dev/null; then ++ if is_enabled_lpw %%PREFIX%%/lib/browser_linux_plugins/*.so | grep "not found" > /dev/null; then ++ else ++ MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:%%PREFIX%%/lib/browser_linux_plugins ++ fi ++fi +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ]