Localized helpcontents have been changed from 1.0 to 1.1, and

unfortunately, both helpcontents have same names and located
at different place. there's (AFAIK) no way to make one more deeper
subdirectory at DISTDIR, so I splitted /usr/ports/distfiles/openoffice to
/usr/ports/distfiles/openoffice1.0, /usr/ports/distfiles/openoffice1.1.

40 files changed, 277 insertions, 226 deletions

diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 935ee4c1cce1..5030fbc39998 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES+=	http://openofficeorg.secsup.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
+		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
 DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
@@ -41,7 +41,7 @@ PASTE?= /usr/bin/paste
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
 BUILD_NR=		641
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.0
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo
index d2c67938b8f2..e86028bf4bad 100644
--- a/editors/openoffice-1.0/distinfo
+++ b/editors/openoffice-1.0/distinfo
@@ -1,11 +1,11 @@
-MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
-MD5 (openoffice/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14
+MD5 (openoffice1.0/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
+MD5 (openoffice1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
+MD5 (openoffice1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
+MD5 (openoffice1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
+MD5 (openoffice1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
+MD5 (openoffice1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
+MD5 (openoffice1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.0/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 935ee4c1cce1..5030fbc39998 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES+=	http://openofficeorg.secsup.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
+		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
 DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
@@ -41,7 +41,7 @@ PASTE?= /usr/bin/paste
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
 BUILD_NR=		641
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.0
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo
index d2c67938b8f2..e86028bf4bad 100644
--- a/editors/openoffice.org-1.0/distinfo
+++ b/editors/openoffice.org-1.0/distinfo
@@ -1,11 +1,11 @@
-MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
-MD5 (openoffice/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14
+MD5 (openoffice1.0/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
+MD5 (openoffice1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
+MD5 (openoffice1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
+MD5 (openoffice1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
+MD5 (openoffice1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
+MD5 (openoffice1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
+MD5 (openoffice1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.0/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 8fb4b9c39013..e8541d907654 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -39,7 +39,7 @@ BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 9b421203c95c..76db4e5dca0d 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,10 +1,13 @@
-MD5 (openoffice/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.1/OOo_1.1rc5_source.tar.bz2) = 9d61587e809cfe18d5ad573959b37fcc
+MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
+MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
+MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
+MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
+MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
+MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
+MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
+MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
+MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 935ee4c1cce1..5030fbc39998 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES+=	http://openofficeorg.secsup.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
 		ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
+		ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \
 		http://people.freebsd.org/~mbr/ooo/:moz
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}
 DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
@@ -41,7 +41,7 @@ PASTE?= /usr/bin/paste
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
 BUILD_NR=		641
-DIST_SUBDIR=		openoffice
+DIST_SUBDIR=		openoffice1.0
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo
index d2c67938b8f2..e86028bf4bad 100644
--- a/editors/openoffice/distinfo
+++ b/editors/openoffice/distinfo
@@ -1,11 +1,11 @@
-MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
-MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (openoffice/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
-MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
-MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
-MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
-MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
-MD5 (openoffice/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
-MD5 (openoffice/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
-MD5 (openoffice/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
-MD5 (openoffice/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14
+MD5 (openoffice1.0/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
+MD5 (openoffice1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+MD5 (openoffice1.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
+MD5 (openoffice1.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
+MD5 (openoffice1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
+MD5 (openoffice1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
+MD5 (openoffice1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
+MD5 (openoffice1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
+MD5 (openoffice1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
+MD5 (openoffice1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
+MD5 (openoffice1.0/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14