diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 321c35f2ea95..db4e8444de82 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/641c/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo
index 9686be809969..3fa7a6f46b86 100644
--- a/editors/openoffice-1.0/distinfo
+++ b/editors/openoffice-1.0/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_641d_src.tar.bz2) = 6f72837c9609b17ed7631ab5539259bc
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 321c35f2ea95..db4e8444de82 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/641c/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo
index 9686be809969..3fa7a6f46b86 100644
--- a/editors/openoffice.org-1.0/distinfo
+++ b/editors/openoffice.org-1.0/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_641d_src.tar.bz2) = 6f72837c9609b17ed7631ab5539259bc
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index e32897f77025..23c5cd913554 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 6c0c7fa9e172..81e3a3a4781e 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 321c35f2ea95..db4e8444de82 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
 		http://sf1.mirror.openoffice.org/641c/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
-DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_REST=	gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo
index 9686be809969..3fa7a6f46b86 100644
--- a/editors/openoffice/distinfo
+++ b/editors/openoffice/distinfo
@@ -1,3 +1,3 @@
 MD5 (oo_641d_src.tar.bz2) = 6f72837c9609b17ed7631ab5539259bc
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
+MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0