diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index ebd4f92ae8e8..0af457eb28c2 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -7,33 +7,34 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	641c
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 MASTER_SITES=	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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index ebd4f92ae8e8..0af457eb28c2 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -7,33 +7,34 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	641c
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 MASTER_SITES=	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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 92cda4c84e7e..0d27392347bc 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,34 +7,36 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	642
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index ebd4f92ae8e8..0af457eb28c2 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -7,33 +7,34 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	641c
-CATEGORIES=	editors x11
+CATEGORIES=	editors
 MASTER_SITES=	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
 EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
-EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+LIB_DEPENDS+=	pth.14:${PORTSDIR}/devel/pth
+
 BROKEN=		'Work in progress -- does not build yet till the end'
 
-USE_BZIP2= yes
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_BISON=	yes
+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
 
 GCC_VERSION!=	${CC} --version
 JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
-
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office