Update the path to the installation of acroread7 - it moved to ${X11BASE}.

OPTIONS'ify, keeping the default of no plugins installed.
Add libm and libgcc_s to the RealPlayer plugin's libmap.conf entry.

Reviewed by:	nork (maintainer)
Approved by:	nork (maintainer)

5 files changed, 104 insertions, 5 deletions

diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile
index 051bd271a024..3beeb820a51a 100644
--- a/www/linuxpluginwrapper/Makefile
+++ b/www/linuxpluginwrapper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linuxpluginwrapper
 PORTVERSION=	20051113
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://people.FreeBSD.org/~nork/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -16,6 +16,10 @@ MASTER_SITE_SUBDIR=	nork
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	A wrapper allowing use of linux-plugins with native applications
 
+OPTIONS=	FLASH	"install linux-flashplugin"	off \
+		REALPLAYER	"install linux-realplayer"	off \
+		ACROREAD	"install acroread7"	off
+
 .include <bsd.port.pre.mk>
 
 .if		 ${OSVERSION} >= 700009
@@ -23,10 +27,20 @@ IGNORE=		doesn't support ELF symbol versioning, yet.
 .endif
 
 # I will remove WITH_PLUGINS knob.
-.if		defined(WITH_PLUGINS)
+.if		defined(WITH_FLASH)
 RUN_DEPENDS=	${X11BASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6
+WITH_PLUGINS=	1
+.endif
+.if		defined(WITH_REALPLAYER)
 RUN_DEPENDS+=	${X11BASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
-RUN_DEPENDS+=	${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7
+WITH_PLUGINS=	1
+.endif
+.if		defined(WITH_ACROREAD)
+RUN_DEPENDS+=	${X11BASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7
+WITH_PLUGINS=	1
+.endif
+
+.if		defined(WITH_PLUGINS)
 .if		${OSVERSION} < 500000
 USE_MOTIF=	yes
 .endif
@@ -37,7 +51,6 @@ MAKE_ENV=	EXAMPLESDIR=${EXAMPLESDIR} INSTALL_DATA="${INSTALL_DATA}" INSTALL_PROG
 
 CONFLICTS=	flashpluginwrapper-*
 USE_XLIB=	yes
-USE_REINPLACE=	yes
 PLIST_SUB=	LINUXBASE=${LINUXBASE}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 .if		!defined(WITH_PLUGINS) || ${OSVERSION} < 500000
@@ -98,17 +111,23 @@ post-build:
 .if		defined(WITH_PLUGINS)
 pre-install:
 	@${MKDIR} ${X11BASE}/lib/browser_linux_plugins
-	@${LN} -sf ${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so \
+.if		defined(WITH_ACROREAD)
+	@${LN} -sf ${X11BASE}/Adobe/Acrobat7.0/ENU/Browser/intellinux/nppdf.so \
 		${X11BASE}/lib/browser_linux_plugins/
+.endif
+.if		defined(WITH_FLASH)
 	@${LN} -sf ${X11BASE}/lib/linux-flashplugin6/flashplayer.xpt \
 		${X11BASE}/lib/browser_linux_plugins/
 	@${LN} -sf ${X11BASE}/lib/linux-flashplugin6/libflashplayer.so \
 		${X11BASE}/lib/browser_linux_plugins/
+.endif
+.if		defined(WITH_REALPLAYER)
 	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \
 		${X11BASE}/lib/browser_linux_plugins/
 	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \
 		${X11BASE}/lib/browser_linux_plugins/
 .endif
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x
new file mode 100644
index 000000000000..b185ab07079a
--- /dev/null
+++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD4.x
@@ -0,0 +1,20 @@
+--- 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 @@
+ 
+ #######################################################
+ # 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
+@@ -46,6 +46,8 @@
+ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
+ libstdc++.so.5			libstdc++.so.3
+ libc.so.6			pluginwrapper/realplayer.so
++libm.so.6			libm.so.2
++libgcc_s.so.1			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
new file mode 100644
index 000000000000..bfd9e35751a6
--- /dev/null
+++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-current
@@ -0,0 +1,20 @@
+--- 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 @@
+ # Acrobat with Opera is not available.
+ 
+ # 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
+@@ -36,6 +36,8 @@
+ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
+ libstdc++.so.5			libstdc++.so.4
+ libc.so.6			pluginwrapper/realplayer.so
++libm.so.6			libm.so.2
++libgcc_s.so.1			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
new file mode 100644
index 000000000000..ae273390852c
--- /dev/null
+++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD5-stable
@@ -0,0 +1,20 @@
+--- 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
+ 
+ # 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 @@
+ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
+ libstdc++.so.5			libstdc++.so.4
+ libc.so.6			pluginwrapper/realplayer.so
++libm.so.6			libm.so.3
++libgcc_s.so.1			pluginwrapper/realplayer.so
+ 
+ 
+ #######################################################
diff --git a/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6 b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6
new file mode 100644
index 000000000000..3573da82bcf2
--- /dev/null
+++ b/www/linuxpluginwrapper/files/patch-misc::libmap.conf-FreeBSD6
@@ -0,0 +1,20 @@
+--- 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
+ 
+ # 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 @@
+ [/usr/X11R6/lib/linux-mozilla/plugins/nphelix.so]
+ libstdc++.so.5			libstdc++.so.5
+ libc.so.6			pluginwrapper/realplayer.so
++libm.so.6			libm.so.4
++libgcc_s.so.1			pluginwrapper/realplayer.so
+ 
+ 
+ #######################################################