aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2-RC
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2005-02-12 12:01:04 +0000
committerMaho Nakata <maho@FreeBSD.org>2005-02-12 12:01:04 +0000
commit3b030b2f32fd1374397410793e712e53e8d0a252 (patch)
tree1589d175c5afed309c6925a1dd1e6274adcfc987 /editors/openoffice.org-2-RC
parent89f68eeeddc5a37a774b6e40c64950339adb89f0 (diff)
downloadports-3b030b2f32fd1374397410793e712e53e8d0a252.tar.gz
ports-3b030b2f32fd1374397410793e712e53e8d0a252.zip
Notes
Diffstat (limited to 'editors/openoffice.org-2-RC')
-rw-r--r--editors/openoffice.org-2-RC/Makefile8
-rw-r--r--editors/openoffice.org-2-RC/distinfo4
-rw-r--r--editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp18
3 files changed, 13 insertions, 17 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index b86e55596455..d89730d3ea07 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050205
+SNAPDATE= 20050211
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -50,7 +50,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 77
+MILESTONE= 78
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -206,8 +206,8 @@ package-rename:
sdk:
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
- #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
- #@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}._SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
+ @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
+ @${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}.m${MILESTONE}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
solver:
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 36c90e803fed..c86a63e24046 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m77_source.tar.bz2) = c461e90e94c43b589a929608a213644e
-SIZE (openoffice.org2.0/OOo_1.9m77_source.tar.bz2) = 242340483
+MD5 (openoffice.org2.0/OOo_1.9m78_source.tar.bz2) = ac9712cabcfdf11b70803bad8a539170
+SIZE (openoffice.org2.0/OOo_1.9m78_source.tar.bz2) = 243445063
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp b/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp
index 4d64f728133f..a27b9099f0b2 100644
--- a/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp
+++ b/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp
@@ -1,22 +1,18 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40186
-
-The name of resultant library is libxml2.so.7, not libxml2.so.2.5.11
-
Index: scp2/source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.75
-diff -u -r1.75 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp 23 Dec 2004 09:49:51 -0000 1.75
-+++ scp2/source/ooo/file_library_ooo.scp 30 Dec 2004 13:01:14 -0000
-@@ -2027,7 +2027,9 @@
+retrieving revision 1.82
+diff -u -r1.82 file_library_ooo.scp
+--- scp2/source/ooo/file_library_ooo.scp 4 Feb 2005 11:31:17 -0000 1.82
++++ scp2/source/ooo/file_library_ooo.scp 11 Feb 2005 12:43:44 -0000
+@@ -2007,7 +2007,9 @@
TXT_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
- #ifdef UNX
+ #if defined(FREEBSD)
-+ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.7));
++ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.8));
+ #elif defined(UNX)
- Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.5.11));
+ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
#else
Name = "libxml2.dll";