diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-02-16 04:24:40 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-02-16 04:24:40 +0000 |
| commit | e1dfbb6fd6ba3ebd2e0f429238f590f8ad365093 (patch) | |
| tree | d37b1087ab79c8c62b53a8a42430ff47bade8f0c /editors/openoffice.org-2-devel | |
| parent | - Update to 14.0.1 (diff) | |
Update to SRC680_m247.
Using MAXPROCESSES instead of NUMOFPROCESSES
which now becomes a wrong name, and MAXMODULES when building.
Notes
Notes:
svn path=/head/; revision=207287
Diffstat (limited to 'editors/openoffice.org-2-devel')
| -rw-r--r-- | editors/openoffice.org-2-devel/Makefile | 15 | ||||
| -rw-r--r-- | editors/openoffice.org-2-devel/distinfo | 6 |
2 files changed, 9 insertions, 12 deletions
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 0cf331395da7..ce410dd4c322 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -71,10 +71,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 246 +MILESTONE?= 247 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20080209 +SNAPDATE= 20080215 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) @@ -139,7 +139,8 @@ WRKSRC?= ${WRKDIR}/${OOOTAG} CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message -NUMOFPROCESSES?= 1 +MAXPROCESSES?= 1 +MAXMODULES?= 1 CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ @@ -198,12 +199,8 @@ pre-configure: do-build: @cd ${WRKSRC} ; ./bootstrap -# PR:84786 #i53289# -.if (${NUMOFPROCESSES}>1) - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" -.else - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" -.endif + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" + .if ${LOCALIZED_LANG} == "all" @${MAKE} languagepack .endif diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 381ae1165f26..a7cfd672d7d6 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m246_source.tar.bz2) = 2645a41b5f74c5543b8045a1969ad47b -SHA256 (openoffice.org2/OOo_SRC680_m246_source.tar.bz2) = 4bbb8e43abd47836ee0dec4f2594f37d733d6852f6660f03cda7bcd1bcca75b1 -SIZE (openoffice.org2/OOo_SRC680_m246_source.tar.bz2) = 299026161 +MD5 (openoffice.org2/OOo_SRC680_m247_source.tar.bz2) = 2091116c2be0f89a9a3739456368f729 +SHA256 (openoffice.org2/OOo_SRC680_m247_source.tar.bz2) = 225aa661b011991f2830956524f172b475d935a11974a19d89ab0cd53d50ff56 +SIZE (openoffice.org2/OOo_SRC680_m247_source.tar.bz2) = 298766589 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 |