summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/openoffice-3-devel/Makefile10
-rw-r--r--editors/openoffice-3-devel/distinfo6
-rw-r--r--editors/openoffice-3-devel/files/patch-i1000013
-rw-r--r--editors/openoffice.org-3-devel/Makefile10
-rw-r--r--editors/openoffice.org-3-devel/distinfo6
-rw-r--r--editors/openoffice.org-3-devel/files/patch-i1000013
6 files changed, 48 insertions, 10 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index c0d18c2deaaa..f52a69cea2db 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -10,6 +10,7 @@ PORTVERSION= 3.4.${SNAPDATE}
CATEGORIES= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \
+ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:l10nsdf \
http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
DISTFILES+= ${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
@@ -23,7 +24,7 @@ CONFLICTS= cppunit*
EXTRATC_ONLY?= ${OOOSRC} ${OOOEXTSRC}
-OOOEXTSRC= ext_sources.20110331.tar.bz2:extsrc
+OOOEXTSRC= ext_sources.20110331.tar.bz2:extsrc l10n.20110611.tar.bz2:l10nsdf
.if defined(CWS)
PORTNAME:= openoffice.org-${CWS}
@@ -75,12 +76,12 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh
FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
.endif
-MILESTONE?= 100
+MILESTONE?= 101
OOOTAG?= DEV300_m${MILESTONE}
OOOTAG2= ${OOOTAG:C/_//g}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
-SNAPDATE= 20110219
+SNAPDATE= 20110220
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org3
@@ -199,6 +200,9 @@ pre-configure:
.endif
do-build:
+ @cd ${WRKDIR} ; ${PRINTF} "[repositories]\n" > source_config
+ @cd ${WRKDIR} ; ${PRINTF} "${OOOTAG}=active\n" >> source_config
+ @cd ${WRKDIR} ; ${PRINTF} "l10n=active\n" >> source_config
@cd ${WRKSRC} ; ./bootstrap
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "LIBINTL_PREFIX=${PREFIX}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; ../solenv/bin/build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index b176cce88988..e279dd354f10 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,8 @@
-SHA256 (openoffice.org3/OOo_DEV300_m100_source.tar.bz2) = 71cf7b659492002c882e63fc3b68d2bfbf4cfa090e54e1e4aed46bd80ce53949
-SIZE (openoffice.org3/OOo_DEV300_m100_source.tar.bz2) = 310357961
+SHA256 (openoffice.org3/OOo_DEV300_m101_source.tar.bz2) = 994a2685943496df5a4a83e0a12d29869b45dbded92db13ed7511456a181b6af
+SIZE (openoffice.org3/OOo_DEV300_m101_source.tar.bz2) = 227915224
SHA256 (openoffice.org3/ext_sources.20110331.tar.bz2) = 0ffa08f29a13a3d7e9bdcc8feb120b31398c46de4a1ba2be6665258f5caeeac3
SIZE (openoffice.org3/ext_sources.20110331.tar.bz2) = 260892348
+SHA256 (openoffice.org3/l10n.20110611.tar.bz2) = 4bcbe042fd41f532e2a14f65b27d691af8d66eb402942319090747cfbc526297
+SIZE (openoffice.org3/l10n.20110611.tar.bz2) = 78999157
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i10000 b/editors/openoffice-3-devel/files/patch-i10000
new file mode 100644
index 000000000000..8a48c1641dea
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i10000
@@ -0,0 +1,13 @@
+http://hg.services.openoffice.org/DEV300/rev/a22158b47c13
+http://www.mail-archive.com/dev@openoffice.org/msg15401.html
+
+--- set_soenv.in 2011-03-28 20:50:13.000000000 +0900
++++ set_soenv.in 2011-06-12 16:32:09.000000000 +0900
+@@ -1497,6 +1497,7 @@
+ #
+ print "done\n";
+ $gb_REPOS = $SRC_ROOT;
++my $BUILD_TYPE = "@BUILD_TYPE@";
+
+ if ('@WITH_LANG@' ne "")
+ {
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index c0d18c2deaaa..f52a69cea2db 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -10,6 +10,7 @@ PORTVERSION= 3.4.${SNAPDATE}
CATEGORIES= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \
+ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:l10nsdf \
http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
DISTFILES+= ${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
@@ -23,7 +24,7 @@ CONFLICTS= cppunit*
EXTRATC_ONLY?= ${OOOSRC} ${OOOEXTSRC}
-OOOEXTSRC= ext_sources.20110331.tar.bz2:extsrc
+OOOEXTSRC= ext_sources.20110331.tar.bz2:extsrc l10n.20110611.tar.bz2:l10nsdf
.if defined(CWS)
PORTNAME:= openoffice.org-${CWS}
@@ -75,12 +76,12 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh
FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
.endif
-MILESTONE?= 100
+MILESTONE?= 101
OOOTAG?= DEV300_m${MILESTONE}
OOOTAG2= ${OOOTAG:C/_//g}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
-SNAPDATE= 20110219
+SNAPDATE= 20110220
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org3
@@ -199,6 +200,9 @@ pre-configure:
.endif
do-build:
+ @cd ${WRKDIR} ; ${PRINTF} "[repositories]\n" > source_config
+ @cd ${WRKDIR} ; ${PRINTF} "${OOOTAG}=active\n" >> source_config
+ @cd ${WRKDIR} ; ${PRINTF} "l10n=active\n" >> source_config
@cd ${WRKSRC} ; ./bootstrap
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "LIBINTL_PREFIX=${PREFIX}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; ../solenv/bin/build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index b176cce88988..e279dd354f10 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,8 @@
-SHA256 (openoffice.org3/OOo_DEV300_m100_source.tar.bz2) = 71cf7b659492002c882e63fc3b68d2bfbf4cfa090e54e1e4aed46bd80ce53949
-SIZE (openoffice.org3/OOo_DEV300_m100_source.tar.bz2) = 310357961
+SHA256 (openoffice.org3/OOo_DEV300_m101_source.tar.bz2) = 994a2685943496df5a4a83e0a12d29869b45dbded92db13ed7511456a181b6af
+SIZE (openoffice.org3/OOo_DEV300_m101_source.tar.bz2) = 227915224
SHA256 (openoffice.org3/ext_sources.20110331.tar.bz2) = 0ffa08f29a13a3d7e9bdcc8feb120b31398c46de4a1ba2be6665258f5caeeac3
SIZE (openoffice.org3/ext_sources.20110331.tar.bz2) = 260892348
+SHA256 (openoffice.org3/l10n.20110611.tar.bz2) = 4bcbe042fd41f532e2a14f65b27d691af8d66eb402942319090747cfbc526297
+SIZE (openoffice.org3/l10n.20110611.tar.bz2) = 78999157
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i10000 b/editors/openoffice.org-3-devel/files/patch-i10000
new file mode 100644
index 000000000000..8a48c1641dea
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i10000
@@ -0,0 +1,13 @@
+http://hg.services.openoffice.org/DEV300/rev/a22158b47c13
+http://www.mail-archive.com/dev@openoffice.org/msg15401.html
+
+--- set_soenv.in 2011-03-28 20:50:13.000000000 +0900
++++ set_soenv.in 2011-06-12 16:32:09.000000000 +0900
+@@ -1497,6 +1497,7 @@
+ #
+ print "done\n";
+ $gb_REPOS = $SRC_ROOT;
++my $BUILD_TYPE = "@BUILD_TYPE@";
+
+ if ('@WITH_LANG@' ne "")
+ {