Update of /cvsroot/fink/experimental/asari In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9074
Modified Files: openoffice.org.info openoffice.org.patch Log Message: Hoge. Index: openoffice.org.patch =================================================================== RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- openoffice.org.patch 1 May 2007 18:41:38 -0000 1.19 +++ openoffice.org.patch 2 May 2007 08:26:32 -0000 1.20 @@ -113,16 +113,30 @@ .ENDIF .IF "$(COMNAME)"=="sunpro5" -### Temporarily disabling checkdll! ---- OOF680_m15/solenv/bin/checkdll.sh 2007-05-02 03:38:03.000000000 +0900 -+++ OOF680_m15.fink/solenv/bin/checkdll.sh 2007-05-02 03:25:39.000000000 +0900 -@@ -42,7 +42,8 @@ - exit 1 - } - --checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll" -+#checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll" -+checkdll=/usr/bin/true +--- checkdll.sh 2007-05-02 03:38:03.000000000 +0900 ++++ checkdll.sh.fink 2007-05-02 12:14:15.000000000 +0900 +@@ -45,15 +45,21 @@ + checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll" if [ -x $checkdll ]; then ++ uname_s=`uname -s` while : + do + case $1 in + -L) shift; option=$1;; + --) break;; + esac +- case "${libpath+X}" in +- X) libpath=$libpath:$option;; +- *) libpath=$option;; ++ case $uname_s-$option in ++ Darwin-${FINK_PREFIX-/sw}/lib) skip=true;; ++ *) skip=false;; ++ esac ++ case "$skip-${libpath+X}" in ++ true-*) ;; ++ false-X) libpath=$libpath:$option;; ++ false-*) libpath=$option;; + esac + shift + done Index: openoffice.org.info =================================================================== RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- openoffice.org.info 1 May 2007 17:48:39 -0000 1.37 +++ openoffice.org.info 2 May 2007 08:26:31 -0000 1.38 @@ -172,11 +172,19 @@ SourceDirectory: OOF680_m15 PatchFile: %n.patch -PatchFile-MD5: cc7deb1dd045606728b8b3b86c4a508b +PatchFile-MD5: 378e343f9fb366d233a06863da7770d1 PatchScript: << + #!/bin/bash -ev /usr/bin/patch -p0 < %{PatchFile} chmod a+x languagepack-splitoff /bin/mv ../unowinreg.dll ./external/unowinreg/ + + if ! osacompile -o test desktop/macosx/source/main.applescript >/dev/null 2>&1; then + if ! /usr/libexec/StartupItemContext /usr/bin/osacompile -o test desktop/macosx/source/main.applescript >/dev/null 2>&1; then + echo "osacompile failed. this is typically for you don't have StartupItemContext." + false + fi + fi << GCC: 4.0 ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits