diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 9639e981abab..479f511ad725 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/15 09:10:04 hira Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/15 23:17:29 hira Exp $
 #
 
 OO_VER=			3.0.0
@@ -62,6 +62,8 @@ REPLACE_PERL+=		sd/res/webview/editpic.pl	\
 			sd/res/webview/webview.pl
 REPLACE_PYTHON+=	scripting/source/pyprov/mailmerge.py
 
+# Hard-coded path exists in a tarball.  Cannot use REPLACE_BASH.
+# patch-dl replaces the path to @BASH@.
 SUBST_CLASSES+=		bash
 SUBST_STAGE.bash=	post-patch
 SUBST_MESSAGE.bash=	Fix hard-coded path
@@ -73,9 +75,10 @@ SUBST_STAGE.lib=	post-patch
 SUBST_MESSAGE.lib=	Adding library paths
 SUBST_FILES.lib=	solenv/inc/pkgsrc.mk
 .for pkg in db4 expat jpeg zlib
-SUBST_SED.lib+=		-e 's,@BLNK_PREFIX_${pkg}@,${BUILDLINK_PREFIX.${pkg}},g'
-LIBS+=			-L${BUILDLINK_PREFIX.${pkg}}/lib
-LIBS+=			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
+LIB.${pkg}=		-L${BUILDLINK_PREFIX.${pkg}}/lib
+LIB.${pkg}+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
+SUBST_SED.lib+=		-e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
+LIBS+=			${LIB.${pkg}}
 .endfor
 
 CONFIGURE_ENV+=		LIBS=${LIBS:O:u:Q}
@@ -94,7 +97,7 @@ CONFIGURE_ARGS+=	--with-system-db
 CONFIGURE_ARGS+=	--with-system-expat
 CONFIGURE_ARGS+=	--with-system-freetype
 CONFIGURE_ARGS+=	--with-system-jpeg
-CONFIGURE_ARGS+=	--with-system-libxml2
+CONFIGURE_ARGS+=	--with-system-libxml
 CONFIGURE_ARGS+=	--with-system-libxslt
 CONFIGURE_ARGS+=	--with-system-neon
 CONFIGURE_ARGS+=	--with-system-python
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 564b06d3c7f0..5b783023b870 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+$NetBSD: distinfo,v 1.2 2008/10/15 23:17:29 hira Exp $
 
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
@@ -6,9 +6,6 @@ Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d
 Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes
