diff options
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 6 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-i10000 | 11 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i10000 | 11 |
6 files changed, 12 insertions, 34 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 4157dbd7c4bf..504a3aef9820 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -85,11 +85,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif -MILESTONE?= 77 +MILESTONE?= 78 OOOTAG?= DEV300_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20100424 +SNAPDATE= 20100522 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org3 @@ -169,7 +169,7 @@ OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt -OOOEXTENSIONS+= oracle-report-builder.oxt +OOOEXTENSIONS+= report-builder.oxt .if (${OSVERSION} <= 602102) EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index fdc61a7c116e..a8d71267588d 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = 6a6d7490a08e15249bb421425e12e0db -SHA256 (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = a9b0609d890603feab6acf1b8059beeb11a0fc508ee0aa5f70e21c026624b8ad -SIZE (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = 306196948 +MD5 (openoffice.org3/OOo_DEV300_m78_source.tar.bz2) = 8ec5fbf5a511c9b61665e146f96f5a6e +SHA256 (openoffice.org3/OOo_DEV300_m78_source.tar.bz2) = 9e6af939dcc6880f903ce54580f6ace2fa329f01a15ba641f01b87fbcccf15a3 +SIZE (openoffice.org3/OOo_DEV300_m78_source.tar.bz2) = 309365323 MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41 SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823 diff --git a/editors/openoffice-3-devel/files/patch-i10000 b/editors/openoffice-3-devel/files/patch-i10000 deleted file mode 100644 index 4316844fbd72..000000000000 --- a/editors/openoffice-3-devel/files/patch-i10000 +++ /dev/null @@ -1,11 +0,0 @@ ---- postprocess/checkdeliver/checkdeliver.pl~ 2010-04-29 13:18:38.000000000 +0900 -+++ postprocess/checkdeliver/checkdeliver.pl 2010-05-07 09:19:07.000000000 +0900 -@@ -48,7 +48,7 @@ - my $platform = ''; - my $milestoneext = ''; - my $local_env = 0; --my $source_config = SourceConfig -> new(); -+my $source_config = SourceConfig -> new($ENV{SOLARSRC}); - my @exceptionmodlist = ( - "postprocess", - "instset.*native", diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 4157dbd7c4bf..504a3aef9820 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -85,11 +85,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif -MILESTONE?= 77 +MILESTONE?= 78 OOOTAG?= DEV300_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20100424 +SNAPDATE= 20100522 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org3 @@ -169,7 +169,7 @@ OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt -OOOEXTENSIONS+= oracle-report-builder.oxt +OOOEXTENSIONS+= report-builder.oxt .if (${OSVERSION} <= 602102) EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index fdc61a7c116e..a8d71267588d 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = 6a6d7490a08e15249bb421425e12e0db -SHA256 (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = a9b0609d890603feab6acf1b8059beeb11a0fc508ee0aa5f70e21c026624b8ad -SIZE (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = 306196948 +MD5 (openoffice.org3/OOo_DEV300_m78_source.tar.bz2) = 8ec5fbf5a511c9b61665e146f96f5a6e +SHA256 (openoffice.org3/OOo_DEV300_m78_source.tar.bz2) = 9e6af939dcc6880f903ce54580f6ace2fa329f01a15ba641f01b87fbcccf15a3 +SIZE (openoffice.org3/OOo_DEV300_m78_source.tar.bz2) = 309365323 MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41 SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823 diff --git a/editors/openoffice.org-3-devel/files/patch-i10000 b/editors/openoffice.org-3-devel/files/patch-i10000 deleted file mode 100644 index 4316844fbd72..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-i10000 +++ /dev/null @@ -1,11 +0,0 @@ ---- postprocess/checkdeliver/checkdeliver.pl~ 2010-04-29 13:18:38.000000000 +0900 -+++ postprocess/checkdeliver/checkdeliver.pl 2010-05-07 09:19:07.000000000 +0900 -@@ -48,7 +48,7 @@ - my $platform = ''; - my $milestoneext = ''; - my $local_env = 0; --my $source_config = SourceConfig -> new(); -+my $source_config = SourceConfig -> new($ENV{SOLARSRC}); - my @exceptionmodlist = ( - "postprocess", - "instset.*native", |