mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00
Code Issues Releases Activity

update to SRC680_m182

Browse Source
This commit is contained in:
Maho Nakata 2006-08-19 10:56:17 +00:00
parent 6623295b1d
commit 308de9c9bc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=170980
20 changed files with 65 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editors/openoffice-3-devel/Makefile
View File

@ -13,9 +13,11 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
DISTFILES+= unowinreg.dll:unowinreg
#DISTFILES+= OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
@ -73,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 180
MILESTONE?= 182
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060804
SNAPDATE= 20060818
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -159,8 +161,7 @@ CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
@ -201,6 +202,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif

9
editors/openoffice-3-devel/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950
SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d
SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

24
editors/openoffice-3-devel/files/patch-i67891
View File

@ -1,24 +0,0 @@
Index: cli_ure/version/makefile.mk
===================================================================
RCS file: /cvs/udk/cli_ure/version/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- cli_ure/version/makefile.mk 25 Jul 2006 07:55:26 -0000 1.3
+++ cli_ure/version/makefile.mk 29 Jul 2006 12:02:00 -0000
@@ -52,8 +52,6 @@
ECHOQUOTE=
.ENDIF
-.IF "$(BUILD_FOR_CLI)" != ""
-
ALLTAR : \
$(BIN)$/cliureversion.mk
@@ -69,7 +67,3 @@
#INCVERSION .PHONY: version.txt incversions.txt
# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.END
-
-

25
editors/openoffice-3-devel/files/patch-i68110
View File

