diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-05-10 09:54:43 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-05-10 09:54:43 +0000 |
| commit | 332463c643a0174245e3c943c0707b5c011da08d (patch) | |
| tree | 72d711a67a386d3e7c460221336c07d9d7e31a97 /editors | |
| parent | Correct WWW. (diff) | |
Update to 1.1.4m54
Notes
Notes:
svn path=/head/; revision=134979
Diffstat (limited to '')
14 files changed, 118 insertions, 78 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 050768462719..8c021e21addf 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -23,7 +23,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser -SNAPDATE= 20050413 +SNAPDATE= 20050503 NO_LATEST_LINK= yes USE_GNOME= gtk20 @@ -82,7 +82,7 @@ L10NHELPS= helpcontent_07_unix.tgz \ CODELINE= 645 RELEASE_NR= 1.1.4 -MILESTONE= 53 +MILESTONE= 54 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org1.1 @@ -126,7 +126,7 @@ LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant .endif GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 259 +#USE_AUTOCONF_VER= 259 WRKSRC= ${WRKDIR} CONFIGURE_WRKSRC= ${WRKSRC}/config_office ANT?= ${LOCALBASE}/bin/ant diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo index 8c75943fbc13..fd39018486e4 100644 --- a/editors/openoffice-1.1-devel/distinfo +++ b/editors/openoffice-1.1-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org1.1/OOo_1.1.4m53_source.tar.bz2) = feb2225b47ce6589c628c9a6d551f291 -SIZE (openoffice.org1.1/OOo_1.1.4m53_source.tar.bz2) = 198588570 +MD5 (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = f0d556b998846eebae0314ed0e706868 +SIZE (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = 198587650 MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917 MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..cf9ab68b0de4 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk @@ -0,0 +1,18 @@ +#i48978# + +Index: bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk +=================================================================== +RCS file: /cvs/udk/bridges/source/cpp_uno/gcc2_freebsd_intel/Attic/makefile.mk,v +retrieving revision 1.1 +diff -u -r1.1 makefile.mk +--- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk 12 Nov 2001 22:43:04 -0000 1.1 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk 10 May 2005 01:12:25 -0000 +@@ -76,7 +76,7 @@ + + # --- Files -------------------------------------------------------- + +-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" ++.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2" + + CFLAGSNOOPT=-O0 + NOOPTFILES=$(SLO)$/uno2cpp.obj diff --git a/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx deleted file mode 100644 index 6ef5bf464ef9..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=40643 - -Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however, -it is not certified by SUN Microsystems. FreeBSD can use Linux's Java -since there is a binary compatibility (NOT EMULATION!) -Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default, -we need to add several seachpaths. - -Index: jvmaccess/source/javainfoimpl.cxx -=================================================================== -RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v -retrieving revision 1.7.12.5 -diff -u -r1.7.12.5 javainfoimpl.cxx ---- jvmaccess/source/javainfoimpl.cxx 20 Oct 2004 11:43:13 -0000 1.7.12.5 -+++ jvmaccess/source/javainfoimpl.cxx 14 Jan 2005 10:58:53 -0000 -@@ -240,8 +240,16 @@ - "java", \ - "Home", \ - "IBMJava2-" ARCH "-131", \ -- "IBMJava2-" ARCH "-141" -- -+ "IBMJava2-" ARCH "-141" , \ -+ "jdk1.4.2", \ -+ "diablo-jre1.3.1", \ -+ "diablo-jdk1.3.1", \ -+ "linux-sun-jdk1.3.1", \ -+ "linux-sun-jdk1.4.2", \ -+ "linux-ibm-jdk1.3.1", \ -+ "linux-ibm-jdk1.4.2", \ -+ "linux-blackdown-jdk1.3.1", \ -+ "linux-blackdown-jdk1.4.2" - - /* These are directories in which a java installation is - looked for. diff --git a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in index 59269742ab37..7d51443e7778 100644 --- a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in +++ b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in @@ -1,4 +1,5 @@ http://www.openoffice.org/issues/show_bug.cgi?id=24142 +http://www.openoffice.org/issues/show_bug.cgi?id=40190 --- odk/setsdkenv_unix.in.orig Sun Jan 25 18:41:01 2004 +++ odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 diff --git a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk index 78814a4cfaee..4076b9e5a54f 100644 --- a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk +++ b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk @@ -1,3 +1,4 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=40190 http://www.openoffice.org/issues/show_bug.cgi?id=24142 --- odk/settings/settings.mk.orig Sun Jan 25 18:41:02 2004 diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk new file mode 100644 index 000000000000..b298b51d3665 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk @@ -0,0 +1,34 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=48988 + +at configure stage, ENABLE_PASF is settend to NO. +---config_office/configure.in start +dnl =================================================================== +dnl Test whether wwe want to use portaudio/sndfile +dnl =================================================================== +AC_MSG_CHECKING([whether to use portaudio/sndfile]) +ENABLE_PASF=NO +if test -n "$enable_pasf"; then + ENABLE_PASF=YES + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_PASF) +---end + +Index: vcl/unx/source/app/makefile.mk +=================================================================== +RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v +retrieving revision 1.9.250.3 +diff -u -r1.9.250.3 makefile.mk +--- vcl/unx/source/app/makefile.mk 29 Apr 2005 14:25:56 -0000 1.9.250.3 ++++ vcl/unx/source/app/makefile.mk 10 May 2005 05:53:27 -0000 +@@ -113,7 +113,7 @@ + $(SLO)$/rptpsound.obj \ + $(SLO)$/nassound.obj + +-.IF "$(ENABLE_PASF)" != "" ++.IF "$(ENABLE_PASF)" == "YES" + CFLAGS+=-DUSE_PASF + .IF "$(SYSTEM_PORTAUDIO)" == "YES" + CFLAGS+=-DSYSTEM_PORTAUDIO diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 050768462719..8c021e21addf 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -23,7 +23,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser -SNAPDATE= 20050413 +SNAPDATE= 20050503 NO_LATEST_LINK= yes USE_GNOME= gtk20 @@ -82,7 +82,7 @@ L10NHELPS= helpcontent_07_unix.tgz \ CODELINE= 645 RELEASE_NR= 1.1.4 -MILESTONE= 53 +MILESTONE= 54 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org1.1 @@ -126,7 +126,7 @@ LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant .endif GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 259 +#USE_AUTOCONF_VER= 259 WRKSRC= ${WRKDIR} CONFIGURE_WRKSRC= ${WRKSRC}/config_office ANT?= ${LOCALBASE}/bin/ant diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo index 8c75943fbc13..fd39018486e4 100644 --- a/editors/openoffice.org-1.1-devel/distinfo +++ b/editors/openoffice.org-1.1-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org1.1/OOo_1.1.4m53_source.tar.bz2) = feb2225b47ce6589c628c9a6d551f291 -SIZE (openoffice.org1.1/OOo_1.1.4m53_source.tar.bz2) = 198588570 +MD5 (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = f0d556b998846eebae0314ed0e706868 +SIZE (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = 198587650 MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917 MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..cf9ab68b0de4 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk @@ -0,0 +1,18 @@ +#i48978# + +Index: bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk +=================================================================== +RCS file: /cvs/udk/bridges/source/cpp_uno/gcc2_freebsd_intel/Attic/makefile.mk,v +retrieving revision 1.1 +diff -u -r1.1 makefile.mk +--- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk 12 Nov 2001 22:43:04 -0000 1.1 ++++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk 10 May 2005 01:12:25 -0000 +@@ -76,7 +76,7 @@ + + # --- Files -------------------------------------------------------- + +-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" ++.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2" + + CFLAGSNOOPT=-O0 + NOOPTFILES=$(SLO)$/uno2cpp.obj diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx deleted file mode 100644 index 6ef5bf464ef9..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=40643 - -Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however, -it is not certified by SUN Microsystems. FreeBSD can use Linux's Java -since there is a binary compatibility (NOT EMULATION!) -Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default, -we need to add several seachpaths. - -Index: jvmaccess/source/javainfoimpl.cxx -=================================================================== -RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v -retrieving revision 1.7.12.5 -diff -u -r1.7.12.5 javainfoimpl.cxx ---- jvmaccess/source/javainfoimpl.cxx 20 Oct 2004 11:43:13 -0000 1.7.12.5 -+++ jvmaccess/source/javainfoimpl.cxx 14 Jan 2005 10:58:53 -0000 -@@ -240,8 +240,16 @@ - "java", \ - "Home", \ - "IBMJava2-" ARCH "-131", \ -- "IBMJava2-" ARCH "-141" -- -+ "IBMJava2-" ARCH "-141" , \ -+ "jdk1.4.2", \ -+ "diablo-jre1.3.1", \ -+ "diablo-jdk1.3.1", \ -+ "linux-sun-jdk1.3.1", \ -+ "linux-sun-jdk1.4.2", \ -+ "linux-ibm-jdk1.3.1", \ -+ "linux-ibm-jdk1.4.2", \ -+ "linux-blackdown-jdk1.3.1", \ -+ "linux-blackdown-jdk1.4.2" - - /* These are directories in which a java installation is - looked for. diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in index 59269742ab37..7d51443e7778 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in +++ b/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in @@ -1,4 +1,5 @@ http://www.openoffice.org/issues/show_bug.cgi?id=24142 +http://www.openoffice.org/issues/show_bug.cgi?id=40190 --- odk/setsdkenv_unix.in.orig Sun Jan 25 18:41:01 2004 +++ odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk index 78814a4cfaee..4076b9e5a54f 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk @@ -1,3 +1,4 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=40190 http://www.openoffice.org/issues/show_bug.cgi?id=24142 --- odk/settings/settings.mk.orig Sun Jan 25 18:41:02 2004 diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk new file mode 100644 index 000000000000..b298b51d3665 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk @@ -0,0 +1,34 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=48988 + +at configure stage, ENABLE_PASF is settend to NO. +---config_office/configure.in start +dnl =================================================================== +dnl Test whether wwe want to use portaudio/sndfile +dnl =================================================================== +AC_MSG_CHECKING([whether to use portaudio/sndfile]) +ENABLE_PASF=NO +if test -n "$enable_pasf"; then + ENABLE_PASF=YES + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_PASF) +---end + +Index: vcl/unx/source/app/makefile.mk +=================================================================== +RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v +retrieving revision 1.9.250.3 +diff -u -r1.9.250.3 makefile.mk +--- vcl/unx/source/app/makefile.mk 29 Apr 2005 14:25:56 -0000 1.9.250.3 ++++ vcl/unx/source/app/makefile.mk 10 May 2005 05:53:27 -0000 +@@ -113,7 +113,7 @@ + $(SLO)$/rptpsound.obj \ + $(SLO)$/nassound.obj + +-.IF "$(ENABLE_PASF)" != "" ++.IF "$(ENABLE_PASF)" == "YES" + CFLAGS+=-DUSE_PASF + .IF "$(SYSTEM_PORTAUDIO)" == "YES" + CFLAGS+=-DSYSTEM_PORTAUDIO |