-SHA1 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 1632374bf75eb6080c0d36e88fd981529be17a0f
-RMD160 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = a19bdd687abc7829de937b46e4e484a4b27f045b
-Size (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 13941316 bytes
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13
 Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes
@@ -75,7 +72,7 @@ SHA1 (patch-dl) = 100063c6239efddbc9b7bb994e607d2ea314844e
 SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e
 SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b
 SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75
-SHA1 (patch-du) = 3b806b2fec5af0e10753d52017224356651262f6
+SHA1 (patch-du) = b0c573d0721b050ccf10472ad2c360a3231a5ad5
 SHA1 (patch-dw) = de171dec68a1a55a47f2652ecdad429020d773ef
 SHA1 (patch-dx) = 7579b1f7326951c57bd2ff597209c17d5d54f28d
 SHA1 (patch-dy) = 1feec77ce8c87fc1afb797401047669b3da41c54
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index 6cd2bec5525a..1baa901c8e34 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+# $NetBSD: options.mk,v 1.2 2008/10/15 23:17:29 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 java kde ooo-external-libwpd
@@ -90,7 +90,8 @@ CONFIGURE_ENV+=		JAVACMD="${PKG_JAVA_HOME}/bin/java"
 MAKE_ENV+=		JAVACMD="${PKG_JAVA_HOME}/bin/java"
 
 # XXX
-RFLAG_AWTLIB=		-L${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} -Wl,-R${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
+LIB.awtlib=	-L${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
+LIB.awtlib+=	${COMPILER_RPATH_FLAG}${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
 
 .include "../../mk/java-env.mk"
 .include "../../mk/java-vm.mk"
@@ -98,7 +99,7 @@ RFLAG_AWTLIB=		-L${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} -Wl,-R${PKG_JAVA_HOME}
 CONFIGURE_ARGS+=	--without-java
 PKG_JAVA_HOME=
 JAVA_XAWT_DIR=
-RFLAG_AWTLIB=
+LIB.awtlib=
 .endif
 
 SUBST_CLASSES+=		java
@@ -109,7 +110,7 @@ SUBST_FILES.java+=	desktop/scripts/unopkg.sh
 SUBST_FILES.java+=	padmin/source/spadmin.sh
 SUBST_SED.java+=	-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
 SUBST_SED.java+=	-e 's,@JAVA_XAWT_DIR@,${JAVA_XAWT_DIR},g'
-SUBST_SED.lib+=		-e 's|@RFLAG_AWTLIB@|${RFLAG_AWTLIB}|g'
+SUBST_SED.lib+=		-e 's|@LIB_awtlib@|${LIB.awtlib}|g'
 
 .if !empty(PKG_OPTIONS:Mkde)
 CONFIGURE_ENV+=		KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q}
diff --git a/misc/openoffice3/patches/patch-du b/misc/openoffice3/patches/patch-du
index 60ab5b18fd30..428d49adbe2a 100644
--- a/misc/openoffice3/patches/patch-du
+++ b/misc/openoffice3/patches/patch-du
@@ -1,23 +1,23 @@
-$NetBSD: patch-du,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $
+$NetBSD: patch-du,v 1.2 2008/10/15 23:17:29 hira Exp $
 
 --- solenv/inc/pkgsrc.mk.orig	2008-08-28 19:43:59.000000000 +0900
-+++ solenv/inc/pkgsrc.mk	2008-08-28 19:44:28.000000000 +0900
++++ solenv/inc/pkgsrc.mk	2008-10-16 02:44:28.000000000 +0900
 @@ -0,0 +1,18 @@
 +#
-+# Override/modify variables for pkgsrc.
++# Settings for pkgsrc.
 +#
 +
-+BERKELEYLIB="-L@BLNK_PREFIX_db4@/lib -Wl,-R@BLNK_PREFIX_db4@/lib -ldb4"
-+BERKELEYCPPLIB="-L@BLNK_PREFIX_db4@/lib -Wl,-R@BLNK_PREFIX_db4@/lib -ldb4_cxx"
++BERKELEYLIB="@LIB_db4@ -ldb4"
++BERKELEYCPPLIB="@LIB_db4@ -ldb4_cxx"
 +
-+EXPAT3RDLIB="-L@BLNK_PREFIX_expat@/lib -Wl,-R@BLNK_PREFIX_expat@/lib -lexpat"
-+EXPATASCII3RDLIB="-L@BLNK_PREFIX_expat@/lib -Wl,-R@BLNK_PREFIX_expat@/lib -lexpat"
++EXPAT3RDLIB="@LIB_expat@ -lexpat"
++EXPATASCII3RDLIB="@LIB_expat@ -lexpat"
 +
-+JPEG3RDLIB="-L@BLNK_PREFIX_jpeg@/lib -Wl,-R@BLNK_PREFIX_jpeg@/lib -ljpeg"
++JPEG3RDLIB="@LIB_jpeg@ -ljpeg"
 +
-+ZLIB3RDLIB="-L@BLNK_PREFIX_zlib@/lib -Wl,-R@BLNK_PREFIX_zlib@/lib -lz"
++ZLIB3RDLIB="@LIB_zlib@ -lz"
 +
-+AWTLIB="@RFLAG_AWTLIB@ -ljawt"
++AWTLIB="@LIB_awtlib@ -ljawt"
 +
 +STDLIBGUIMT+=${X11_LDFLAGS}
 +STDSHLGUIMT+=${X11_LDFLAGS}