4 files changed, 17 insertions, 26 deletions

diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile
index dc7e08e53568..1628bd26184e 100644
--- a/www/linuxpluginwrapper/Makefile
+++ b/www/linuxpluginwrapper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linuxpluginwrapper
-PORTVERSION=	20050613
+PORTVERSION=	20050909
 PORTREVISION=	0
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://people.FreeBSD.org/~nork/distfiles/ \
@@ -21,9 +21,8 @@ COMMENT=	A wrapper allowing use of linux-plugins with native applications
 .if		!defined(WITHOUT_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
-.if		${OSVERSION} >= 500000
 RUN_DEPENDS+=	${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7
-.else
+.if		${OSVERSION} < 500000
 USE_MOTIF=	yes
 .endif
 .endif
@@ -40,7 +39,11 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST=		${WRKDIR}/pkg-plist
 .endif
 
-.if		${OSVERSION} >= 503001
+.if		${OSVERSION} >= 700001
+LIBMAPCONF=	${EXAMPLESDIR}/libmap.conf-FreeBSD6
+.elif		${OSVERSION} >= 600033 && ${OSVERSION} < 700000
+LIBMAPCONF=	${EXAMPLESDIR}/libmap.conf-FreeBSD6
+.elif		${OSVERSION} >= 503001
 LIBMAPCONF=	${EXAMPLESDIR}/libmap.conf-FreeBSD5-stable
 .elif		${OSVERSION} >= 500000
 LIBMAPCONF=	${EXAMPLESDIR}/libmap.conf-FreeBSD5-current
@@ -76,12 +79,6 @@ pre-everything::
 .endif
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e "s:/usr/local/lib/linux-:${X11BASE}/lib/linux-:g" \
-		-e "s:/usr/local/Acrobat5:${X11BASE}/Acrobat5:g" \
-		${WRKSRC}/misc/libmap*
-
 post-build:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},' \
 		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
@@ -91,19 +88,13 @@ post-build:
 		< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
 .if		defined(WITHOUT_PLUGINS)
 	@${SED} -e "/exec/d" ${.CURDIR}/pkg-plist > ${PLIST}
-.else
-.if		${OSVERSION} < 500000
-	@${SED} -e "/nppdf\.so/d" ${.CURDIR}/pkg-plist > ${PLIST}
-.endif
 .endif
 
 pre-install:
 	@${MKDIR} ${X11BASE}/lib/browser_plugins
 .if		!defined(WITHOUT_PLUGINS)
-.if		${OSVERSION} >= 500000
 	@${LN} -sf ${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so \
 		${X11BASE}/lib/browser_plugins/
-.endif
 	@${LN} -sf ${X11BASE}/lib/linux-flashplugin6/flashplayer.xpt \
 		${X11BASE}/lib/browser_plugins/
 	@${LN} -sf ${X11BASE}/lib/linux-flashplugin6/libflashplayer.so \
diff --git a/www/linuxpluginwrapper/distinfo b/www/linuxpluginwrapper/distinfo
index a597ed5d159d..82858055fa86 100644
--- a/www/linuxpluginwrapper/distinfo
+++ b/www/linuxpluginwrapper/distinfo
@@ -1,2 +1,2 @@
-MD5 (linuxpluginwrapper-20050613.tar.gz) = 87a0f23064e6e5bbf8b03041a08d5f4c
-SIZE (linuxpluginwrapper-20050613.tar.gz) = 21164
+MD5 (linuxpluginwrapper-20050909.tar.gz) = 770b1bd755be9ce1ae6bdb209bd166d7
+SIZE (linuxpluginwrapper-20050909.tar.gz) = 21497
diff --git a/www/linuxpluginwrapper/pkg-message b/www/linuxpluginwrapper/pkg-message
index 354bda26f831..9d2e28ffbf54 100644
--- a/www/linuxpluginwrapper/pkg-message
+++ b/www/linuxpluginwrapper/pkg-message
@@ -1,19 +1,18 @@
 ================================================================
-** PLEASE CHANGE FOLLOWING LINES FROM /etc/libmap.conf **
-libpthread.so.0			liblthread.so.3
-	to
-libpthread.so.0			pluginwrapper/flash6.so
-
 ** PLEASE NOTICE TO USER USING FROM 5.0 TO 5.3-BETA6 **
 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 **
+shared libraries were version-bumped on 6.0-BETA3. Please overhaul
+you libmap.conf.
+
 ** 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).
+information like 'make -DDEBUG install' or patch(es). :-)
 
-Firefox has a double free problem wih Flash7.  So I don't
-support it.  Please don't send me a report about firefox.
+Flash7 support is unstable.  I know well that there are offten
+crash or freeze with flash7.  So don't send me a such report.
 Of course, I always welcome to recieve fixed problems report.
 
 Please get and apply a dlsym(3) hook patch.
diff --git a/www/linuxpluginwrapper/pkg-plist b/www/linuxpluginwrapper/pkg-plist
index df9d38d413c9..5a5624f2518e 100644
--- a/www/linuxpluginwrapper/pkg-plist
+++ b/www/linuxpluginwrapper/pkg-plist
@@ -7,6 +7,7 @@ lib/pluginwrapper/java3d_snd.so
 lib/pluginwrapper/pips.so
 lib/pluginwrapper/oci8.so
 lib/pluginwrapper/realplayer.so
+%%EXAMPLESDIR%%/libmap.conf-FreeBSD6
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x