From 199970200b552fc4bfc285f323570c3af9b3ae50 Mon Sep 17 00:00:00 2001 From: maho Date: Thu, 8 Sep 2005 21:20:53 +0000 Subject: Update to m128 --- editors/openoffice.org-vcltesttool/Makefile | 5 +-- editors/openoffice.org-vcltesttool/distinfo | 4 +- .../files/patch-instsetoo | 51 +++++++++++----------- 3 files changed, 29 insertions(+), 31 deletions(-) (limited to 'editors/openoffice.org-vcltesttool') diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index f51ffa4a345..5c5826b5ada 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -57,8 +57,8 @@ IGNORE= Install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 126 -SNAPDATE= 20050827 +MILESTONE= 128 +SNAPDATE= 20050907 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -117,7 +117,6 @@ LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 .endif GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 259 #workaround:bad config_office/configure of m126 WRKSRC= ${WRKDIR} CONFIGURE_WRKSRC= ${WRKSRC}/config_office ANT?= ${LOCALBASE}/bin/ant diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index dbd3fe7fa55..0823e8ea9c7 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 4457e89d911a69417d294fb45e1304e2 -SIZE (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 224938706 +MD5 (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 230de468468e7bcc93db9cfd468eef30 +SIZE (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 229863809 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-vcltesttool/files/patch-instsetoo b/editors/openoffice.org-vcltesttool/files/patch-instsetoo index c9cebc0a5c3..ccb23c98592 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-instsetoo +++ b/editors/openoffice.org-vcltesttool/files/patch-instsetoo @@ -10,91 +10,90 @@ and pkg_add command is forked infinite times and eats up systems' resource. namely when core01 tries to install core02, core02 also tries to install core01. - Index: instsetoo_native/inc_openoffice/unix/packagelist.txt =================================================================== RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v -retrieving revision 1.15 -diff -u -r1.15 packagelist.txt ---- instsetoo_native/inc_openoffice/unix/packagelist.txt 18 Aug 2005 12:48:34 -0000 1.15 -+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 22 Aug 2005 07:01:29 -0000 -@@ -38,7 +38,7 @@ +retrieving revision 1.16 +diff -u -r1.16 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Aug 2005 08:52:34 -0000 1.16 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 7 Sep 2005 10:20:37 -0000 +@@ -36,7 +36,7 @@ + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" packagename = "openoffice.org-core01" - linuxreplaces = "openofficeorg-core,openofficeorg-core01" - provides = "openofficeorg-core01" + linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01" -requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08" +requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -284,7 +284,6 @@ +@@ -265,7 +265,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core02" linuxreplaces = "openofficeorg-core02" - provides = "openofficeorg-core02" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -298,7 +297,6 @@ +@@ -278,7 +277,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core03" linuxreplaces = "openofficeorg-core03" - provides = "openofficeorg-core03" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -312,7 +310,6 @@ +@@ -291,7 +289,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core04" linuxreplaces = "openofficeorg-core04" - provides = "openofficeorg-core04" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -326,7 +323,6 @@ +@@ -304,7 +301,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core05" linuxreplaces = "openofficeorg-core05" - provides = "openofficeorg-core05" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -340,7 +336,6 @@ +@@ -317,7 +313,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core06" linuxreplaces = "openofficeorg-core06" - provides = "openofficeorg-core06" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -354,7 +349,6 @@ +@@ -330,7 +325,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core07" linuxreplaces = "openofficeorg-core07" - provides = "openofficeorg-core07" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -368,7 +362,6 @@ +@@ -343,7 +337,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core08" linuxreplaces = "openofficeorg-core08" - provides = "openofficeorg-core08" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -382,7 +375,6 @@ +@@ -356,7 +349,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core09" linuxreplaces = "openofficeorg-core09" - provides = "openofficeorg-core09" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -397,7 +389,6 @@ +@@ -370,7 +362,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core10" linuxreplaces = "openofficeorg-core10" - provides = "openofficeorg-core10" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" -- cgit