From c27a36b9fdb579e110f66f0c5b11d32a98b5d691 Mon Sep 17 00:00:00 2001
From: jylefort <jylefort@FreeBSD.org>
Date: Sat, 18 Feb 2006 10:42:11 +0000
Subject: [1]:   - Respect %%X11BASE%% in linkfarm   - Add linux-adobesvg
 support

[2]:
  - Add linux-sun-jdk support

[1]:
PR:		ports/93519
Submitted by:	jylefort
Approved by:	maintainer

[2]:
PR:		ports/93476
Submitted by:	Pawel Pekala <c0rn@o2.pl>
Approved by:	maintainer
---
 www/linux-firefox/Makefile          |  1 +
 www/linux-firefox/files/linkfarm.in | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'www')

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 8e1336fc5bdf..61b029161a67 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES?=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR?=	firefox/releases/${PORTVERSION}/linux-i686/en-US
diff --git a/www/linux-firefox/files/linkfarm.in b/www/linux-firefox/files/linkfarm.in
index f8399d657665..08b9bd5b4474 100644
--- a/www/linux-firefox/files/linkfarm.in
+++ b/www/linux-firefox/files/linkfarm.in
@@ -2,13 +2,17 @@
 # Run this after installing Beonex, Mozilla or Netscape plugins
 cd	%%PREFIX%%/lib/%%FIREFOX_NAME%%/plugins
 find -L . -type l -delete
-find	%%PREFIX%%/lib/linux-beonex/plugins \
-	%%PREFIX%%/lib/netscape-linux/plugins \
-	%%PREFIX%%/lib/flash \
-	%%PREFIX%%/lib/linux-mozilla/plugins \
-	%%PREFIX%%/lib/linux-netscape*/plugins \
-	%%PREFIX%%/lib/linux-flashplugin6 \
-	%%PREFIX%%/lib/linux-flashplugin7 \
-	%%PREFIX%%/linux-blackdown-jdk1.3.1/jre/plugin/i386/mozilla \
-	%%PREFIX%%/linux-blackdown-jdk1.4.2/jre/plugin/i386/mozilla \
-	-type f -maxdepth 1 -exec ln -s {} \; 2>/dev/null || true
+find	%%X11BASE%%/lib/linux-beonex/plugins \
+	%%X11BASE%%/lib/netscape-linux/plugins \
+	%%X11BASE%%/lib/flash \
+	%%X11BASE%%/lib/linux-mozilla/plugins \
+	%%X11BASE%%/lib/linux-netscape*/plugins \
+	%%X11BASE%%/lib/linux-flashplugin6 \
+	%%X11BASE%%/lib/linux-flashplugin7 \
+	%%LOCALBASE%%/linux-sun-jdk1.4.2/jre/plugin/i386/ns610-gcc32 \
+	%%X11BASE%%/linux-blackdown-jdk1.3.1/jre/plugin/i386/mozilla \
+	%%X11BASE%%/linux-blackdown-jdk1.4.2/jre/plugin/i386/mozilla \
+	-type f -maxdepth 1 -exec ln -s {} \; 2>/dev/null
+ln -sf	%%X11BASE%%/lib/linux-adobesvg/libNPSVG3.so . 2>/dev/null
+
+exit 0
-- 
cgit