Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17778/dists/10.4-transitional/unstable/crypto/finkinfo

Modified Files:
        openoffice.org-firefox.info openoffice.org.info 
        openoffice.org.patch 
Log Message:
fix build when JDK 1.5 is installed

Index: openoffice.org.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/openoffice.org.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- openoffice.org.patch        23 Mar 2006 07:52:38 -0000      1.3
+++ openoffice.org.patch        24 Mar 2006 16:44:58 -0000      1.4
@@ -783,18 +783,3 @@
  
  File gid_File_Bin_Pluginapp
      BIN_FILE_BODY;
-### np_sdk project is not built; IssueZilla #63239
---- np_sdk/mozsrc/makefile.mk  10 Feb 2006 14:06:33 -0000      1.2.2.1
-+++ np_sdk/mozsrc/makefile.mk  16 Feb 2006 01:17:58 -0000
-@@ -48,11 +48,8 @@
- .IF "$(GUI)" == "WNT"
- MOZFILES = $(SLO)$/npwin.obj
- .ELSE
--# macos is still not supported by the plugin
--.IF "$(OS)" != "MACOSX"
- MOZFILES = $(SLO)$/npunix.obj
- .ENDIF
--.ENDIF
- 
- ALL: $(MOZFILES)
- 

Index: openoffice.org.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/openoffice.org.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- openoffice.org.info 23 Mar 2006 07:52:38 -0000      1.7
+++ openoffice.org.info 24 Mar 2006 16:44:58 -0000      1.8
@@ -1,7 +1,8 @@
 Package: openoffice.org
 Description: Integrated office productivity suite
-Version: 2.0.2
-Revision: 101
+Version: 2.0.1+m156
+Revision: 104
+Type: java(1.4)
 License: LGPL
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 
@@ -42,126 +43,13 @@
 <<
 
 CustomMirror: <<
