cvs commit: ports/www/linuxpluginwrapper Makefile distinfo pkg-message pkg-plist

[Norikatsu Shigemura]

On Sun, 13 Nov 2005 07:03:31 +0000 (UTC)
Norikatsu Shigemura <nork at FreeBSD.org> 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 ]