17 files changed, 20 insertions, 136 deletions

diff --git a/MOVED b/MOVED
index 73e52cad3d32..d863e40f53f1 100644
--- a/MOVED
+++ b/MOVED
@@ -654,7 +654,15 @@ print/pktrace|print/mftrace|2003-11-05|program renamed
 databases/mysql-jdbc-mm|databases/mysql-connector-java|2003-11-05|renamed
 sysutils/prune|sysutils/fileprune|2003-11-06|renamed because of conflict with graphviz
 graphics/Mesa3|graphics/libglut|2003-11-06|split into graphics/mesagl and graphics/libglut
-japanese/openoffice|japanese/openoffice-1.0|2003-01-07|renamed 
-japanese/openoffice-devel|japanese/openoffice-1.1|2003-01-07|renamed 
-editors/openoffice|editors/openoffice-1.0|2003-01-07|renamed 
-editors/openoffice-devel|editors/openoffice-1.1|2003-01-07|renamed 
+japanese/openoffice|japanese/openoffice-1.0|2003-01-07|renamed
+japanese/openoffice-devel|japanese/openoffice-1.1|2003-01-07|renamed
+editors/openoffice|editors/openoffice-1.0|2003-01-07|renamed
+editors/openoffice-devel|editors/openoffice-1.1|2003-01-07|renamed
+editors/openoffice-ar|editors/openoffice-1.0-ar|2003-01-07|renamed
+editors/openoffice-dk|editors/openoffice-1.0-dk|2003-01-07|renamed
+editors/openoffice-es|editors/openoffice-1.0-es|2003-01-07|renamed
+editors/openoffice-gr|editors/openoffice-1.0-gr|2003-01-07|renamed
+editors/openoffice-it|editors/openoffice-1.0-it|2003-01-07|renamed
+editors/openoffice-nl|editors/openoffice-1.0-nl|2003-01-07|renamed
+editors/openoffice-se|editors/openoffice-1.0-se|2003-01-07|renamed
+editors/openoffice-tr|editors/openoffice-1.0-tr|2003-01-07|renamed
diff --git a/editors/openoffice-1.0-ar/Makefile b/editors/openoffice-1.0-ar/Makefile
index 505fb56d0846..5fea8b7210eb 100644
--- a/editors/openoffice-1.0-ar/Makefile
+++ b/editors/openoffice-1.0-ar/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	editors
 LANG_PKGNAME=	ar
 LANG_EXT=	96
 LANG_CONFIGURE_ARG=	ARAB
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-dk/Makefile b/editors/openoffice-1.0-dk/Makefile
index 979cfc7bfe23..dd4ee908dc31 100644
--- a/editors/openoffice-1.0-dk/Makefile
+++ b/editors/openoffice-1.0-dk/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	editors
 LANG_PKGNAME=	dk
 LANG_EXT=	45
 LANG_CONFIGURE_ARG=	DAN
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-es/Makefile b/editors/openoffice-1.0-es/Makefile
index 89685af41da4..ec48b699bee2 100644
--- a/editors/openoffice-1.0-es/Makefile
+++ b/editors/openoffice-1.0-es/Makefile
@@ -12,6 +12,6 @@ LANG_EXT=	34
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 
 LANG_CONFIGURE_ARG=	SPAN
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-gr/Makefile b/editors/openoffice-1.0-gr/Makefile
index 100cfb744e85..b6450c4d8a6f 100644
--- a/editors/openoffice-1.0-gr/Makefile
+++ b/editors/openoffice-1.0-gr/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	editors
 LANG_PKGNAME=	gr
 LANG_EXT=	30
 LANG_CONFIGURE_ARG=	GREEK
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-it/Makefile b/editors/openoffice-1.0-it/Makefile
index 1ada4e02d4c6..7d56384259ff 100644
--- a/editors/openoffice-1.0-it/Makefile
+++ b/editors/openoffice-1.0-it/Makefile
@@ -11,6 +11,6 @@ LANG_PKGNAME=	it
 LANG_EXT=	39
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	ITAL
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-nl/Makefile b/editors/openoffice-1.0-nl/Makefile
index ffb2bb333844..f232f913d602 100644
--- a/editors/openoffice-1.0-nl/Makefile
+++ b/editors/openoffice-1.0-nl/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	editors
 LANG_PKGNAME=	nl
 LANG_EXT=	31
 LANG_CONFIGURE_ARG=	DTCH
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-se/Makefile b/editors/openoffice-1.0-se/Makefile
index 90143cf8e6bb..cceb3b355408 100644
--- a/editors/openoffice-1.0-se/Makefile
+++ b/editors/openoffice-1.0-se/Makefile
@@ -11,6 +11,6 @@ LANG_PKGNAME=	se
 LANG_EXT=	46
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	SWED
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-1.0-tr/Makefile b/editors/openoffice-1.0-tr/Makefile
index a31fce9bec30..7a60f7253cff 100644
--- a/editors/openoffice-1.0-tr/Makefile
+++ b/editors/openoffice-1.0-tr/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	editors
 LANG_PKGNAME=	tr
 LANG_EXT=	90
 LANG_CONFIGURE_ARG=	TURK
