mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

Update to ooo-build 2.1,

Browse Source 
and fixes the build that is reported by kris.
The `base' version should ooo-build and openoffic.org-2 should
be the same.
This commit is contained in:
Maho Nakata 2007-01-14 10:39:31 +00:00
parent 12925bd2e8
commit 8a1970c180
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=182352
3 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/ooo-build/Makefile
View File

@ -5,7 +5,7 @@
PORTNAME= ooo-build
PORTVERSION= ${OOOBUILD_VERSION}
MASTER_SITES+= http://www.go-ooo.org/packages/OOD680/ \
MASTER_SITES+= http://www.go-ooo.org/packages/OOE680/ \
http://www.go-ooo.org/packages/SRC680/ \
http://www.openclipart.org/downloads/0.18/:openclipart
DISTFILES+= ${OOOBUILD_SOURCE} \
@ -30,10 +30,10 @@ OOO_CRYSTAL_IMAGES= ooo_crystal_images-1.tar.gz
OOO_OPENCLIPART= openclipart-0.18-full.tar.gz
OOO_PATCHDIR=src680
.else
OOOBUILD_VERSION=2.0.4.3
OOOBUILD_TAG=ood680-m5
OOOSRC= OOo_2.0.4_src.tar.gz
OOOTAG= OOD680_m5
OOOBUILD_VERSION=2.1
OOOBUILD_TAG=ooe680-m6
OOOSRC= OOo_OOE680_m6_source.tar.bz2
OOOTAG= OOE680_m6
OOOBUILD= ooo-build-${OOOBUILD_VERSION}
#OOOBUILD= ooo-build-${OOOBUILD_TAG}
OOOBUILD_SOURCE=${OOOBUILD}.tar.gz

12
editors/ooo-build/distinfo
View File

@ -1,6 +1,6 @@
SIZE (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 4602866
MD5 (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 100eb6ba7f7abcafea042a75692eb948
SHA256 (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 932c25a6e1f91a5ad8be257179b0e3b18b46bab5736fbdd4223760b23e81ead5
MD5 (openoffice.org2.0/ooo-build-2.1.tar.gz) = a9b1b3876a804251656374b92dd9e4f0
SHA256 (openoffice.org2.0/ooo-build-2.1.tar.gz) = 02bdf2c8b3fa02cabfdb8aa74a2d0f194d5488c504afb1019d720ed5ce38b4ac
SIZE (openoffice.org2.0/ooo-build-2.1.tar.gz) = 4034756
MD5 (openoffice.org2.0/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020
SHA256 (openoffice.org2.0/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
SIZE (openoffice.org2.0/extras-2.tar.bz2) = 94740
@ -10,9 +10,9 @@ SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 1068060
MD5 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = bf32bda3914b27d3bcd0ef8f8e363619
SHA256 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = e57cceacd62e51da8e13b0d8e6700306fe3e04ed33b9cf686644e58446f4232a
SIZE (openoffice.org2.0/openclipart-0.18-full.tar.gz) = 126709000
MD5 (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = df4bb26645e974a2358bc17f8381a197
SHA256 (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 98551d4574586c5a9e26635be758cf05a0315ee9eb44ad7c5ac7c7b983933ea6
SIZE (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 333861883
MD5 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = baa88794cb08d1a11169ae90ec25c0c4
SHA256 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 492e702455a43c9c1b97266e74d3adc03815178e272c6f79b8e29c1089977e19
SIZE (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 272194113
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144

51
editors/ooo-build/files/ooo-build-patch
View File

@ -1,7 +1,6 @@
gnu patch is gpatch for FreeBSD.
--- patches/apply.pl Tue Nov 1 00:07:02 2005
+++ patches/apply.pl Tue Nov 1 00:07:32 2005
@@ -473,7 +473,7 @@
--- patches/apply.pl.orig Thu Jan 4 05:16:03 2007
+++ patches/apply.pl Sun Jan 14 06:55:07 2007
@@ -722,7 +722,7 @@
my $ver_line;
my $is_old = 1;
@ -10,7 +9,7 @@ gnu patch is gpatch for FreeBSD.
$ver_line = <$Patch>;
$ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
@@ -597,7 +597,7 @@
@@ -1006,7 +1006,7 @@
$applied_patches = $dest_dir.'/applied_patches';
$opts = join ' ', @arguments;
@ -20,27 +19,18 @@ gnu patch is gpatch for FreeBSD.
$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
}
--- patches/src680/apply.orig Thu Aug 31 02:44:39 2006
+++ patches/src680/apply Sat Sep 2 14:50:24 2006
@@ -81,6 +81,8 @@
# Novell
NovellWin32: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas
--- patches/src680/apply.orig Fri Jan 12 06:43:19 2007
+++ patches/src680/apply Sun Jan 14 06:43:42 2007
@@ -96,6 +96,8 @@
NovellWin32ISO: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas
# Mac OS X
MacOSX : MacOSXCommon, SystemJavaBits, CalcSolver, MacOSXOnly
+# FreeBSD
+FreeBSD : LinuxCommon, NotDebian, Lockdown, CalcSolver
# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
@@ -169,7 +169,7 @@
cws-cmcfixes28.diff
# fix build with newer gccs
-buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
+# buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
# [ LinuxOnly ]
@@ -755,7 +757,7 @@
@@ -781,7 +783,7 @@
autodoc-add-missing-stdio-h.diff, rengelha
# do not pack any potential .orig files with ppds
@ -49,21 +39,30 @@ gnu patch is gpatch for FreeBSD.
# changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
# of files does not conflict with the main package, i#64802
@@ -848,7 +850,7 @@
buildfix-gcc41-pointers-icu.diff, pmladek
@@ -873,7 +875,7 @@
warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
# Don't re-define NULL
-solar-dont-define-NULL.diff, i#66666, jholesov
+# solar-dont-define-NULL.diff, i#66666, jholesov
# Fix warnings that appear on x86-64 & are considered dangerous
# FIXME file up-stream
@@ -908,7 +908,7 @@
sixtyfour-warnings-binfilter.diff, jholesov
sixtyfour-warnings-svx.diff, i#70594, jholesov
@@ -887,7 +889,7 @@
buildfix-gcc41-pointers-icu.diff, pmladek
# fix build with newer gccs
-buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
+# buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
[ BFBuildBits ]
SectionOwner => pmladek
@@ -903,7 +905,7 @@
sixtyfour-warnings-binfilter.diff, i#70594, jholesov
# fix build with newer gccs
-buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684
+# buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684
[ VCL ]
[ VCL ]