From 4491c0a22a39f83cf5889f8236704b604b04d030 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Thu, 3 Jul 2008 11:10:53 +0000 Subject: * update to DEV300_m20 * [PATCH] Misc. openoffice.org-3-devel port patches [1] Submitted by: jkim Resource donated by: Nakamura Kazushi --- editors/openoffice-3-devel/Makefile | 21 ++++--- editors/openoffice-3-devel/distinfo | 6 +- .../files/openoffice.org-wrapper | 13 ++-- editors/openoffice-3-devel/files/patch-i85972 | 72 +++++++++++----------- editors/openoffice-3-devel/files/patch-i87583 | 64 +++++++++++++------ editors/openoffice-3-devel/files/patch-i91318 | 18 ++++++ editors/openoffice-3-devel/files/pkg-message.in | 11 ++-- 7 files changed, 123 insertions(+), 82 deletions(-) create mode 100644 editors/openoffice-3-devel/files/patch-i91318 (limited to 'editors/openoffice-3-devel') diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index b49b0275a119..d6f03779acfe 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -75,11 +75,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 19 +MILESTONE?= 20 OOOTAG?= DEV300_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20080614 +SNAPDATE= 20080630 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) @@ -204,7 +204,7 @@ pre-configure: do-build: @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" .if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack @@ -244,7 +244,6 @@ post-install: @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%OOODIR%%#${OOODIR}#g' \ - -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ @@ -253,8 +252,8 @@ post-install: @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter @${ECHO_CMD} "" > ${TMPPLIST} @@ -262,13 +261,16 @@ post-install: @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} - @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \ - ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop - @for app in base calc draw impress math printeradmin writer; do \ + @for app in base calc draw impress math writer; do \ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \ done + @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \ + -e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \ + ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop + @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ + ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/qstart.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak @${RM} -f ${DESKTOPDIR}/${EXECBASE} @${MKDIR} ${DESKTOPDIR} @@ -298,10 +300,9 @@ post-install: @${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ -e 's#%%OOOTAG%%#${OOOTAG}#g' \ - -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \ + -e 's#%%OOODIR%%#${OOODIR}#g' \ ${PKGMESSAGE} @${ECHO_CMD} @${CAT} ${PKGMESSAGE} diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 993166a36f04..39878b4cdf39 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_DEV300_m19_source.tar.bz2) = 5c6afc38407419e6ca6e7f21630610e1 -SHA256 (openoffice.org3/OOo_DEV300_m19_source.tar.bz2) = 47cfe00c2c9ac825eec86157267a0a2b2541a4977acd40e308459c02791c81c5 -SIZE (openoffice.org3/OOo_DEV300_m19_source.tar.bz2) = 300064408 +MD5 (openoffice.org3/OOo_DEV300_m20_source.tar.bz2) = 15189e81f83a92956f3071834a9d0873 +SHA256 (openoffice.org3/OOo_DEV300_m20_source.tar.bz2) = f0ccadfb7fc6eb758884bd656c3d183be50a0a49971a4b06e533d609a03a4020 +SIZE (openoffice.org3/OOo_DEV300_m20_source.tar.bz2) = 299673977 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org3/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/openoffice.org-wrapper b/editors/openoffice-3-devel/files/openoffice.org-wrapper index 48039400580f..007c52b04037 100644 --- a/editors/openoffice-3-devel/files/openoffice.org-wrapper +++ b/editors/openoffice-3-devel/files/openoffice.org-wrapper @@ -1,15 +1,18 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.4 2008-03-29 10:22:26 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.5 2008-07-03 11:10:53 maho Exp $ -oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%/program/ +oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%% program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` case $program in $0) - $oopath/soffice "$@" + $oopath/program/soffice "$@" ;; - *) - $oopath/$program "$@" +setofficelang) + $oopath/basis-link/program/$program "$@" + ;; +*) + $oopath/program/$program "$@" ;; esac diff --git a/editors/openoffice-3-devel/files/patch-i85972 b/editors/openoffice-3-devel/files/patch-i85972 index 4b24c9d2ca7d..931cbb8c535d 100644 --- a/editors/openoffice-3-devel/files/patch-i85972 +++ b/editors/openoffice-3-devel/files/patch-i85972 @@ -1,46 +1,44 @@ Index: lpsolve/lp_solve_5.5.patch =================================================================== RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v -retrieving revision 1.2 -diff -u -r1.2 lp_solve_5.5.patch ---- lpsolve/lp_solve_5.5.patch 20 Dec 2007 15:58:45 -0000 1.2 -+++ lpsolve/lp_solve_5.5.patch 9 Feb 2008 07:19:59 -0000 -@@ -29,3 +29,27 @@ - ! fi - ! - ! rm *.o 2>/dev/null -+*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd Fri Nov 23 21:38:12 2007 -+--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd Fri Nov 23 21:58:29 2007 -+*************** -+*** 1 **** -+! dummy -+--- 1,18 ---- -+! src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -+! -+! def= -+! so=yes -+! -+! opts='-O3 -DINTEGERTIME' -+! -+! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -+! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -+! ranlib liblpsolve55.a -+! -+! if [ "$so" != "" ] -+! then -+! $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -+! $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -+! fi -+! -+! rm *.o 2>/dev/null +retrieving revision 1.4 +diff -u -r1.4 lp_solve_5.5.patch +--- lpsolve/lp_solve_5.5.patch 16 Jun 2008 14:19:46 -0000 1.4 ++++ lpsolve/lp_solve_5.5.patch 3 Jul 2008 00:20:52 -0000 +@@ -72,3 +72,25 @@ + +fi + + + +rm *.o 2>/dev/null ++--- misc/lp_solve_5.5/lpsolve55/ccc.freebsd Wed May 21 17:45:07 2008 +++++ misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd Wed May 21 17:44:54 2008 ++@@ -1,1 +1,18 @@ ++-dummy +++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +++ +++c=$CC +++def= +++so=yes +++ +++opts='-O3 -DINTEGERTIME' +++$CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +++ranlib liblpsolve55.a +++ +++if [ "$so" != "" ] +++then +++ $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +++ $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm +++fi +++ +++rm *.o 2>/dev/null Index: lpsolve/makefile.mk =================================================================== RCS file: /cvs/external/lpsolve/makefile.mk,v -retrieving revision 1.3 -diff -u -r1.3 makefile.mk ---- lpsolve/makefile.mk 21 Dec 2007 09:32:37 -0000 1.3 -+++ lpsolve/makefile.mk 9 Feb 2008 07:20:00 -0000 -@@ -50,7 +50,7 @@ +retrieving revision 1.5 +diff -u -r1.5 makefile.mk +--- lpsolve/makefile.mk 11 Apr 2008 07:18:41 -0000 1.5 ++++ lpsolve/makefile.mk 3 Jul 2008 00:20:53 -0000 +@@ -46,7 +46,7 @@ PATCH_FILE_NAME=lp_solve_5.5-windows.patch .ELSE PATCH_FILE_NAME=lp_solve_5.5.patch diff --git a/editors/openoffice-3-devel/files/patch-i87583 b/editors/openoffice-3-devel/files/patch-i87583 index 17d3d37ee8e3..e82f268d7ad0 100644 --- a/editors/openoffice-3-devel/files/patch-i87583 +++ b/editors/openoffice-3-devel/files/patch-i87583 @@ -1,26 +1,50 @@ ---- desktop/scripts/soffice.sh 2008-03-18 22:44:45.000000000 +0900 -+++ desktop/scripts/soffice.sh 2008-03-29 19:17:49.000000000 +0900 -@@ -68,6 +68,23 @@ +--- configmgr/source/cmdtools/setofficelang.sh.orig 2008-06-09 08:42:48.000000000 -0400 ++++ configmgr/source/cmdtools/setofficelang.sh 2008-06-27 15:47:37.000000000 -0400 +@@ -75,6 +75,11 @@ + export DYLD_LIBRARY_PATH + ;; - sd_binary=`basename "$0"`.bin ++ FreeBSD) ++ LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} ++ export LD_LIBRARY_PATH ++ ;; ++ + HP-UX) + SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}} + export SHLIB_PATH +--- desktop/scripts/soffice.sh.orig 2008-06-09 08:57:10.000000000 -0400 ++++ desktop/scripts/soffice.sh 2008-06-27 16:12:58.000000000 -0400 +@@ -75,6 +75,15 @@ -+# this is a temporary hack until we can live with the default search paths -+case "`uname -s`" in + # extend the ld_library_path for java: javaldx checks the sofficerc for us + if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then ++ # this is a temporary hack until we can live with the default search paths ++ case "`uname -s`" in + FreeBSD) -+ sd_prog1="$sd_prog/../basis-link/program" ++ sd_prog1="$sd_prog/../basis-link/program" + sd_prog2="$sd_prog/../basis-link/ure-link/lib" -+ if [ $LD_LIBRARY_PATH ]; then -+ SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH -+ export SYSTEM_LD_LIBRARY_PATH -+ LD_LIBRARY_PATH="$sd_prog1:$sd_prog2":$LD_LIBRARY_PATH -+ else -+ LD_LIBRARY_PATH="$sd_prog1:$sd_prog2" -+ fi ++ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} + export LD_LIBRARY_PATH + ;; -+ -+esac -+ - #collect all bootstrap variables specified on the command line - #so that they can be passed as arguments to javaldx later on - for arg in $@ ++ esac + my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ + "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` + if [ -n "$my_path" ] ; then +--- padmin/source/spadmin.sh.orig 2008-06-27 01:18:09.000000000 -0400 ++++ padmin/source/spadmin.sh 2008-06-27 13:31:09.000000000 -0400 +@@ -58,6 +58,15 @@ + + # extend the ld_library_path for java: javaldx checks the sofficerc for us + if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then ++ # this is a temporary hack until we can live with the default search paths ++ case "`uname -s`" in ++ FreeBSD) ++ sd_prog1="$sd_prog/../basis-link/program" ++ sd_prog2="$sd_prog/../basis-link/ure-link/lib" ++ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} ++ export LD_LIBRARY_PATH ++ ;; ++ esac + my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ + "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` + if [ -n "$my_path" ] ; then diff --git a/editors/openoffice-3-devel/files/patch-i91318 b/editors/openoffice-3-devel/files/patch-i91318 new file mode 100644 index 000000000000..172af1ddae5a --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i91318 @@ -0,0 +1,18 @@ +Index: hunspell/hunspell-1.1.12.patch +=================================================================== +RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v +retrieving revision 1.11 +diff -u -r1.11 hunspell-1.1.12.patch +--- hunspell/hunspell-1.1.12.patch 18 Jun 2008 10:07:23 -0000 1.11 ++++ hunspell/hunspell-1.1.12.patch 2 Jul 2008 20:13:47 -0000 +@@ -450,3 +450,10 @@ + i68568utf.test \ + 1706659.test \ + digits_in_words.test \ ++--- misc/hunspell-1.1.12/tests/test.sh 2007-07-15 22:33:13.000000000 +0900 +++++ misc/build/hunspell-1.1.12/tests/test.sh 2008-07-01 06:18:31.000000000 +0900 ++@@ -1,4 +1,4 @@ ++-#!/bin/bash +++#!/usr/local/bin/bash ++ export LC_ALL="C" ++ diff --git a/editors/openoffice-3-devel/files/pkg-message.in b/editors/openoffice-3-devel/files/pkg-message.in index 0a741aa711dc..7bfa92c74667 100644 --- a/editors/openoffice-3-devel/files/pkg-message.in +++ b/editors/openoffice-3-devel/files/pkg-message.in @@ -10,11 +10,8 @@ OpenOffice.org %%OOOTAG%% will soon been installed in -------------------- Just type "%%EXECBASE%%" after you have successfully -installed the package. If there is no installed -OO.org dir in your homedir, you'll be prompted to -install some files and choose an installed JDK. -The setup installs a ".openoffice.org3" folder -in your homedir. +installed the package. If there is no installed OO.org dir +in your homedir, the setup installs ".%%OOODIR%%" folder. 2. Starting OO.org ------------------ @@ -37,6 +34,6 @@ OO.org does need $LANG to be set to a suitable value. 3. If you run into problems -------------------------------------------------- -If you somehow run into problems, please remove the already installed -".openoffice.org3" dir in your homedir. Redo the user +If you somehow run into problems, please remove the already +installed ".%%OOODIR%%" dir in your homedir. Redo the user installation and the problems should go away. -- cgit v1.2.3