-MASTERDIR=	${.CURDIR}/../openoffice
+MASTERDIR=	${.CURDIR}/../openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-ar/Makefile b/editors/openoffice-ar/Makefile
deleted file mode 100644
index 505fb56d0846..000000000000
--- a/editors/openoffice-ar/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Arabic language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	ar
-LANG_EXT=	96
-LANG_CONFIGURE_ARG=	ARAB
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-dk/Makefile b/editors/openoffice-dk/Makefile
deleted file mode 100644
index 979cfc7bfe23..000000000000
--- a/editors/openoffice-dk/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Danish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	dk
-LANG_EXT=	45
-LANG_CONFIGURE_ARG=	DAN
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-es/Makefile b/editors/openoffice-es/Makefile
deleted file mode 100644
index 89685af41da4..000000000000
--- a/editors/openoffice-es/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Spanish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	es
-LANG_EXT=	34
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-
-LANG_CONFIGURE_ARG=	SPAN
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-gr/Makefile b/editors/openoffice-gr/Makefile
deleted file mode 100644
index 100cfb744e85..000000000000
--- a/editors/openoffice-gr/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Greek language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	gr
-LANG_EXT=	30
-LANG_CONFIGURE_ARG=	GREEK
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-it/Makefile b/editors/openoffice-it/Makefile
deleted file mode 100644
index 1ada4e02d4c6..000000000000
--- a/editors/openoffice-it/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Italian language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	it
-LANG_EXT=	39
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	ITAL
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-nl/Makefile b/editors/openoffice-nl/Makefile
deleted file mode 100644
index ffb2bb333844..000000000000
--- a/editors/openoffice-nl/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Dutch language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	nl
-LANG_EXT=	31
-LANG_CONFIGURE_ARG=	DTCH
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-se/Makefile b/editors/openoffice-se/Makefile
deleted file mode 100644
index 90143cf8e6bb..000000000000
--- a/editors/openoffice-se/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Swedish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	se
-LANG_EXT=	46
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	SWED
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/openoffice-tr/Makefile b/editors/openoffice-tr/Makefile
deleted file mode 100644
index a31fce9bec30..000000000000
--- a/editors/openoffice-tr/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	OpenOffice for Turkish language
-# Date created:		Tue Jun 11 16:47:21 UTC 2002
-# Whom:		Martin Blapp <mbr@FreeBSD.org> and Mario Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	editors
-
-LANG_PKGNAME=	tr
-LANG_EXT=	90
-LANG_CONFIGURE_ARG=	TURK
-MASTERDIR=	${.CURDIR}/../openoffice
-
-.include "${MASTERDIR}/Makefile"