3 files changed, 10 insertions, 11 deletions

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 38a93a582feb..0986ac47b8cc 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -17,16 +17,18 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050416
+SNAPDATE=	20050422
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 MOZILLA_VERSION=	1.7.5
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	orbit gtk12
 .endif
 
+.if defined(WITH_KDE)
+USE_KDELIBS_VER=        3
+.endif
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -47,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		94
+MILESTONE=		96
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -81,19 +83,18 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	259
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index d8c2b2465131..623a7f5eab8b 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m94_source.tar.bz2) = 0f8388f1a90b2e0402b2bc8d8e625c34
-SIZE (openoffice.org2.0/OOo_1.9m94_source.tar.bz2) = 250100722
+MD5 (openoffice.org2.0/OOo_1.9m96_source.tar.bz2) = 0785d50a3e121ee465b58af36146ac43
+SIZE (openoffice.org2.0/OOo_1.9m96_source.tar.bz2) = 249553902
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index aa4b7dcf9104..e27c8d6c5e87 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -9,9 +9,7 @@ CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 
 .if defined(WITH_KDE)
-BUILD_DEPENDS=  qmake:${PORTSDIR}/devel/qmake
-USE_QT_VER=	3
-CONFIGURE_ARGS+=	--enable-kde
+CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
 .if defined(WITH_CUPS)