aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-2.0-devel/Makefile18
-rw-r--r--editors/openoffice-2.0-devel/distinfo4
-rw-r--r--editors/openoffice-2.0-devel/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice-3-devel/Makefile18
-rw-r--r--editors/openoffice-3-devel/distinfo4
-rw-r--r--editors/openoffice-3-devel/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice-3/Makefile18
-rw-r--r--editors/openoffice-3/distinfo4
-rw-r--r--editors/openoffice-3/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-2-RC/Makefile18
-rw-r--r--editors/openoffice.org-2-RC/distinfo4
-rw-r--r--editors/openoffice.org-2-RC/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-2-devel/Makefile18
-rw-r--r--editors/openoffice.org-2-devel/distinfo4
-rw-r--r--editors/openoffice.org-2-devel/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-2.0-devel/Makefile18
-rw-r--r--editors/openoffice.org-2.0-devel/distinfo4
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-2.0/Makefile18
-rw-r--r--editors/openoffice.org-2.0/distinfo4
-rw-r--r--editors/openoffice.org-2.0/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-2/Makefile18
-rw-r--r--editors/openoffice.org-2/distinfo4
-rw-r--r--editors/openoffice.org-2/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-3-RC/Makefile18
-rw-r--r--editors/openoffice.org-3-RC/distinfo4
-rw-r--r--editors/openoffice.org-3-RC/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-3-devel/Makefile18
-rw-r--r--editors/openoffice.org-3-devel/distinfo4
-rw-r--r--editors/openoffice.org-3-devel/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-3/Makefile18
-rw-r--r--editors/openoffice.org-3/distinfo4
-rw-r--r--editors/openoffice.org-3/files/patch-chart2+source+controller+makefile.mk18
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile18
-rw-r--r--editors/openoffice.org-vcltesttool/distinfo4
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-chart2+source+controller+makefile.mk18
36 files changed, 336 insertions, 144 deletions
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice-2.0-devel/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice-2.0-devel/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice-3-devel/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice-3-devel/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice-3/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice-3/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice-3/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 602fc43cff10..7e5f4ff46743 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.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-2-RC/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-2-RC/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-2-devel/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-2-devel/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-2.0-devel/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-2.0/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-2.0/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-2/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-2/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-3-RC/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-3-RC/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-3-devel/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-3-devel/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-3/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-3/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 42c087b9906e..0543bc6ab02b 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES+= ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
+DISTFILES+= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
+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= 20050217
+SNAPDATE= 20050223
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20050212.tar.gz
@@ -29,6 +29,7 @@ DISTFILES+= ${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= orbit gtk12
.endif
+USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@@ -48,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 79
+MILESTONE= 80
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -96,14 +97,14 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
+WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
-NUMOFPROCESSES?= 1
+NUMOFPROCESSES?= 4
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch
@@ -138,16 +139,13 @@ post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
-
do-build:
@cd ${WRKSRC} ; ./bootstrap
.if !defined(WITHOUT_MOZILLA)
@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
.endif
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
- @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
+ cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
do-install:
@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 602fc43cff10..7e5f4ff46743 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
-SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
+MD5 (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 3df188c7382ed190fbfc970fe25e0e7d
+SIZE (openoffice.org2.0/OOo_1.9m80_source.tar.bz2) = 241591741
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice.org-vcltesttool/files/patch-chart2+source+controller+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-chart2+source+controller+makefile.mk
new file mode 100644
index 000000000000..2a3920c8f163
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-chart2+source+controller+makefile.mk
@@ -0,0 +1,18 @@
+#iZ 43297
+
+Index: chart2/source/controller/makefile.mk
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- chart2/source/controller/makefile.mk 18 May 2004 18:34:37 -0000 1.5
++++ chart2/source/controller/makefile.mk 23 Feb 2005 10:06:48 -0000
+@@ -143,7 +143,7 @@
+ $(SRS)$/chcdialogs.srs
+
+ RESLIB1NAME= $(TARGET)
+-RESLIB1IMAGES=$(PRJ)$/res
++RESLIB1IMAGES=$(PRJ)$
+ RESLIB1SRSFILES=$(RESLIB1LIST)
+ RESLIB1DEPN=$(RESLIB1LIST)
+