diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index 983419baa827..b767784d4fac 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -242,7 +242,12 @@ pre-install: fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + for jpi in ${JPI_LIST}; do \ + if [ -f $${jpi} ]; then \ + ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + break; \ + fi; \ + done; \ ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ @@ -271,6 +276,7 @@ do-install: if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ + break; \ fi; \ done; \ fi diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 30a6a780f055..1f1f3cb6e921 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -242,7 +242,12 @@ pre-install: ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + for jpi in ${JPI_LIST}; do \ + if [ -f $${jpi} ]; then \ + ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + break; \ + fi; \ + done; \ ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ @@ -271,6 +276,7 @@ do-install: if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ + break; \ fi; \ done; \ fi diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 983419baa827..b767784d4fac 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -242,7 +242,12 @@ pre-install: fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + for jpi in ${JPI_LIST}; do \ + if [ -f $${jpi} ]; then \ + ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + break; \ + fi; \ + done; \ ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ @@ -271,6 +276,7 @@ do-install: if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ + break; \ fi; \ done; \ fi diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 983419baa827..b767784d4fac 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -242,7 +242,12 @@ pre-install: fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + for jpi in ${JPI_LIST}; do \ + if [ -f $${jpi} ]; then \ + ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ + break; \ + fi; \ + done; \ ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ @@ -271,6 +276,7 @@ do-install: if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ + break; \ fi; \ done; \ fi