diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-11-15 02:18:30 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-11-15 02:18:30 +0000 |
| commit | 3d914605fab2bc1e1201869d908f764b4f1b1304 (patch) | |
| tree | a234a2f432e8a48e5c8d2049ef767aab76095291 /www | |
| parent | a16fe059ccb3baaab319c6b834cf0aeb2351718b (diff) | |
| download | ports-3d914605fab2bc1e1201869d908f764b4f1b1304.tar.gz ports-3d914605fab2bc1e1201869d908f764b4f1b1304.zip | |
Only add the plug-in symlink to the plist if we're actually going to create
it. This fixes a packaging problem on bento. Also, break out of the for loop
once we find a suitable plug-in.
Notes
Notes:
svn path=/head/; revision=93986
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla-devel/Makefile | 8 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 8 | ||||
| -rw-r--r-- | www/seamonkey/Makefile | 8 | ||||
| -rw-r--r-- | www/seamonkey2/Makefile | 8 |
4 files changed, 28 insertions, 4 deletions
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 |