@ -1,25 +0,0 @@
Index: tools/bootstrp/sstring.cxx
===================================================================
RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
retrieving revision 1.6
diff -u -r1.6 sstring.cxx
--- tools/bootstrp/sstring.cxx 2 Aug 2006 12:10:04 -0000 1.6
+++ tools/bootstrp/sstring.cxx 10 Aug 2006 08:50:06 -0000
@@ -173,7 +173,7 @@
SByteStringList& SByteStringList::operator<< ( SvStream& rStream )
{
- ULONG nListCount;
+ sal_uInt32 nListCount;
rStream >> nListCount;
for ( USHORT i = 0; i < nListCount; i++ ) {
ByteString* pByteString = new ByteString();
@@ -185,7 +185,7 @@
SByteStringList& SByteStringList::operator>> ( SvStream& rStream )
{
- ULONG nListCount = Count();
+ sal_uInt32 nListCount = Count();
rStream << nListCount;
ByteString* pByteString = First();
while (pByteString) {

12
editors/openoffice.org-2-devel/Makefile
View File

@ -13,9 +13,11 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
DISTFILES+= unowinreg.dll:unowinreg
#DISTFILES+= OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
@ -73,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 180
MILESTONE?= 182
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060804
SNAPDATE= 20060818
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -159,8 +161,7 @@ CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
@ -201,6 +202,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif

9
editors/openoffice.org-2-devel/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950
SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d
SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

24
editors/openoffice.org-2-devel/files/patch-i67891
View File

@ -1,24 +0,0 @@
Index: cli_ure/version/makefile.mk
===================================================================
RCS file: /cvs/udk/cli_ure/version/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- cli_ure/version/makefile.mk 25 Jul 2006 07:55:26 -0000 1.3
+++ cli_ure/version/makefile.mk 29 Jul 2006 12:02:00 -0000
@@ -52,8 +52,6 @@
ECHOQUOTE=
.ENDIF
-.IF "$(BUILD_FOR_CLI)" != ""
-
ALLTAR : \
$(BIN)$/cliureversion.mk
@@ -69,7 +67,3 @@
#INCVERSION .PHONY: version.txt incversions.txt
# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.END
-
-

25
editors/openoffice.org-2-devel/files/patch-i68110
View File

@ -1,25 +0,0 @@
Index: tools/bootstrp/sstring.cxx
===================================================================
RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
retrieving revision 1.6
diff -u -r1.6 sstring.cxx
--- tools/bootstrp/sstring.cxx 2 Aug 2006 12:10:04 -0000 1.6
+++ tools/bootstrp/sstring.cxx 10 Aug 2006 08:50:06 -0000
@@ -173,7 +173,7 @@
SByteStringList& SByteStringList::operator<< ( SvStream& rStream )
{
- ULONG nListCount;
+ sal_uInt32 nListCount;
rStream >> nListCount;
for ( USHORT i = 0; i < nListCount; i++ ) {
ByteString* pByteString = new ByteString();
@@ -185,7 +185,7 @@
SByteStringList& SByteStringList::operator>> ( SvStream& rStream )
{
- ULONG nListCount = Count();
+ sal_uInt32 nListCount = Count();
rStream << nListCount;
ByteString* pByteString = First();
while (pByteString) {

12
editors/openoffice.org-2.0-devel/Makefile
View File

@ -13,9 +13,11 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
DISTFILES+= unowinreg.dll:unowinreg
#DISTFILES+= OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
@ -73,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 180
MILESTONE?= 182
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060804
SNAPDATE= 20060818
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -159,8 +161,7 @@ CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
@ -201,6 +202,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif

9
editors/openoffice.org-2.0-devel/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950
SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d
SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

24
editors/openoffice.org-2.0-devel/files/patch-i67891
View File

@ -1,24 +0,0 @@
Index: cli_ure/version/makefile.mk
===================================================================
RCS file: /cvs/udk/cli_ure/version/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- cli_ure/version/makefile.mk 25 Jul 2006 07:55:26 -0000 1.3
+++ cli_ure/version/makefile.mk 29 Jul 2006 12:02:00 -0000
@@ -52,8 +52,6 @@
ECHOQUOTE=
.ENDIF
-.IF "$(BUILD_FOR_CLI)" != ""
-
ALLTAR : \
$(BIN)$/cliureversion.mk
@@ -69,7 +67,3 @@
#INCVERSION .PHONY: version.txt incversions.txt
# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.END
-
-

25
editors/openoffice.org-2.0-devel/files/patch-i68110
View File

@ -1,25 +0,0 @@
Index: tools/bootstrp/sstring.cxx
===================================================================
RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
retrieving revision 1.6
diff -u -r1.6 sstring.cxx
--- tools/bootstrp/sstring.cxx 2 Aug 2006 12:10:04 -0000 1.6
+++ tools/bootstrp/sstring.cxx 10 Aug 2006 08:50:06 -0000
@@ -173,7 +173,7 @@
SByteStringList& SByteStringList::operator<< ( SvStream& rStream )
{
- ULONG nListCount;
+ sal_uInt32 nListCount;
rStream >> nListCount;
for ( USHORT i = 0; i < nListCount; i++ ) {
ByteString* pByteString = new ByteString();
@@ -185,7 +185,7 @@
SByteStringList& SByteStringList::operator>> ( SvStream& rStream )
{
- ULONG nListCount = Count();
+ sal_uInt32 nListCount = Count();
rStream << nListCount;
ByteString* pByteString = First();
while (pByteString) {

12
editors/openoffice.org-3-devel/Makefile
View File

@ -13,9 +13,11 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
DISTFILES+= unowinreg.dll:unowinreg
#DISTFILES+= OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
@ -73,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 180
MILESTONE?= 182
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060804
SNAPDATE= 20060818
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -159,8 +161,7 @@ CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
@ -201,6 +202,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif

9
editors/openoffice.org-3-devel/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950
SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d
SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

24
editors/openoffice.org-3-devel/files/patch-i67891
View File

@ -1,24 +0,0 @@
Index: cli_ure/version/makefile.mk
===================================================================
RCS file: /cvs/udk/cli_ure/version/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- cli_ure/version/makefile.mk 25 Jul 2006 07:55:26 -0000 1.3
+++ cli_ure/version/makefile.mk 29 Jul 2006 12:02:00 -0000
@@ -52,8 +52,6 @@
ECHOQUOTE=
.ENDIF
-.IF "$(BUILD_FOR_CLI)" != ""
-
ALLTAR : \
$(BIN)$/cliureversion.mk
@@ -69,7 +67,3 @@
#INCVERSION .PHONY: version.txt incversions.txt
# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.END
-
-

25
editors/openoffice.org-3-devel/files/patch-i68110
View File

@ -1,25 +0,0 @@
Index: tools/bootstrp/sstring.cxx
===================================================================
RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
retrieving revision 1.6
diff -u -r1.6 sstring.cxx
--- tools/bootstrp/sstring.cxx 2 Aug 2006 12:10:04 -0000 1.6
+++ tools/bootstrp/sstring.cxx 10 Aug 2006 08:50:06 -0000
@@ -173,7 +173,7 @@
SByteStringList& SByteStringList::operator<< ( SvStream& rStream )
{
- ULONG nListCount;
+ sal_uInt32 nListCount;
rStream >> nListCount;
for ( USHORT i = 0; i < nListCount; i++ ) {
ByteString* pByteString = new ByteString();
@@ -185,7 +185,7 @@
SByteStringList& SByteStringList::operator>> ( SvStream& rStream )
{
- ULONG nListCount = Count();
+ sal_uInt32 nListCount = Count();
rStream << nListCount;
ByteString* pByteString = First();
while (pByteString) {

12
editors/openoffice.org-vcltesttool/Makefile
View File

@ -13,9 +13,11 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
DISTFILES+= unowinreg.dll:unowinreg
#DISTFILES+= OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
@ -73,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 180
MILESTONE?= 182
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060804
SNAPDATE= 20060818
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -159,8 +161,7 @@ CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
@ -201,6 +202,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif

9
editors/openoffice.org-vcltesttool/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950
SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d
SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

24
editors/openoffice.org-vcltesttool/files/patch-i67891
View File

@ -1,24 +0,0 @@
Index: cli_ure/version/makefile.mk
===================================================================
RCS file: /cvs/udk/cli_ure/version/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- cli_ure/version/makefile.mk 25 Jul 2006 07:55:26 -0000 1.3
+++ cli_ure/version/makefile.mk 29 Jul 2006 12:02:00 -0000
@@ -52,8 +52,6 @@
ECHOQUOTE=
.ENDIF
-.IF "$(BUILD_FOR_CLI)" != ""
-
ALLTAR : \
$(BIN)$/cliureversion.mk
@@ -69,7 +67,3 @@
#INCVERSION .PHONY: version.txt incversions.txt
# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.END
-
-

25
editors/openoffice.org-vcltesttool/files/patch-i68110
View File

@ -1,25 +0,0 @@
Index: tools/bootstrp/sstring.cxx
===================================================================
RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
retrieving revision 1.6
diff -u -r1.6 sstring.cxx
--- tools/bootstrp/sstring.cxx 2 Aug 2006 12:10:04 -0000 1.6
+++ tools/bootstrp/sstring.cxx 10 Aug 2006 08:50:06 -0000
@@ -173,7 +173,7 @@
SByteStringList& SByteStringList::operator<< ( SvStream& rStream )
{
- ULONG nListCount;
+ sal_uInt32 nListCount;
rStream >> nListCount;
for ( USHORT i = 0; i < nListCount; i++ ) {
ByteString* pByteString = new ByteString();
@@ -185,7 +185,7 @@
SByteStringList& SByteStringList::operator>> ( SvStream& rStream )
{
- ULONG nListCount = Count();
+ sal_uInt32 nListCount = Count();
rStream << nListCount;
ByteString* pByteString = First();
while (pByteString) {