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.
This commit is contained in:
Joe Marcus Clarke 2003-11-15 02:18:30 +00:00
parent a16fe059cc
commit 3d914605fa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=93986
4 changed files with 28 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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