Date: Tue, 4 Nov 2003 10:09:37 -0800 (PST) From: Greg Lewis <glewis@FreeBSD.org> To: glewis@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gnome@FreeBSD.org Subject: Re: ports/58849: Mozilla port overwrites Java plugin symlinks Message-ID: <200311041809.hA4I9bRh036305@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311041809.hA4I9bRh036305>