-aus-AU: http://openoffice.mirrors.ilisys.com.au/
-#aus-AU: ftp://mirror.pacific.net.au/OpenOffice/
-#aus-AU: http://mirror.pacific.net.au/openoffice/
-aus-AU: ftp://ftp.planetmirror.com/pub/openoffice/
-aus-AU: http://public.planetmirror.com/pub/openoffice/
-eur-AT: http://gd.tuwien.ac.at/office/openoffice/
-eur-AT: ftp://gd.tuwien.ac.at/office/openoffice/
-eur-BE: http://ftp.belnet.be/pub/mirror/ftp.openoffice.org/
-#eur-BE: ftp://ftp.scarlet.be/pub/openoffice/
-#eur-BE: http://ftp.scarlet.be/pub/openoffice/
-eur-BE: ftp://ftp.openoffice.skynet.be/pub/ftp.openoffice.org/
-eur-BE: ftp://ftp.kulnet.kuleuven.ac.be/pub/mirror/openoffice.org/
-sam-BR: http://linorg.usp.br/OpenOffice.org/
-sam-BR: ftp://ftp.pucpr.br/openoffice/
-eur-BG: http://ftp.spnet.net/openoffice/
-eur-BG: ftp://ftp.spnet.net/openoffice/
-nam-CA: ftp://openoffice.mirror.rafal.ca/openoffice/
-nam-CA: http://openoffice.mirror.rafal.ca/
-nam-CA: http://gulus.USherbrooke.ca/pub/appl/openoffice/
-eur-CZ: http://ftp.sh.cvut.cz/MIRRORS/OpenOffice/
-eur-CZ: ftp://ftp.sh.cvut.cz/MIRRORS/OpenOffice/
-eur-DK: http://mirrors.dotsrc.org/openoffice/
-eur-DK: ftp://mirrors.dotsrc.org/openoffice/
-eur-EE: http://openoffice.offline.ee/
-eur-FI: ftp://ftp.funet.fi/pub/mirrors/openoffice.org/
-#eur-FR: ftp://openoffice.cict.fr/openoffice/
-eur-FR: ftp://ftp.free.fr/mirrors/ftp.openoffice.org/
-eur-DE: ftp://ftp.tu-chemnitz.de/pub/openoffice/
-eur-DE: ftp://ftp.gwdg.de/pub/misc/openoffice/
-eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/
-eur-DE: ftp://ftp.leo.org/pub/openoffice/
-eur-DE: http://ftp.leo.org/pub/openoffice/
-eur-DE: ftp://ftp.uni-muenster.de/pub/software/OpenOffice/
-eur-DE: ftp://openoffice.tu-bs.de/OpenOffice.org/
-eur-DE: ftp://ftp.stardiv.de/pub/OpenOffice.org/
-eur-DE: http://ftp.stardiv.de/pub/OpenOffice.org/
-eur-DE: ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.openoffice.org/
-eur-DE: http://mirror.xaranet.de/openoffice/
-eur-GR: http://www.ellak.gr/pub/openoffice/
-eur-GR: http://ftp.ntua.gr/pub/OpenOffice/
-eur-GR: ftp://ftp.ntua.gr/pub/OpenOffice/
-eur-HU: http://ftp.fsf.hu/OpenOffice.org/
-eur-HU: ftp://ftp.fsf.hu/OpenOffice.org/
-eur-IS: ftp://ftp.rhnet.is/pub/OpenOffice/
-eur-IS: http://ftp.rhnet.is/pub/OpenOffice/
-asi-ID: http://openoffice.ugm.ac.id/
-asi-ID: ftp://kambing.vlsm.org/openoffice/
-asi-ID: http://kambing.vlsm.org/openoffice/
-eur-IE: ftp://ftp.heanet.ie/mirrors/openoffice.org/
-eur-IE: http://ftp.heanet.ie/mirrors/openoffice.org/
-eur-IT: ftp://na.mirror.garr.it/mirrors/openoffice/
-eur-IT: http://na.mirror.garr.it/mirrors/openoffice/
-asi-JP: ftp://ftp.kddlabs.co.jp/office/openoffice/
-asi-JP: ftp://ftp.ring.gr.jp/pub/misc/openoffice/
-asi-JP: http://www.ring.gr.jp/archives/misc/openoffice/
-asi-JP: ftp://ftp.yz.yamagata-u.ac.jp/pub/openoffice/
-asi-JP: http://ftp.yz.yamagata-u.ac.jp/pub/openoffice/
-eur-LT: ftp://files.akl.lt/OpenOffice.org/
-eur-LT: http://files.akl.lt/OpenOffice.org/
-#asi-MY: http://mymirror.asiaosc.org/openoffice/
-eur-NL: ftp://ftp.nluug.nl/pub/office/openoffice/
-eur-NL: http://ftp.nluug.nl/pub/office/openoffice/
-eur-NL: ftp://ftp.snt.utwente.nl/pub/software/openoffice/
-eur-NL: ftp://borft.student.utwente.nl/
-eur-NL: http://borft.student.utwente.nl/openoffice/
-eur-NL: ftp://niihau.student.utwente.nl/
-eur-NL: http://vlaai.snt.utwente.nl/pub/software/openoffice/
-eur-PL: ftp://ftp.man.poznan.pl/pub/openoffice/
-eur-PL: ftp://ftp.openoffice.pl/OpenOffice.ORG/
-eur-PL: ftp://ftp.tpnet.pl/d9/OpenOffice/
-eur-PL: http://ftp.tpnet.pl/vol/d9/OpenOffice/
-eur-RO: ftp://ftp.iasi.roedu.net/pub/mirrors/openoffice.org/
-eur-RO: http://ftp.iasi.roedu.net/mirrors/openoffice.org/
-eur-RO: ftp://mirrors.evolva.ro/openoffice.org/
-eur-RO: ftp://ftp.idilis.ro/mirrors/openoffice.org/
-eur-RO: http://ftp.idilis.ro/mirrors/openoffice.org/
-eur-RU: ftp://ftp.chg.ru/pub/OpenOffice/
-eur-RU: http://ftp.chg.ru/pub/OpenOffice/
-eur-YU: ftp://mirror.etf.bg.ac.yu/openoffice.org/
-eur-YU: http://mirror.etf.bg.ac.yu/openoffice/
-asi-SG: ftp://mirror.averse.net/pub/openoffice/
-#asi-SG: http://mirror.averse.net/openoffice/
-eur-SI: ftp://ftp.bevc.net/mirrors/openoffice/
-eur-SI: http://mirrors.bevc.net/openoffice/
-#eur-SI: http://www.wsection.com/openoffice/
-#afr-ZA: ftp://ftp.is.co.za/mirrors/OpenOffice/
-asi-KR: ftp://ftp.kr.freebsd.org/pub/openoffice/
-eur-ES: http://ftp.rediris.es/ftp/mirror/openoffice.org/
-eur-ES: ftp://ftp.rediris.es/mirror/openoffice.org/
-eur-SE: http://ftp.sunet.se/pub/Office/OpenOffice.org/
-#eur-CH: ftp://ftp.solnet.ch/mirror/OpenOffice/
-eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/
-eur-CH: http://mirror.switch.ch/ftp/mirror/OpenOffice/
-eur-CH: ftp://mirror.switch.ch/mirror/OpenOffice/
-#asi-TW: ftp://ftp.isu.edu.tw/pub/OpenOffice/
-#asi-TW: http://ftp.isu.edu.tw/pub/OpenOffice/
-#asi-TW: ftp://ftp.nctu.edu.tw/UNIX/OpenOffice/
-eur-UK: ftp://ftp.mirrorservice.org/sites/ny1.mirror.openoffice.org/
-eur-UK: http://www.mirrorservice.org/sites/ny1.mirror.openoffice.org/
-#eur-UK: ftp://mirrors.blueyonder.co.uk/sites/openoffice.org
-eur-UK: http://openoffice.blueyonder.co.uk/
-eur-UK: ftp://ftp.mirror.ac.uk/mirror/sunsite.dk/openoffice/
-#eur-UK: http://www.mirror.ac.uk/mirror/sunsite.dk/openoffice/
-nam-US: ftp://ftp.osuosl.org/pub/openoffice/
-nam-US: http://ftp.osuosl.org/pub/openoffice/
-nam-US: http://mirrors.ibiblio.org/pub/mirrors/openoffice/
-nam-US: ftp://ftp.ibiblio.org/pub/mirrors/openoffice/
-nam-US: ftp://ftp.ussg.iu.edu/pub/openoffice/
-nam-US: http://mirrors.isc.org/pub/openoffice/
-nam-US: ftp://openoffice.mirrors.pair.com/
-nam-US: http://openoffice.mirrors.pair.com/ftp/
-nam-US: ftp://openofficeorg.secsup.org/pub/software/openoffice/
-nam-US: http://openofficeorg.secsup.org/
-nam-US: http://openoffice.mirror.wrpn.net/
-nam-US: ftp://openoffice.mirrors.tds.net/pub/openoffice/
-nam-US: http://openoffice.mirrors.tds.net/pub/openoffice/
+asi-JP: http://www.sodan.ecc.u-tokyo.ac.jp/~shinra/distfiles/
+asi-JP: http://www.j10n.org/files/
+Primary: ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/
 <<
