diff options
Diffstat (limited to 'textproc/apache-xmlbeans/files/patch-bin___setlib')
| -rw-r--r-- | textproc/apache-xmlbeans/files/patch-bin___setlib | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/textproc/apache-xmlbeans/files/patch-bin___setlib b/textproc/apache-xmlbeans/files/patch-bin___setlib index b7c8022ec9c4..62ef0a9b3054 100644 --- a/textproc/apache-xmlbeans/files/patch-bin___setlib +++ b/textproc/apache-xmlbeans/files/patch-bin___setlib @@ -1,20 +1,24 @@ ---- bin/_setlib.orig 2019-02-25 00:31:32 UTC +--- bin/_setlib.orig 2022-07-16 12:43:26 UTC +++ bin/_setlib -@@ -19,14 +19,10 @@ if [ -z "$XMLBEANS_HOME" ]; then +@@ -19,19 +19,12 @@ if [ -z "$XMLBEANS_HOME" ]; then XMLBEANS_HOME=`dirname $0`/.. fi -XMLBEANS_LIB= --if [ -f "$XMLBEANS_HOME"/build/lib/xbean.jar ]; then +-if ls $XMLBEANS_HOME/build/libs/xmlbeans*.jar 1> /dev/null 2>&1; then +- XMLBEANS_LIB=$XMLBEANS_HOME/build/libs +-fi +-if ls $XMLBEANS_HOME/build/lib/xmlbeans*.jar 1> /dev/null 2>&1; then - XMLBEANS_LIB=$XMLBEANS_HOME/build/lib -+if [ -f %%JAVAJARDIR%%/xmlbeans.jar ]; then -+ XMLBEANS_LIB=%%JAVAJARDIR%% - fi --if [ -f "$XMLBEANS_HOME"/lib/xbean.jar ]; then -- XMLBEANS_LIB=$XMLBEANS_HOME/lib -fi +-if ls $XMLBEANS_HOME/lib/xmlbeans*.jar 1> /dev/null 2>&1; then ++if ls %%JAVAJARDIR%%/xmlbeans.jar 1> /dev/null 2>&1; then + XMLBEANS_LIB=$XMLBEANS_HOME/lib + fi + + echo XMLBEANS_LIB=$XMLBEANS_LIB if [ -z "$XMLBEANS_LIB" ]; then -- echo "ERROR: Could not find xbean.jar, try set XMLBEANS_LIB to the directory containing xbean.jar" +- echo "ERROR: Could not find xmlbeans*.jar, try set XMLBEANS_LIB to the directory containing xmlbeans*.jar" + echo "ERROR: Could not find xmlbeans.jar, try set XMLBEANS_LIB to the directory containing xmlbeans.jar" fi |