From owner-freebsd-ports-bugs@FreeBSD.ORG  Tue Nov  4 10:09:38 2003
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7A1DF16A4CF; Tue,  4 Nov 2003 10:09:38 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id AF99F43FD7; Tue,  4 Nov 2003 10:09:37 -0800 (PST)
	(envelope-from glewis@FreeBSD.org)
Received: from freefall.freebsd.org (glewis@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hA4I9bFY036309;
	Tue, 4 Nov 2003 10:09:37 -0800 (PST)
	(envelope-from glewis@freefall.freebsd.org)
Received: (from glewis@localhost)
	by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hA4I9bRh036305;
	Tue, 4 Nov 2003 10:09:37 -0800 (PST)
	(envelope-from glewis)
Date: Tue, 4 Nov 2003 10:09:37 -0800 (PST)
From: Greg Lewis <glewis@FreeBSD.org>
Message-Id: <200311041809.hA4I9bRh036305@freefall.freebsd.org>
To: glewis@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org,
	gnome@FreeBSD.org
Subject: Re: ports/58849: Mozilla port overwrites Java plugin symlinks
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2003 18:09:38 -0000

Old Synopsis: JDK ports overwrite symlinks
New Synopsis: Mozilla port overwrites Java plugin symlinks

Responsible-Changed-From-To: freebsd-ports-bugs->gnome
Responsible-Changed-By: glewis
Responsible-Changed-When: Tue Nov 4 10:00:34 PST 2003
Responsible-Changed-Why: 
The overwriting is actually being done by the Mozilla port.  So I have
changed the synopsis to reflect that and assigned to gnome@, as that is
who is listed as the maintainer.

I suggest something like this (UNTESTED):

Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/www/mozilla/Makefile,v
retrieving revision 1.147
diff -u -r1.147 Makefile
--- Makefile	1 Nov 2003 21:51:07 -0000	1.147
+++ Makefile	4 Nov 2003 18:10:17 -0000
@@ -259,9 +259,17 @@
 	if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \
 	    ${MKDIR} ${PREFIX}/lib/browser_plugins ; \
 	fi
-	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
-	    ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
-	    	${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
+	if [ ! -L "${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so" ]; then \
+	    if [ -f "${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so" ]; then \
+		${LN} -sf "${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so" \
+		    "${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so" ; \
+	    elif [ -f "${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so" ]; then \
+		${LN} -sf "${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so" \
+		    "${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so" ; \
+	    elif [ -f "${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so" ]; then \
+		${LN} -sf "${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so" \
+		    "${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so" ; \
+	    fi \
 	fi
 	for pcfile in ${PKGCONFIG_FILES}; do \
 	    	${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \

http://www.freebsd.org/cgi/query-pr.cgi?pr=58849