-Source: mirror:custom:stable/%v/OOo_%v_src.tar.gz
-Source-MD5: 1b50c8c4c1002edbc4993060ca05ca8f
-SourceDirectory: OOB680_m5
+Source: mirror:custom:OOo_2.0.156_src.tar.gz
+Source-MD5: d98f2e47e8ed73986cf2818edefa7ad6
+SourceDirectory: SRC680_m156
 
 PatchScript: <<
   /usr/bin/patch -p0 < %a/openoffice.org.patch
@@ -175,7 +63,7 @@
   --disable-epm \
   --with-lang=ALL \
   --with-x --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
-  --with-jdk-home=/Library/Java/Home --with-ant-home=%p/lib/ant \
+  --with-jdk-home="$JAVA_HOME" --with-ant-home=%p/lib/ant \
   --disable-crashdump \
   --with-build-version="%v-%r; Built with Fink <http://fink.sourceforge.net>" \
   --enable-libart \

Index: openoffice.org-firefox.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/openoffice.org-firefox.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- openoffice.org-firefox.info 23 Mar 2006 07:52:38 -0000      1.6
+++ openoffice.org-firefox.info 24 Mar 2006 16:44:58 -0000      1.7
@@ -1,7 +1,8 @@
 Package: openoffice.org-firefox
 Description: Integrated office productivity suite
