From 74b5a10669b437661f5f5ee57377f0b134e0fc43 Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Tue, 23 May 2006 15:24:48 +0000
Subject: Revert changes related to linux-flashplugin* removal.

Approved by:	nork (maintainer)
---
 www/linuxpluginwrapper/Makefile  | 15 +++++++++++++--
 www/linuxpluginwrapper/pkg-plist |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'www')

diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile
index a791fee7ce02..adebc6884c4f 100644
--- a/www/linuxpluginwrapper/Makefile
+++ b/www/linuxpluginwrapper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linuxpluginwrapper
 PORTVERSION=	20051113
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://people.FreeBSD.org/~nork/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -16,7 +16,8 @@ MASTER_SITE_SUBDIR=	nork
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	A wrapper allowing use of linux-plugins with native applications
 
-OPTIONS=	REALPLAYER	"install linux-realplayer"	off \
+OPTIONS=	FLASH	"install linux-flashplugin"	off \
+		REALPLAYER	"install linux-realplayer"	off \
 		ACROREAD	"install acroread7"	off
 
 .include <bsd.port.pre.mk>
@@ -26,6 +27,10 @@ IGNORE=		doesn't support ELF symbol versioning, yet.
 .endif
 
 # I will remove WITH_PLUGINS knob.
+.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
 WITH_PLUGINS=	1
@@ -110,6 +115,12 @@ pre-install:
 	@${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/
diff --git a/www/linuxpluginwrapper/pkg-plist b/www/linuxpluginwrapper/pkg-plist
index af149a7d738b..877445fc782a 100644
--- a/www/linuxpluginwrapper/pkg-plist
+++ b/www/linuxpluginwrapper/pkg-plist
@@ -18,6 +18,8 @@ lib/pluginwrapper/realplayer.so
 @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 %%X11BASE%%/Adobe/Acrobat7.0/ENU/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
-- 
cgit