diff options
author | Maho Nakata <maho@FreeBSD.org> | 2010-02-07 06:47:31 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2010-02-07 06:47:31 +0000 |
commit | 78f18b815a7788deda53665c4a1ca9a386ce9110 (patch) | |
tree | d0c426669b482039dd8b9869c33d00042f02e1c7 /editors/openoffice.org-3-devel | |
parent | 8addf1a5dc5759132ec48bcf27d6695cce7028bd (diff) | |
download | ports-78f18b815a7788deda53665c4a1ca9a386ce9110.tar.gz ports-78f18b815a7788deda53665c4a1ca9a386ce9110.zip |
Update to DEV300_m69.
Funded by: OpenOffice.org community.
Notes
Notes:
svn path=/head/; revision=249352
Diffstat (limited to 'editors/openoffice.org-3-devel')
-rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 12 | ||||
-rw-r--r-- | editors/openoffice.org-3-devel/distinfo | 6 | ||||
-rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i85027 | 25 |
3 files changed, 15 insertions, 28 deletions
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 14b1ed8903c2..71fc0666168f 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -7,7 +7,6 @@ PORTNAME?= openoffice.org PORTVERSION?= 3.3.${SNAPDATE} -PORTREVISION= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ @@ -73,11 +72,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif -MILESTONE?= 68 +MILESTONE?= 69 OOOTAG?= DEV300_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20091223 +SNAPDATE= 20100110 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org3 @@ -198,13 +197,6 @@ pre-configure: #Workaround for gperf. #i85469# @${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf -pre-build: -#i107644# - cd ${WRKSRC}; ${CP} -R sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86 - cd ${WRKSRC}; ${CP} -R sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86_64 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86_64 - cd ${WRKSRC}; ${REINPLACE_CMD} -e 's/linux/freebsd/g' sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86/presenter.xhp - cd ${WRKSRC}; ${REINPLACE_CMD} -e 's/linux/freebsd/g' sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp - do-build: @cd ${WRKSRC} ; ./bootstrap @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput" diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 98f1fd704df3..4e5139fd6b2f 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_DEV300_m68_source.tar.bz2) = 56636c722fc5d937d0d888a5314e1778 -SHA256 (openoffice.org3/OOo_DEV300_m68_source.tar.bz2) = 86b2f47dc28e4509cb3dc7efdd1d7884789ea5b6738bfb6dc7b037b561d893ce -SIZE (openoffice.org3/OOo_DEV300_m68_source.tar.bz2) = 462999766 +MD5 (openoffice.org3/OOo_DEV300_m69_source.tar.bz2) = c40563e37a6a045dec99ed96d0b88066 +SHA256 (openoffice.org3/OOo_DEV300_m69_source.tar.bz2) = f8b804f825b006bdbd7f3fb06631c20bfabc3dc1d8f5a30e25c8a71e0f7903ec +SIZE (openoffice.org3/OOo_DEV300_m69_source.tar.bz2) = 462952547 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org3/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3-devel/files/patch-i85027 b/editors/openoffice.org-3-devel/files/patch-i85027 index e6fe720647bc..732c68da8633 100644 --- a/editors/openoffice.org-3-devel/files/patch-i85027 +++ b/editors/openoffice.org-3-devel/files/patch-i85027 @@ -16,30 +16,25 @@ and # gcc42 -print-file-name=libgcc_s.so /usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so . - -Index: work/OOH680_m1/external/gcc3_specific/makefile.mk -=================================================================== -RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- external/gcc3_specific/makefile.mk 30 Aug 2006 12:39:00 -0000 1.5 -+++ external/gcc3_specific/makefile.mk 6 Jan 2008 08:10:19 -0000 -@@ -12,7 +12,6 @@ +--- external/gcc3_specific/makefile.mk 2010-01-08 18:13:15.000000000 +0900 ++++ external/gcc3_specific/makefile.mk 2010-02-07 12:17:43.000000000 +0900 +@@ -43,7 +43,6 @@ + .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -.IF "$(OS)"!="FREEBSD" .EXPORT : CC -@@ -25,7 +24,6 @@ - $(LB)$/libgcc_s.so.1 : - $(GCCINSTLIB) libgcc_s.so.1 $(LB) +@@ -60,8 +59,6 @@ + .ENDIF + .ENDIF +- -.ENDIF - .ENDIF - .ENDIF + .ENDIF # "$(BUILD_SPECIAL)"=="" + --- scp2/source/ooo/ure.scp 18 Mar 2008 13:35:26 -0000 1.2 +++ scp2/source/ooo/ure.scp 21 Mar 2008 09:26:48 -0000 @@ -728,7 +730,7 @@ |