diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile index 3da2de1e596d..cb373b3709b5 100644 --- a/www/linuxpluginwrapper/Makefile +++ b/www/linuxpluginwrapper/Makefile @@ -7,7 +7,7 @@ PORTNAME= linuxpluginwrapper PORTVERSION= 20051113 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www linux emulators MASTER_SITES= http://people.FreeBSD.org/~nork/distfiles/ \ ${MASTER_SITE_LOCAL} diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x index b185ab07079a..f006d3d97497 100644 --- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x +++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x @@ -1,6 +1,51 @@ ---- misc/libmap.conf-FreeBSD4.x.old Fri Apr 7 15:52:30 2006 -+++ misc/libmap.conf-FreeBSD4.x Fri Apr 7 15:52:56 2006 -@@ -33,7 +33,7 @@ +--- misc/libmap.conf-FreeBSD4.x.orig Thu Sep 15 00:44:51 2005 ++++ misc/libmap.conf-FreeBSD4.x Sat Sep 23 22:35:19 2006 +@@ -2,14 +2,22 @@ + # $Id: libmap.conf-FreeBSD4.x,v 1.18 2005/09/14 15:44:51 nork Exp $ + + ####################################################### +-# Flash6 with Opera +-[/usr/X11R6/lib/browser_plugins/libflashplayer.so] +-libpthread.so.0 libc_r.so.4 +-libdl.so.2 pluginwrapper/flash6.so ++# Flash7 with Mozilla ++[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so] ++libpthread.so.0 pluginwrapper/flash7.so ++libdl.so.2 pluginwrapper/flash7.so + libz.so.1 libz.so.2 +-libstdc++-libc6.2-2.so.3 libstdc++.so.3 + libm.so.6 libm.so.2 +-libc.so.6 pluginwrapper/flash6.so ++libc.so.6 pluginwrapper/flash7.so ++ ++####################################################### ++# Flash7 with Opera ++[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so] ++libpthread.so.0 pluginwrapper/flash7.so ++libdl.so.2 pluginwrapper/flash7.so ++libz.so.1 libz.so.2 ++libm.so.6 libm.so.2 ++libc.so.6 pluginwrapper/flash7.so + [/usr/X11R6/share/opera/plugins/operamotifwrapper] + libXm.so.1 libXm.so.3 + [/usr/X11R6/share/opera/plugins/operamotifwrapper-1] +@@ -17,23 +25,10 @@ + [/usr/X11R6/share/opera/plugins/operamotifwrapper-2] + libXm.so.2 libXm.so.3 + +-# Flash6 with Konqueror +-# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php +-# This configuration was integrated to following one. +- +-# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase +-[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so] +-libpthread.so.0 pluginwrapper/flash6.so +-libdl.so.2 pluginwrapper/flash6.so +-libz.so.1 libz.so.2 +-libstdc++-libc6.2-2.so.3 libstdc++.so.3 +-libm.so.6 libm.so.2 +-libc.so.6 pluginwrapper/flash6.so +- ####################################################### # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase @@ -9,7 +54,7 @@ libc.so.6 pluginwrapper/acrobat.so # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase -@@ -46,6 +46,8 @@ +@@ -46,6 +41,8 @@ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so] libstdc++.so.5 libstdc++.so.3 libc.so.6 pluginwrapper/realplayer.so diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current index bfd9e35751a6..2c7a9aa71d2a 100644 --- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current +++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current @@ -1,6 +1,33 @@ ---- misc/libmap.conf-FreeBSD5-current.old Fri Apr 7 15:48:13 2006 -+++ misc/libmap.conf-FreeBSD5-current Fri Apr 7 15:50:32 2006 -@@ -23,7 +23,7 @@ +--- misc/libmap.conf-FreeBSD5-current.orig Thu Sep 15 00:44:51 2005 ++++ misc/libmap.conf-FreeBSD5-current Sat Sep 23 22:32:45 2006 +@@ -1,29 +1,20 @@ + # /etc/libmap.conf for FreeBSD 5-current(5.0 to 5.3-BETA6) + # $Id: libmap.conf-FreeBSD5-current,v 1.20 2005/09/14 15:44:51 nork Exp $ + +- + ####################################################### +-# Flash6 with Opera is not available. +- +-# Flash6 with Konqueror +-# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php +-# This configuration was integrated to following one. +- +-# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase +-[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so] +-libpthread.so.0 pluginwrapper/flash6.so +-libdl.so.2 pluginwrapper/flash6.so ++# Flash7 with Mozilla ++[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so] ++libpthread.so.0 libpthread.so.2 ++libdl.so.2 pluginwrapper/flash7.so + libz.so.1 libz.so.2 +-libstdc++-libc6.2-2.so.3 libstdc++.so.4 + libm.so.6 libm.so.2 +-libc.so.6 pluginwrapper/flash6.so +- ++libc.so.6 pluginwrapper/flash7.so + + ####################################################### # Acrobat with Opera is not available. # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase @@ -9,7 +36,7 @@ libc.so.6 pluginwrapper/acrobat.so # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase -@@ -36,6 +36,8 @@ +@@ -36,6 +27,8 @@ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so] libstdc++.so.5 libstdc++.so.4 libc.so.6 pluginwrapper/realplayer.so diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable index ae273390852c..694ab46db12b 100644 --- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable +++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable @@ -1,15 +1,46 @@ ---- misc/libmap.conf-FreeBSD5-stable.old Fri Apr 7 15:49:22 2006 -+++ misc/libmap.conf-FreeBSD5-stable Fri Apr 7 15:51:43 2006 -@@ -27,7 +27,7 @@ - #libc.so.6 pluginwrapper/acrobat.so +--- misc/libmap.conf-FreeBSD5-stable.orig Sun Nov 13 10:46:14 2005 ++++ misc/libmap.conf-FreeBSD5-stable Sat Sep 23 22:31:48 2006 +@@ -3,31 +3,19 @@ + # $Id: libmap.conf-FreeBSD5-stable,v 1.22 2005/11/13 01:46:14 nork Exp $ + ####################################################### +-# Flash6 with Opera is not available. +- +-# Flash6 with Konqueror +-# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php +-# This configuration was integrated to following one. +- +-# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase +-[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so] +-libpthread.so.0 pluginwrapper/flash6.so +-libdl.so.2 pluginwrapper/flash6.so +-libz.so.1 libz.so.2 +-libstdc++-libc6.2-2.so.3 libstdc++.so.4 +-libm.so.6 libm.so.3 +-libc.so.6 pluginwrapper/flash6.so +- ++# Flash7 with Mozilla ++[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so] ++libpthread.so.0 libpthread.so.2 ++libdl.so.2 pluginwrapper/flash7.so ++libz.so.1 libz.so.2 ++libm.so.6 libm.so.3 ++libc.so.6 pluginwrapper/flash7.so + + ####################################################### + # Acrobat with Opera is not available. + +-# Acrobat5 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase +-#[/usr/local/Acrobat5/Browsers/intellinux/nppdf.so] +-#libc.so.6 pluginwrapper/acrobat.so +- # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase -[/usr/compat/linux/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so] +[/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so] libc.so.6 pluginwrapper/acrobat.so # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase -@@ -40,6 +40,8 @@ +@@ -40,6 +28,8 @@ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so] libstdc++.so.5 libstdc++.so.4 libc.so.6 pluginwrapper/realplayer.so diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 index 3573da82bcf2..0f88ed428035 100644 --- a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 +++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 @@ -1,15 +1,49 @@ ---- misc/libmap.conf-FreeBSD6.old Fri Apr 7 15:45:50 2006 -+++ misc/libmap.conf-FreeBSD6 Fri Apr 7 15:46:12 2006 -@@ -34,7 +34,7 @@ - libc.so.6 pluginwrapper/acrobat.so +--- misc/libmap.conf-FreeBSD6.orig Sun Nov 13 10:46:14 2005 ++++ misc/libmap.conf-FreeBSD6 Sat Sep 23 22:27:48 2006 +@@ -2,39 +2,17 @@ + # $Id: libmap.conf-FreeBSD6,v 1.23 2005/11/13 01:46:14 nork Exp $ + ####################################################### +-# [ALPHA SUPPORT] Flash7 with Mozilla +-[/usr/X11R6/lib/linux-flashplugin7/libflashplayer.so] ++# Flash7 with Mozilla ++[/usr/local/lib/npapi/linux-flashplugin/libflashplayer.so] + libpthread.so.0 libpthread.so.2 + libdl.so.2 pluginwrapper/flash7.so + libz.so.1 libz.so.3 + libm.so.6 libm.so.4 + libc.so.6 pluginwrapper/flash7.so + +- + ####################################################### +-# Flash6 with Opera is not avilable. +- +-# Flash6 with Konqueror +-# SEE ALSO: http://freebsd.kde.org/howtos/konqueror-flash.php +-# This configuration was integrated to following one. +- +-# Flash6 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase +-[/usr/X11R6/lib/linux-flashplugin6/libflashplayer.so] +-libpthread.so.0 pluginwrapper/flash6.so +-libdl.so.2 pluginwrapper/flash6.so +-libz.so.1 libz.so.3 +-libstdc++-libc6.2-2.so.3 libstdc++.so.5 +-libm.so.6 libm.so.4 +-libc.so.6 pluginwrapper/flash6.so +- +- +-####################################################### +-# Acrobat5 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase +-[/usr/X11R6/Acrobat5/Browsers/intellinux/nppdf.so] +-libc.so.6 pluginwrapper/acrobat.so +- # Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase -[/usr/compat/linux/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so] +[/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so] libc.so.6 pluginwrapper/acrobat.so # Japanese Acrobat7 with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase -@@ -47,6 +47,8 @@ +@@ -47,6 +25,8 @@ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so] libstdc++.so.5 libstdc++.so.5 libc.so.6 pluginwrapper/realplayer.so