diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-03-21 21:22:27 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-03-21 21:22:27 +0000 |
| commit | a7aa1f46e5d8e4cffad65f3b8e21a1e5d1c5e6de (patch) | |
| tree | 16e5df1ee6aeeaf45fd17e247f30d3c0f267b15f /editors/openoffice-3-devel | |
| parent | 4713640f13778b1ab79914d1561edce5d19ede6c (diff) | |
| download | ports-a7aa1f46e5d8e4cffad65f3b8e21a1e5d1c5e6de.tar.gz ports-a7aa1f46e5d8e4cffad65f3b8e21a1e5d1c5e6de.zip | |
Notes
Diffstat (limited to 'editors/openoffice-3-devel')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-i91369 | 25 |
3 files changed, 5 insertions, 30 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index a469bd545958..060d966e4c97 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -70,11 +70,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 43 +MILESTONE?= 44 OOOTAG?= DEV300_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20090320 +SNAPDATE= 20090321 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 22804d5c84b4..a4d79b93c068 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_DEV300_m43_source.tar.bz2) = 86bdfd891706fcb1da75cddbd105a570 -SHA256 (openoffice.org3/OOo_DEV300_m43_source.tar.bz2) = 621bbf652a047ba2e419e6ed2f48089ff8ab7c1bb527f2d57078f6c81314a563 -SIZE (openoffice.org3/OOo_DEV300_m43_source.tar.bz2) = 392574244 +MD5 (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 117af32dd73fe38e711490ff670c7ecc +SHA256 (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 895f450c8eb42371ac4787820e2077037fee1a7b03fc72f9189f731017e4d9b1 +SIZE (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 403092581 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/patch-i91369 b/editors/openoffice-3-devel/files/patch-i91369 deleted file mode 100644 index d042a4cb5e0f..000000000000 --- a/editors/openoffice-3-devel/files/patch-i91369 +++ /dev/null @@ -1,25 +0,0 @@ -#FBSD7+amd64+gcc421 is okay without the patch (w/o -lsupc++ is fine) -#FBSD6+amd64+gcc342 is okay with the patch (w/o -lsupc++ is fine) - ...-lsupc++ is static, and cannot find -lgcc_s -#FBSD6+i386+gcc342 is okay with the patch (w/o -lsupc++ -lgcc_s is fine) - cannot find -lgcc_s - ---- store/util/makefile.mk.orig 2007-12-12 22:23:13.000000000 +0900 -+++ store/util/makefile.mk 2008-08-16 20:52:44.000000000 +0900 -@@ -76,6 +76,7 @@ - .ENDIF - - # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so -+# FBSD6+amd64+gcc342 does not require -lsupc++. only libsupc++.a is supplied - .IF "$(COMID)"=="gcc3" && "$(GUI)"!="OS2" - .IF "$(GUI)"=="WNT" - SHL1STDLIBS+= -lsupc++ -@@ -86,6 +87,8 @@ - .IF "$(CCNUMVER)"<="000399999999" - SHL1STDLIBS+= -lsupc++ - .ENDIF # CCNUMVER -+.ELIF "$(OS)"=="FREEBSD" -+SHL1STDLIBS+= - .ELIF "$(CCNUMVER)"<="000400000999" - SHL1STDLIBS+= -lsupc++ -lgcc_s - .ENDIF |