[Midnightbsd-cvs] CVS Commit: www/linuxpluginwrapper: Fix pkg-plist.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Fix pkg-plist.  We still install some of the freebsd configuration files so include them so they are removed on deinstall

Adjust paths since Adobe products moved to localbase.

This needs an overhaul at some point.  The flash port paths in the example conf might not be correct.  The port is not working properly so it's hard to say right now.

Modified Files:
--------------
    mports/www/linuxpluginwrapper:
        Makefile (r1.3 -> r1.4)
        pkg-plist (r1.3 -> r1.4)
    mports/www/linuxpluginwrapper/files:
        patch-misc::libmap.conf-FreeBSD6 (r1.2 -> r1.3)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/linuxpluginwrapper/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lwww/linuxpluginwrapper/pkg-plist -Lwww/linuxpluginwrapper/pkg-plist -u -r1.3 -r1.4
--- www/linuxpluginwrapper/pkg-plist
+++ www/linuxpluginwrapper/pkg-plist
@@ -10,6 +10,9 @@
 lib/pluginwrapper/oci8.so
 lib/pluginwrapper/realplayer.so
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD6
+%%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x
+%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
+%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
 @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nppdf.so
 @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.so
 @unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.xpt
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/linuxpluginwrapper/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lwww/linuxpluginwrapper/Makefile -Lwww/linuxpluginwrapper/Makefile -u -r1.3 -r1.4
--- www/linuxpluginwrapper/Makefile
+++ www/linuxpluginwrapper/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	linuxpluginwrapper
 PORTVERSION=	20051113
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://people.FreeBSD.org/~nork/distfiles/ \
 		${MASTER_SITE_LOCAL}
Index: patch-misc::libmap.conf-FreeBSD6
===================================================================
RCS file: /home/cvs/mports/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 -Lwww/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 -u -r1.2 -r1.3
--- www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6
+++ www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6
@@ -1,16 +1,45 @@
---- 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	Sat Nov 12 20:46:14 2005
++++ misc/libmap.conf-FreeBSD6	Sun Aug 19 16:16:02 2007
+@@ -12,41 +12,22 @@
+ 
  
+ #######################################################
+-# 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/local/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 @@
- [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
+-[/usr/X11R6/Acrobat7/Browser/intellinux/nppdf.so]
++[/usr/local/lib/Acrobat7/Browser/intellinux/nppdf.so]
+ libc.so.6			pluginwrapper/acrobat.so
+ 
+ 
+ #######################################################
+ # Helix RealPlayer with Mozilla/Firebird/Galeon/Epiphany/Konqueror/Kazehakase
+-[/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
++[/usr/local/lib/linux-mozilla/plugins/nphelix.so]
  libstdc++.so.5			libstdc++.so.5
  libc.so.6			pluginwrapper/realplayer.so
 +libm.so.6			libm.so.4