Mozilla 1.01 has not moved to mozilla-vendor port. Fix this,

and remove the pkg_plist reference.

Submitted by:		Marc Williams <mw@uk.yahoo-inc.com>

20 files changed, 120 insertions, 120 deletions

diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index c61755f48146..6c1452be4994 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -357,12 +357,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index c61755f48146..6c1452be4994 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -357,12 +357,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 602d7e42d327..1c285c511f1d 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -360,12 +360,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
 
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index c61755f48146..6c1452be4994 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -357,12 +357,12 @@ extract-mozilla:
 .if ! exists(${WRKDIR}/mozilla/Makefile)
 	@${ECHO_MSG} "===>  Extracting mozilla sub project"
 	@${MKDIR} ${WRKDIR}/mozilla
-	@${CP} -r ${PORTSDIR}/www/mozilla/files ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/Makefile ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/distinfo ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-comment ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-descr ${WRKDIR}/mozilla
-	@${CP} ${PORTSDIR}/www/mozilla/pkg-plist ${WRKDIR}/mozilla
+	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
+	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
 	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""