Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8103/dists/10.3/unstable/main/finkinfo/x11
Modified Files:
openoffice.org-nocrypto.info
Log Message:
* Added to 10.4-transitional/unstable and 10.4/unstable.
* Correct a symlink in OpenOffice.org 2.0.app/Contents.
* Versioned dep on libwpd-0.8.
Index: openoffice.org-nocrypto.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/openoffice.org-nocrypto.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- openoffice.org-nocrypto.info 15 Feb 2006 16:57:44 -0000 1.3
+++ openoffice.org-nocrypto.info 21 Feb 2006 18:04:20 -0000 1.4
@@ -1,7 +1,7 @@
Package: openoffice.org-nocrypto
Description: Integrated office productivity suite
Version: 2.0.1+m156
-Revision: 3
+Revision: 4
License: LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -12,13 +12,13 @@
BuildDepends: <<
x11-dev, ant, bison, fileutils, system-java14-dev,
archive-zip-pm581,
- libjpeg, expat, freetype219, libwpd-0.8-dev, libxml2,
+ libjpeg, expat, freetype219, libxml2,
sane-backends-dev, libcurl3-unified, libsndfile1-dev,
portaudio (>= 18.1-1), neon24-ssl | neon24,
libart2, startup-notification-dev, libgettext3-dev,
atk1, gtk+2-dev, orbit2-dev, pango1-xft2-dev,
libiconv-dev, openldap23-dev,
- glib2-dev, db42-ssl | db42,
+ libwpd-0.8-dev, glib2-dev, db42-ssl | db42,
libsablot-dev, libsablot, unixodbc2-nox | unixodbc2,
boost1.32-py24, python24,
pkgconfig, popt, autoconf2.5
@@ -26,13 +26,14 @@
Depends: <<
x11, system-java14, system-perl,
- libjpeg-shlibs, expat-shlibs, freetype219-shlibs, libwpd-0.8-shlibs,
libxml2-shlibs,
+ libjpeg-shlibs, expat-shlibs, freetype219-shlibs, libxml2-shlibs,
sane-backends-shlibs, libcurl3-unified-shlibs, libsndfile1-shlibs,
portaudio-shlibs (>= 18.1-1), neon24-ssl-shlibs | neon24-shlibs,
libart2-shlibs, startup-notification-shlibs,
atk1-shlibs, gtk+2-shlibs, libgettext3-shlibs, pango1-xft2-shlibs,
libiconv, openldap23-shlibs,
- glib2-shlibs, db42-ssl-shlibs | db42-shlibs, db42-ssl-java | db42-java,
+ libwpd-0.8-shlibs, glib2-shlibs,
+ db42-ssl-shlibs | db42-shlibs, db42-ssl-java | db42-java,
libsablot-shlibs, unixodbc2-nox-shlibs | unixodbc2-shlibs,
python24-shlibs,
fondu
@@ -97,6 +98,11 @@
set -e
+ if ${CXX:-"g++"} --version | /usr/bin/grep -q 'i686.*4\.0\.1.*5250'; then
+ echo "Xcode 2.2.1 for Intel is buggy." >&2
+ exit 2
+ fi
+
echo "[ Message from OpenOffice.org package maintainer ] ================="
echo
echo "Welcome to OpenOffice.org build script!"
@@ -135,6 +141,21 @@
set -v
+ # Check the architecture
+ case %m in
+ powerpc) machine=PPC;;
+ i386) machine=Intel;;
+ *) echo 'Unknown architecture'; exit 1;;
+ esac
+
+ # Create a log file
+ tmpdir=`/sw/sbin/mktemp -d /tmp/fink-ooo.XXXXXX`
+ test -n "$tmpdir"
+ trap 'rm -rf "$tmpdir"' 0
+ /usr/bin/mkfifo "$tmpdir/log"
+ /usr/bin/tee -i %n-%v-%r.buildlog < "$tmpdir/log" &
+ exec 3>"$tmpdir/log"
+
# $X_LDFLAGS is needed to configure with X correctly.
export X_LDFLAGS=$LDFLAGS
@@ -144,18 +165,12 @@
# $PYTHON is needed to configure with python24
export PYTHON=%p/bin/python2.4
- /usr/bin/printf "[ Phase 1: Configure ]\n\n" >> %n-%v-%r.buildlog
- (cd config_office && autoconf && ./configure %c || exit) 2>&1 |
- /usr/bin/tee -ai %n-%v-%r.buildlog
- case %m in
- powerpc) machine=PPC;;
- i386) machine=Intel;;
- *) echo 'Unknown architecture'; exit 1;;
- esac
- /usr/bin/printf "\n\n[ Phase 2: Bootstrap ]\n\n" >> %n-%v-%r.buildlog
- ./bootstrap 2>&1 |
- /usr/bin/tee -ai %n-%v-%r.buildlog
+ /usr/bin/printf "[ Phase 1: Configure ]\n\n" >&3
+ (cd config_office && autoconf && ./configure %c) >&3 2>&3 || exit
+
+ /usr/bin/printf "\n\n[ Phase 2: Bootstrap ]\n\n" >&3
+ ./bootstrap >&3 2>&3
# Because we are using %p, $SOLARINC and $SOLARLIB need modified
# Include libdb_java-4.2.jnilib to DYLD_LIBRARY_PATH so that Java can find it
@@ -170,14 +185,11 @@
/bin/ln -s %p/lib/libdb_java-4.2.jnilib FINKLIBS
# Retry forever to build OOo until success!
- until [ -n "$succeeded" ]; do
- /usr/bin/printf "\n\n[ Phase 3: Make ]\n\n" >> %n-%v-%r.buildlog
+ while :; do
+ /usr/bin/printf "\n\n[ Phase 3: Make ]\n\n" >&3
. ./MacOSX${machine}Env.Set.sh
- dmake 2>&1 | /usr/bin/tee -ai %n-%v-%r.buildlog
- if [ ${PIPESTATUS[0]} == 0 ]; then
- succeeded=TRUE
- continue
- fi
+ dmake >&3 2>&3 && break
+
echo
echo "[ Message from OpenOffice.org package maintainer ] ================="
echo
@@ -197,21 +209,21 @@
set +v
- /usr/bin/printf "\n\n[ Phase 4: Statistics ]\n\n" >> %n-%v-%r.buildlog
+ /usr/bin/printf "\n\n[ Phase 4: Statistics ]\n\n" >&3
echo
echo "[ Message from OpenOffice.org package maintainer ] ================="
echo
echo "Congratulations!"
echo "The building process of OpenOffice.org has completed!"
- echo " Started: $STARTTIME" | /usr/bin/tee -ai %n-%v-%r.buildlog
+ echo " Started: $STARTTIME" >&3
ENDTIME=`/bin/date +"%%F %%T %%Z(%%z)"`
- echo " Completed: $ENDTIME" | /usr/bin/tee -ai %n-%v-%r.buildlog
+ echo " Completed: $ENDTIME" >&3
DISKUSAGE=`/usr/bin/du -sh %b | /usr/bin/cut -f1`
- echo " $DISKUSAGE is used for this building process (not including
tarball)." | /usr/bin/tee -ai %n-%v-%r.buildlog
+ echo " $DISKUSAGE is used for this building process (not including
tarball)." >&3
echo
echo "===================================================================="
<<
@@ -306,7 +318,7 @@
/usr/bin/install -d -m 755 %i/Applications
/usr/bin/tar -xf $STAR_RESOURCEPATH/OpenOffice.org.app.tar -C %i/Applications
/bin/mv %i/Applications/OpenOffice.org.app "%i/Applications/OpenOffice.org
2.0.app"
- /bin/ln -s %p/lib/%n "%i/Applications/OpenOffice.org 2.0.app/Contents"
+ /bin/ln -s %p/lib/%n "%i/Applications/OpenOffice.org
2.0.app/Contents/openoffice.org"
/bin/chmod -R o-w '%i/Applications/'
[ -x /Developer/Tools/SplitForks ] && /Developer/Tools/SplitForks
'%i/Applications/'
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
