4 files changed, 25 insertions, 22 deletions

diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile
index e4ab94c408db..c2ba906c9d58 100644
--- a/www/linuxpluginwrapper/Makefile
+++ b/www/linuxpluginwrapper/Makefile
@@ -18,6 +18,7 @@ COMMENT=	A wrapper allowing use of linux-plugins with native applications
 
 .include <bsd.port.pre.mk>
 
+# I will remove WITH_PLUGINS knob.
 .if		defined(WITH_PLUGINS)
 RUN_DEPENDS=	${X11BASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6
 RUN_DEPENDS+=	${X11BASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
@@ -28,7 +29,7 @@ USE_MOTIF=	yes
 .endif
 
 ONLY_FOR_ARCHS=	i386
-MAKE_ENV=	EXAMPLESDIR=${EXAMPLESDIR} INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV=	EXAMPLESDIR=${EXAMPLESDIR} INSTALL_DATA="${INSTALL_DATA}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 CONFLICTS=	flashpluginwrapper-*
 USE_XLIB=	yes
@@ -91,18 +92,18 @@ post-build:
 .endif
 
 pre-install:
-	@${MKDIR} ${X11BASE}/lib/browser_plugins
+	@${MKDIR} ${X11BASE}/lib/browser_linux_plugins
 .if		defined(WITH_PLUGINS)
 	@${LN} -sf ${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so \
-		${X11BASE}/lib/browser_plugins/
+		${X11BASE}/lib/browser_linux_plugins/
 	@${LN} -sf ${X11BASE}/lib/linux-flashplugin6/flashplayer.xpt \
-		${X11BASE}/lib/browser_plugins/
+		${X11BASE}/lib/browser_linux_plugins/
 	@${LN} -sf ${X11BASE}/lib/linux-flashplugin6/libflashplayer.so \
-		${X11BASE}/lib/browser_plugins/
+		${X11BASE}/lib/browser_linux_plugins/
 	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \
-		${X11BASE}/lib/browser_plugins/
+		${X11BASE}/lib/browser_linux_plugins/
 	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \
-		${X11BASE}/lib/browser_plugins/
+		${X11BASE}/lib/browser_linux_plugins/
 .endif
 
 post-install:
diff --git a/www/linuxpluginwrapper/distinfo b/www/linuxpluginwrapper/distinfo
index e0b6021a725d..bffd1080531c 100644
--- a/www/linuxpluginwrapper/distinfo
+++ b/www/linuxpluginwrapper/distinfo
@@ -1,2 +1,3 @@
 MD5 (linuxpluginwrapper-20050910.tar.gz) = d81d367e8d763ba1bb4cf9586ff4b0d6
+SHA256 (linuxpluginwrapper-20050910.tar.gz) = cf83b9fdb6dc62af0e3a88160ce17138882a3341af62f4bc838d2926b4f333c9
 SIZE (linuxpluginwrapper-20050910.tar.gz) = 21468
diff --git a/www/linuxpluginwrapper/pkg-message b/www/linuxpluginwrapper/pkg-message
index 9d2e28ffbf54..190a93c1cb34 100644
--- a/www/linuxpluginwrapper/pkg-message
+++ b/www/linuxpluginwrapper/pkg-message
@@ -3,11 +3,11 @@
 libm.so was version-bumped on 5.3-BETA7. Please change libm.so.2
 to libm.so.3.
 
-** PLEASE NOTICE TO USER USING FROM 6.0-BETA3 or AFTER **
+** PLEASE NOTICE TO USER USING FROM 6.0-BETA3 and LATER **
 shared libraries were version-bumped on 6.0-BETA3. Please overhaul
-you libmap.conf.
+your libmap.conf.
 
-** PLEASE NOTE Macromedia Flash7 SUPPORT IS ALPHA VERSION. **
+** PLEASE NOTE Macromedia Flash7 SUPPORT IS ALPHA+ VERSION. **
 If you find any problem,  please send me report(s) with debug
 information like 'make -DDEBUG install' or patch(es). :-)
 
diff --git a/www/linuxpluginwrapper/pkg-plist b/www/linuxpluginwrapper/pkg-plist
index 5a5624f2518e..2324cb354980 100644
--- a/www/linuxpluginwrapper/pkg-plist
+++ b/www/linuxpluginwrapper/pkg-plist
@@ -1,3 +1,4 @@
+sbin/is_enabled_lpw
 lib/pluginwrapper/flash6.so
 lib/pluginwrapper/flash7.so
 lib/pluginwrapper/acrobat.so
@@ -11,17 +12,17 @@ lib/pluginwrapper/realplayer.so
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x
-@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/nppdf.so
-@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/flashplayer.xpt
-@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/libflashplayer.so
-@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/nphelix.so
-@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_plugins/nphelix.xpt
-@unexec /bin/rmdir    %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
-@exec   /bin/mkdir -p %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
-@exec	/bin/ln -sf %%LINUXBASE%%/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so %%X11BASE%%/lib/browser_plugins/
-@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/flashplayer.xpt                 %%X11BASE%%/lib/browser_plugins/
-@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/libflashplayer.so               %%X11BASE%%/lib/browser_plugins/
-@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so                   %%X11BASE%%/lib/browser_plugins/
-@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt                  %%X11BASE%%/lib/browser_plugins/
+@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nppdf.so
+@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/flashplayer.xpt
+@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/libflashplayer.so
+@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.so
+@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.xpt
+@unexec /bin/rmdir    %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
+@exec   /bin/mkdir -p %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
+@exec	/bin/ln -sf %%LINUXBASE%%/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so %%X11BASE%%/lib/browser_linux_plugins/
+@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/flashplayer.xpt                 %%X11BASE%%/lib/browser_linux_plugins/
+@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/libflashplayer.so               %%X11BASE%%/lib/browser_linux_plugins/
+@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so                   %%X11BASE%%/lib/browser_linux_plugins/
+@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt                  %%X11BASE%%/lib/browser_linux_plugins/
 @dirrm lib/pluginwrapper
 @dirrm %%EXAMPLESDIR%%