aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice.org-2
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2005-06-17 17:40:37 +0800
committermaho <maho@FreeBSD.org>2005-06-17 17:40:37 +0800
commit0feb90e0c82de3fab4b3707ee9356f623844b496 (patch)
tree15d45145c6f9e15acac92bb1dd95c0c787e1c8f6 /editors/openoffice.org-2
parent47a21265a31c3471ea1a112505baa6a43423cfbc (diff)
downloadfreebsd-ports-graphics-0feb90e0c82de3fab4b3707ee9356f623844b496.tar.gz
freebsd-ports-graphics-0feb90e0c82de3fab4b3707ee9356f623844b496.tar.zst
freebsd-ports-graphics-0feb90e0c82de3fab4b3707ee9356f623844b496.zip
Update to m110
Diffstat (limited to 'editors/openoffice.org-2')
-rw-r--r--editors/openoffice.org-2/Makefile5
-rw-r--r--editors/openoffice.org-2/distinfo4
-rw-r--r--editors/openoffice.org-2/files/Makefile.knobs4
-rw-r--r--editors/openoffice.org-2/files/patch-canvas+inc+canvas+canvastools.hxx25
4 files changed, 6 insertions, 32 deletions
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 6450320ec49..56b9220d0ed 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 109
-SNAPDATE= 20050611
+MILESTONE= 110
+SNAPDATE= 20050616
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -91,7 +91,6 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.endif
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER=259
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index cf7c1317b33..bf2963d01af 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m109_source.tar.bz2) = 8ca9f915ecc67827bea55fdd7ea9c732
-SIZE (openoffice.org2.0/OOo_1.9m109_source.tar.bz2) = 209951251
+MD5 (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
+SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 9363f2709ec..87743c8c490 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -105,8 +105,8 @@ pre-fetch:
@${ECHO}
@${ECHO} "To build OOo, you should have a lot"
.if defined(WITH_DEBUG)
- @${ECHO} "of free diskspace (~ 8GB)."
+ @${ECHO} "of free diskspace (~ 18GB)."
.else
- @${ECHO} "of free diskspace (~ 4GB)."
+ @${ECHO} "of free diskspace (~ 8.5GB)."
.endif
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
diff --git a/editors/openoffice.org-2/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-2/files/patch-canvas+inc+canvas+canvastools.hxx
deleted file mode 100644
index e07c8d33490..00000000000
--- a/editors/openoffice.org-2/files/patch-canvas+inc+canvas+canvastools.hxx
+++ /dev/null
@@ -1,25 +0,0 @@
-Issutracker : #i49681#
-CWS : N/A
-Author : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : powerof2() is already defined
-
-Index: canvas/inc/canvas/canvastools.hxx
-===================================================================
-RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
-retrieving revision 1.7
-diff -u -r1.7 canvastools.hxx
---- canvas/inc/canvas/canvastools.hxx 30 Mar 2005 07:34:18 -0000 1.7
-+++ canvas/inc/canvas/canvastools.hxx 6 Apr 2005 01:22:58 -0000
-@@ -133,9 +133,9 @@
- */
-
- // mickey's math tricks...
-- inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
-- inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
-- inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
-+ inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
-+ inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
-+ inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
- template<typename T>
- inline unsigned int bitcount( T c ) {
- unsigned int nByteIndex = 0;