cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.2.1.

Browse Source 
Funded by: OpenOffice.org community.
This commit is contained in:
Maho Nakata 2010-06-05 11:01:56 +00:00
parent 0e4b966756
commit 2a9e6e3962
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=255762
6 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editors/openoffice-3/Makefile
View File

@ -7,7 +7,6 @@
PORTNAME?= openoffice.org PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION} PORTVERSION?= ${OOOVERSION}
PORTREVISION= 2
CATEGORIES+= editors java CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \
@ -24,7 +23,7 @@ COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(releas
CONFLICTS= cppunit* CONFLICTS= cppunit*
OOOVERSION= 3.2.0 OOOVERSION= 3.2.1
NO_LATEST_LINK= yes NO_LATEST_LINK= yes
.if !defined(WITHOUT_MOZILLA) .if !defined(WITHOUT_MOZILLA)
@ -76,7 +75,7 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif .endif
MILESTONE?= 12 MILESTONE?= 19
OOOTAG?= OOO320_m${MILESTONE} OOOTAG?= OOO320_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3 OOODIR= openoffice.org3
@ -151,11 +150,11 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
--enable-wiki-publisher \ --enable-wiki-publisher \
--enable-report-builder --enable-report-builder
OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt
OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt
OOOEXTENSIONS+= swext/wiki-publisher.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt
OOOEXTENSIONS+= sun-report-builder.oxt OOOEXTENSIONS+= report-builder.oxt
.if (${OSVERSION} <= 602102) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667

6
editors/openoffice-3/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 11fc18288da977d1007c90dfffbee865 MD5 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = feb692912799d9f7369a48d704f3b6df
SHA256 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = bb15929f9316af39596cd169cba9c9f86cfb6c7f623cb93ba662d5ebf162ef26 SHA256 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 130a7ec1c61f3f18698be40312ab7457bd46aac0281e412b4f9d7b9d422e2d79
SIZE (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 447062642 SIZE (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 447921964
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144 SIZE (openoffice.org3/unowinreg.dll) = 6144

10
editors/openoffice-3/files/patch-i102181
View File

@ -1,6 +1,6 @@
--- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900 --- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900
+++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900 +++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900
@@ -65,7 +65,7 @@ @@ -61,7 +61,7 @@
OUT2LIB += libcrypto.* OUT2LIB += libcrypto.*
OUT2INC += include/openssl/* OUT2INC += include/openssl/*
@ -8,16 +8,16 @@
+.IF "$(OS)" == "LINUX" +.IF "$(OS)" == "LINUX"
PATCH_FILES=openssllnx.patch PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \ ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8l.map \ libcrypto_OOo_0_9_8n.map \
@@ -103,6 +103,22 @@ @@ -99,6 +99,22 @@
.ENDIF .ENDIF
.ENDIF .ENDIF
+.IF "$(OS)" == "FREEBSD" +.IF "$(OS)" == "FREEBSD"
+ PATCH_FILES=openssllnx.patch + PATCH_FILES=openssllnx.patch
+ ADDITIONAL_FILES:= \ + ADDITIONAL_FILES:= \
+ libcrypto_OOo_0_9_8l.map \ + libcrypto_OOo_0_9_8n.map \
+ libssl_OOo_0_9_8l.map + libssl_OOo_0_9_8n.map
+ .IF "$(CPU)" == "I" + .IF "$(CPU)" == "I"
+ CONFIGURE_ACTION=Configure BSD-x86-elf + CONFIGURE_ACTION=Configure BSD-x86-elf
+ .ELIF "$(BUILD64)" == "1" + .ELIF "$(BUILD64)" == "1"

9
editors/openoffice.org-3/Makefile
View File

@ -7,7 +7,6 @@
PORTNAME?= openoffice.org PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION} PORTVERSION?= ${OOOVERSION}
PORTREVISION= 2
CATEGORIES+= editors java CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \
@ -24,7 +23,7 @@ COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(releas
CONFLICTS= cppunit* CONFLICTS= cppunit*
OOOVERSION= 3.2.0 OOOVERSION= 3.2.1
NO_LATEST_LINK= yes NO_LATEST_LINK= yes
.if !defined(WITHOUT_MOZILLA) .if !defined(WITHOUT_MOZILLA)
@ -76,7 +75,7 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif .endif
MILESTONE?= 12 MILESTONE?= 19
OOOTAG?= OOO320_m${MILESTONE} OOOTAG?= OOO320_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3 OOODIR= openoffice.org3
@ -151,11 +150,11 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
--enable-wiki-publisher \ --enable-wiki-publisher \
--enable-report-builder --enable-report-builder
OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt
OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt
OOOEXTENSIONS+= swext/wiki-publisher.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt
OOOEXTENSIONS+= sun-report-builder.oxt OOOEXTENSIONS+= report-builder.oxt
.if (${OSVERSION} <= 602102) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667

6
editors/openoffice.org-3/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 11fc18288da977d1007c90dfffbee865 MD5 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = feb692912799d9f7369a48d704f3b6df
SHA256 (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = bb15929f9316af39596cd169cba9c9f86cfb6c7f623cb93ba662d5ebf162ef26 SHA256 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 130a7ec1c61f3f18698be40312ab7457bd46aac0281e412b4f9d7b9d422e2d79
SIZE (openoffice.org3/OOo_OOO320_m12_source.tar.bz2) = 447062642 SIZE (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 447921964
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144 SIZE (openoffice.org3/unowinreg.dll) = 6144

10
editors/openoffice.org-3/files/patch-i102181
View File

@ -1,6 +1,6 @@
--- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900 --- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900
+++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900 +++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900
@@ -65,7 +65,7 @@ @@ -61,7 +61,7 @@
OUT2LIB += libcrypto.* OUT2LIB += libcrypto.*
OUT2INC += include/openssl/* OUT2INC += include/openssl/*
@ -8,16 +8,16 @@
+.IF "$(OS)" == "LINUX" +.IF "$(OS)" == "LINUX"
PATCH_FILES=openssllnx.patch PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \ ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8l.map \ libcrypto_OOo_0_9_8n.map \
@@ -103,6 +103,22 @@ @@ -99,6 +99,22 @@
.ENDIF .ENDIF
.ENDIF .ENDIF
+.IF "$(OS)" == "FREEBSD" +.IF "$(OS)" == "FREEBSD"
+ PATCH_FILES=openssllnx.patch + PATCH_FILES=openssllnx.patch
+ ADDITIONAL_FILES:= \ + ADDITIONAL_FILES:= \
+ libcrypto_OOo_0_9_8l.map \ + libcrypto_OOo_0_9_8n.map \
+ libssl_OOo_0_9_8l.map + libssl_OOo_0_9_8n.map
+ .IF "$(CPU)" == "I" + .IF "$(CPU)" == "I"
+ CONFIGURE_ACTION=Configure BSD-x86-elf + CONFIGURE_ACTION=Configure BSD-x86-elf
+ .ELIF "$(BUILD64)" == "1" + .ELIF "$(BUILD64)" == "1"