From d202a7ff9c9cd9c66bb47b4557d55d2e582ab8f6 Mon Sep 17 00:00:00 2001
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Fri, 18 Mar 2005 18:28:44 +0000
Subject: [PATCH] Update to 20050319. o Add support Acrobat Reader 7.0. [1] o
 Remove oldest notes in pkg-message. [2]

I was cheated by:	ume and Shinichiro Komatsu <koma2@ms.u-tokyo.ac.jp> [1]
Pointed out by:		kuriyama [2]
---
 www/linuxpluginwrapper/Makefile    |  9 +++++----
 www/linuxpluginwrapper/distinfo    |  4 ++--
 www/linuxpluginwrapper/pkg-message |  5 -----
 www/linuxpluginwrapper/pkg-plist   | 10 +++++-----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile
index 8082448115d5..f2e12fe70f3f 100644
--- a/www/linuxpluginwrapper/Makefile
+++ b/www/linuxpluginwrapper/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	linuxpluginwrapper
-PORTVERSION=	20050119
-PORTREVISION=	1
+PORTVERSION=	20050319
+PORTREVISION=	0
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://people.FreeBSD.org/~nork/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -22,7 +22,7 @@ COMMENT=	A wrapper allowing use of linux-plugins with native applications
 RUN_DEPENDS=	${LOCALBASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6
 RUN_DEPENDS+=	${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
 .if		${OSVERSION} >= 500000
-RUN_DEPENDS+=	${LOCALBASE}/Acrobat5/Browsers/intellinux/nppdf.so:${PORTSDIR}/print/acroread
+RUN_DEPENDS+=	${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread
 .else
 USE_MOTIF=	yes
 .endif
@@ -34,6 +34,7 @@ MAKE_ENV=	EXAMPLESDIR=${EXAMPLESDIR} INSTALL_DATA="${INSTALL_DATA}"
 CONFLICTS=	flashpluginwrapper-*
 USE_XLIB=	yes
 USE_REINPLACE=	yes
+PLIST_SUB=	LINUXBASE=${LINUXBASE}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 .if		defined(WITHOUT_PLUGINS) || ${OSVERSION} < 500000
 PLIST=		${WRKDIR}/pkg-plist
@@ -94,7 +95,7 @@ pre-install:
 	@${MKDIR} ${X11BASE}/lib/browser_plugins
 .if		!defined(WITHOUT_PLUGINS)
 .if		${OSVERSION} >= 500000
-	@${LN} -sf ${LOCALBASE}/Acrobat5/Browsers/intellinux/nppdf.so \
+	@${LN} -sf ${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so \
 		${X11BASE}/lib/browser_plugins/
 .endif
 	@${LN} -sf ${LOCALBASE}/lib/linux-flashplugin6/flashplayer.xpt \
diff --git a/www/linuxpluginwrapper/distinfo b/www/linuxpluginwrapper/distinfo
index 091a5d617132..6dd201fae625 100644
--- a/www/linuxpluginwrapper/distinfo
+++ b/www/linuxpluginwrapper/distinfo
@@ -1,2 +1,2 @@
-MD5 (linuxpluginwrapper-20050119.tar.gz) = 46fa66cac56974c20d68232863ada330
-SIZE (linuxpluginwrapper-20050119.tar.gz) = 17534
+MD5 (linuxpluginwrapper-20050319.tar.gz) = 85da9788d78aae30c609c4532bbfa6e3
+SIZE (linuxpluginwrapper-20050319.tar.gz) = 17990
diff --git a/www/linuxpluginwrapper/pkg-message b/www/linuxpluginwrapper/pkg-message
index d50ce23e1728..354bda26f831 100644
--- a/www/linuxpluginwrapper/pkg-message
+++ b/www/linuxpluginwrapper/pkg-message
@@ -1,9 +1,4 @@
 ================================================================
-** PLEASE REMOVE FOLLOWING LINES FROM %%X11BASE%%/bin/mozilla **
-
-LD_PRELOAD=%%PREFIX%%/lib/pluginwrapper.so
-export LD_PRELOAD
-
 ** PLEASE CHANGE FOLLOWING LINES FROM /etc/libmap.conf **
 libpthread.so.0			liblthread.so.3
 	to
diff --git a/www/linuxpluginwrapper/pkg-plist b/www/linuxpluginwrapper/pkg-plist
index 313cee01af5a..33a11240ba51 100644
--- a/www/linuxpluginwrapper/pkg-plist
+++ b/www/linuxpluginwrapper/pkg-plist
@@ -16,10 +16,10 @@ lib/pluginwrapper/realplayer.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 %%LOCALBASE%%/Acrobat5/Browsers/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/
+@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/
 @dirrm lib/pluginwrapper
 @dirrm %%EXAMPLESDIR%%