-Version: 2.0.2
-Revision: 101
+Version: 2.0.1+m156
+Revision: 104
+Type: java(1.4)
 License: LGPL
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 
@@ -42,126 +43,13 @@
 <<
 
 CustomMirror: <<
-aus-AU: http://openoffice.mirrors.ilisys.com.au/
-#aus-AU: ftp://mirror.pacific.net.au/OpenOffice/
-#aus-AU: http://mirror.pacific.net.au/openoffice/
-aus-AU: ftp://ftp.planetmirror.com/pub/openoffice/
-aus-AU: http://public.planetmirror.com/pub/openoffice/
-eur-AT: http://gd.tuwien.ac.at/office/openoffice/
-eur-AT: ftp://gd.tuwien.ac.at/office/openoffice/
-eur-BE: http://ftp.belnet.be/pub/mirror/ftp.openoffice.org/
-#eur-BE: ftp://ftp.scarlet.be/pub/openoffice/
-#eur-BE: http://ftp.scarlet.be/pub/openoffice/
-eur-BE: ftp://ftp.openoffice.skynet.be/pub/ftp.openoffice.org/
-eur-BE: ftp://ftp.kulnet.kuleuven.ac.be/pub/mirror/openoffice.org/
-sam-BR: http://linorg.usp.br/OpenOffice.org/
-sam-BR: ftp://ftp.pucpr.br/openoffice/
-eur-BG: http://ftp.spnet.net/openoffice/
-eur-BG: ftp://ftp.spnet.net/openoffice/
-nam-CA: ftp://openoffice.mirror.rafal.ca/openoffice/
-nam-CA: http://openoffice.mirror.rafal.ca/
-nam-CA: http://gulus.USherbrooke.ca/pub/appl/openoffice/
-eur-CZ: http://ftp.sh.cvut.cz/MIRRORS/OpenOffice/
-eur-CZ: ftp://ftp.sh.cvut.cz/MIRRORS/OpenOffice/
-eur-DK: http://mirrors.dotsrc.org/openoffice/
-eur-DK: ftp://mirrors.dotsrc.org/openoffice/
-eur-EE: http://openoffice.offline.ee/
-eur-FI: ftp://ftp.funet.fi/pub/mirrors/openoffice.org/
-#eur-FR: ftp://openoffice.cict.fr/openoffice/
-eur-FR: ftp://ftp.free.fr/mirrors/ftp.openoffice.org/
-eur-DE: ftp://ftp.tu-chemnitz.de/pub/openoffice/
-eur-DE: ftp://ftp.gwdg.de/pub/misc/openoffice/
-eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/
-eur-DE: ftp://ftp.leo.org/pub/openoffice/
-eur-DE: http://ftp.leo.org/pub/openoffice/
-eur-DE: ftp://ftp.uni-muenster.de/pub/software/OpenOffice/
-eur-DE: ftp://openoffice.tu-bs.de/OpenOffice.org/
-eur-DE: ftp://ftp.stardiv.de/pub/OpenOffice.org/
-eur-DE: http://ftp.stardiv.de/pub/OpenOffice.org/
-eur-DE: ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.openoffice.org/
-eur-DE: http://mirror.xaranet.de/openoffice/
-eur-GR: http://www.ellak.gr/pub/openoffice/
-eur-GR: http://ftp.ntua.gr/pub/OpenOffice/
-eur-GR: ftp://ftp.ntua.gr/pub/OpenOffice/
-eur-HU: http://ftp.fsf.hu/OpenOffice.org/
-eur-HU: ftp://ftp.fsf.hu/OpenOffice.org/
-eur-IS: ftp://ftp.rhnet.is/pub/OpenOffice/
-eur-IS: http://ftp.rhnet.is/pub/OpenOffice/
-asi-ID: http://openoffice.ugm.ac.id/
-asi-ID: ftp://kambing.vlsm.org/openoffice/
-asi-ID: http://kambing.vlsm.org/openoffice/
-eur-IE: ftp://ftp.heanet.ie/mirrors/openoffice.org/
-eur-IE: http://ftp.heanet.ie/mirrors/openoffice.org/
-eur-IT: ftp://na.mirror.garr.it/mirrors/openoffice/
-eur-IT: http://na.mirror.garr.it/mirrors/openoffice/
-asi-JP: ftp://ftp.kddlabs.co.jp/office/openoffice/
-asi-JP: ftp://ftp.ring.gr.jp/pub/misc/openoffice/
-asi-JP: http://www.ring.gr.jp/archives/misc/openoffice/
-asi-JP: ftp://ftp.yz.yamagata-u.ac.jp/pub/openoffice/
-asi-JP: http://ftp.yz.yamagata-u.ac.jp/pub/openoffice/
-eur-LT: ftp://files.akl.lt/OpenOffice.org/
-eur-LT: http://files.akl.lt/OpenOffice.org/
-#asi-MY: http://mymirror.asiaosc.org/openoffice/
-eur-NL: ftp://ftp.nluug.nl/pub/office/openoffice/
-eur-NL: http://ftp.nluug.nl/pub/office/openoffice/
-eur-NL: ftp://ftp.snt.utwente.nl/pub/software/openoffice/
-eur-NL: ftp://borft.student.utwente.nl/
-eur-NL: http://borft.student.utwente.nl/openoffice/
-eur-NL: ftp://niihau.student.utwente.nl/
-eur-NL: http://vlaai.snt.utwente.nl/pub/software/openoffice/
-eur-PL: ftp://ftp.man.poznan.pl/pub/openoffice/
-eur-PL: ftp://ftp.openoffice.pl/OpenOffice.ORG/
-eur-PL: ftp://ftp.tpnet.pl/d9/OpenOffice/
-eur-PL: http://ftp.tpnet.pl/vol/d9/OpenOffice/
-eur-RO: ftp://ftp.iasi.roedu.net/pub/mirrors/openoffice.org/
-eur-RO: http://ftp.iasi.roedu.net/mirrors/openoffice.org/
-eur-RO: ftp://mirrors.evolva.ro/openoffice.org/
-eur-RO: ftp://ftp.idilis.ro/mirrors/openoffice.org/
-eur-RO: http://ftp.idilis.ro/mirrors/openoffice.org/
-eur-RU: ftp://ftp.chg.ru/pub/OpenOffice/
-eur-RU: http://ftp.chg.ru/pub/OpenOffice/
-eur-YU: ftp://mirror.etf.bg.ac.yu/openoffice.org/
-eur-YU: http://mirror.etf.bg.ac.yu/openoffice/
-asi-SG: ftp://mirror.averse.net/pub/openoffice/
-#asi-SG: http://mirror.averse.net/openoffice/
-eur-SI: ftp://ftp.bevc.net/mirrors/openoffice/
-eur-SI: http://mirrors.bevc.net/openoffice/
-#eur-SI: http://www.wsection.com/openoffice/
-#afr-ZA: ftp://ftp.is.co.za/mirrors/OpenOffice/
-asi-KR: ftp://ftp.kr.freebsd.org/pub/openoffice/
-eur-ES: http://ftp.rediris.es/ftp/mirror/openoffice.org/
-eur-ES: ftp://ftp.rediris.es/mirror/openoffice.org/
-eur-SE: http://ftp.sunet.se/pub/Office/OpenOffice.org/
-#eur-CH: ftp://ftp.solnet.ch/mirror/OpenOffice/
-eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/
-eur-CH: http://mirror.switch.ch/ftp/mirror/OpenOffice/
-eur-CH: ftp://mirror.switch.ch/mirror/OpenOffice/
-#asi-TW: ftp://ftp.isu.edu.tw/pub/OpenOffice/
-#asi-TW: http://ftp.isu.edu.tw/pub/OpenOffice/
-#asi-TW: ftp://ftp.nctu.edu.tw/UNIX/OpenOffice/
-eur-UK: ftp://ftp.mirrorservice.org/sites/ny1.mirror.openoffice.org/
-eur-UK: http://www.mirrorservice.org/sites/ny1.mirror.openoffice.org/
-#eur-UK: ftp://mirrors.blueyonder.co.uk/sites/openoffice.org
-eur-UK: http://openoffice.blueyonder.co.uk/
-eur-UK: ftp://ftp.mirror.ac.uk/mirror/sunsite.dk/openoffice/
-#eur-UK: http://www.mirror.ac.uk/mirror/sunsite.dk/openoffice/
-nam-US: ftp://ftp.osuosl.org/pub/openoffice/
-nam-US: http://ftp.osuosl.org/pub/openoffice/
-nam-US: http://mirrors.ibiblio.org/pub/mirrors/openoffice/
-nam-US: ftp://ftp.ibiblio.org/pub/mirrors/openoffice/
-nam-US: ftp://ftp.ussg.iu.edu/pub/openoffice/
-nam-US: http://mirrors.isc.org/pub/openoffice/
-nam-US: ftp://openoffice.mirrors.pair.com/
-nam-US: http://openoffice.mirrors.pair.com/ftp/
-nam-US: ftp://openofficeorg.secsup.org/pub/software/openoffice/
-nam-US: http://openofficeorg.secsup.org/
-nam-US: http://openoffice.mirror.wrpn.net/
-nam-US: ftp://openoffice.mirrors.tds.net/pub/openoffice/
-nam-US: http://openoffice.mirrors.tds.net/pub/openoffice/
+asi-JP: http://www.sodan.ecc.u-tokyo.ac.jp/~shinra/distfiles/
+asi-JP: http://www.j10n.org/files/
+Primary: ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/
 <<
-Source: mirror:custom:stable/%v/OOo_%v_src.tar.gz
-Source-MD5: 1b50c8c4c1002edbc4993060ca05ca8f
-SourceDirectory: OOB680_m5
+Source: mirror:custom:OOo_2.0.156_src.tar.gz
+Source-MD5: d98f2e47e8ed73986cf2818edefa7ad6
+SourceDirectory: SRC680_m156
 
 PatchScript: <<
   /usr/bin/patch -p0 < %a/openoffice.org.patch
@@ -175,7 +63,7 @@
   --disable-epm \
   --with-lang=ALL \
   --with-x --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
-  --with-jdk-home=/Library/Java/Home --with-ant-home=%p/lib/ant \
+  --with-jdk-home="$JAVA_HOME" --with-ant-home=%p/lib/ant \
   --disable-crashdump \
   --with-build-version="%v-%r; Built with Fink <http://fink.sourceforge.net>" \
   --enable-libart \



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to