- Use hardcoded file list instead of output of ls(1). The output is

   broken on some environment (sorry, I don't know why).
   Reported and tested by wiz@.
 - Use external expat and jpeg.  Requested by wiz@.
 - Add `ooo-external-libwpd' option.  It's disabled by default
   bacause the converters/libwpd depends on some GNOME libraries.

Bump PKGREVISION.

7 files changed, 98 insertions, 9 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index da0b7bbf8fa..3157a29d9b6 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2007/10/12 15:41:43 hira Exp $
+# $NetBSD: Makefile,v 1.27 2007/11/11 03:35:35 hira Exp $
 #
 
 OO_VER=			2.3.0
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
@@ -48,13 +49,28 @@ ONLY_FOR_PLATFORM=	NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64
 
 GNU_CONFIGURE=		yes
+
+SUBST_CLASSES+=		lib
+SUBST_STAGE.lib=	post-patch
+SUBST_MESSAGE.lib=	Adding library paths
+SUBST_FILES.lib=	solenv/inc/libs.mk
+.for pkg in 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
+.endfor
+
+CONFIGURE_ENV+=		LIBS=${LIBS:O:u:Q}
 CONFIGURE_ENV+=		X_LIBS=${X11_LDFLAGS:M*:Q}
+
 CONFIGURE_ARGS+=	--with-use-shell=bash
 CONFIGURE_ARGS+=	--enable-binfilter
 CONFIGURE_ARGS+=	--enable-cairo
 CONFIGURE_ARGS+=	--disable-ldap
 CONFIGURE_ARGS+=	--with-system-stdlibs
+CONFIGURE_ARGS+=	--with-system-expat
 CONFIGURE_ARGS+=	--with-system-freetype
+CONFIGURE_ARGS+=	--with-system-jpeg
 CONFIGURE_ARGS+=	--with-system-libxml2
 CONFIGURE_ARGS+=	--with-system-libxslt
 CONFIGURE_ARGS+=	--with-system-python
@@ -155,6 +171,8 @@ PYTHON_VERSIONS_ACCEPTED=	24 23 22
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/misc/openoffice2/Makefile.NetBSD.i386 b/misc/openoffice2/Makefile.NetBSD.i386
index bd59aa9d3a8..2618e48d15a 100644
--- a/misc/openoffice2/Makefile.NetBSD.i386
+++ b/misc/openoffice2/Makefile.NetBSD.i386
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2007/04/05 23:24:01 hira Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.3 2007/11/11 03:35:35 hira Exp $
 
-OPENOFFICE_DLLSUFFIX=	bi
+#OPENOFFICE_DLLSUFFIX=	bi
 OPENOFFICE_OUTPATH=	unxbsdi3
 OPENOFFICE_SETFILE=	NetBSDX86
diff --git a/misc/openoffice2/Makefile.NetBSD.x86_64 b/misc/openoffice2/Makefile.NetBSD.x86_64
index 5857b6fef99..6adeca56e51 100644
--- a/misc/openoffice2/Makefile.NetBSD.x86_64
+++ b/misc/openoffice2/Makefile.NetBSD.x86_64
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.NetBSD.x86_64,v 1.1 2007/10/12 15:41:43 hira Exp $
+# $NetBSD: Makefile.NetBSD.x86_64,v 1.2 2007/11/11 03:35:35 hira Exp $
 
-OPENOFFICE_DLLSUFFIX=	bx
+#OPENOFFICE_DLLSUFFIX=	bx
 OPENOFFICE_OUTPATH=	unxbsdx3
 OPENOFFICE_SETFILE=	NetBSDX86-64
 
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 7d2e93525fd..2f000c16c66 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2007/10/12 15:41:43 hira Exp $
+$NetBSD: distinfo,v 1.27 2007/11/11 03:35:35 hira Exp $
 
 SHA1 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = a45b356092fc61aba68d0b7536bb3f723cd62937
 RMD160 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = 441a43c2a2d5418c9d3b55a89790f31598000bde
@@ -63,3 +63,5 @@ SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
 SHA1 (patch-ct) = f895442c141fb7cc172adca4903bbf784dbe3594
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
+SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
+SHA1 (patch-cx) = 12bedb293cc3d930fb746884645816648caa2356
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 1ed4cca1669..2f374066a00 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.14 2007/10/08 15:06:07 hira Exp $
+# $NetBSD: options.mk,v 1.15 2007/11/11 03:35:36 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
-PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde
+PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde ooo-external-libwpd
 PKG_OPTIONS_OPTIONAL_GROUPS=	browser
 PKG_OPTIONS_GROUP.browser=	firefox seamonkey # firefox-gtk1 seamonkey-gtk1
-# The list from solenv/inc/postset.mk:completelangiso.
+# The list from completelangiso in solenv/inc/postset.mk.
 OO_SUPPORTED_LANGUAGES=		af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
 				cs cy da de dz el en-GB en-US en-ZA eo es et \
 				eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+=	--with-system-mozilla=firefox
 .elif !empty(PKG_OPTIONS:Mseamonkey)
 CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 .include "../../www/seamonkey/buildlink3.mk"
+# The following browsers do not install *.pc files.
 #.elif !empty(PKG_OPTIONS:Mfirefox-gtk1)
 #CONFIGURE_ARGS+=	--with-system-mozilla=firefox
 #.include "../../www/firefox-gtk1/buildlink3.mk"
@@ -43,6 +44,11 @@ CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 CONFIGURE_ARGS+=	--disable-mozilla
 .endif
 
+.if !empty(PKG_OPTIONS:Mooo-external-libwpd)
+CONFIGURE_ARGS+=	--with-system-libwpd
+.include "../../converters/libwpd/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mcups)
 CONFIGURE_ARGS+=	--enable-cups
 .include "../../print/cups/buildlink3.mk"
diff --git a/misc/openoffice2/patches/patch-cw b/misc/openoffice2/patches/patch-cw
new file mode 100644
index 00000000000..fbb55bf5ff7
--- /dev/null
+++ b/misc/openoffice2/patches/patch-cw
@@ -0,0 +1,32 @@
+$NetBSD: patch-cw,v 1.1 2007/11/11 03:35:36 hira Exp $
+
+--- i18npool/source/collator/makefile.mk.orig	2007-01-26 00:25:50.000000000 +0900
++++ i18npool/source/collator/makefile.mk	2007-11-09 02:40:37.000000000 +0900
+@@ -46,7 +46,26 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
+-tempvar:=$(shell cd data && ls *.txt)
++tempvar= \
++	dz_charset.txt \
++	hu_charset.txt \
++	ja_charset.txt \
++	ja_phonetic_alphanumeric_first.txt \
++	ja_phonetic_alphanumeric_last.txt \
++	km_charset.txt \
++	ko_charset.txt \
++	ku_alphanumeric.txt \
++	ln_charset.txt \
++	ne_charset.txt \
++	vi_charset.txt \
++	zh_TW_charset.txt \
++	zh_TW_radical.txt \
++	zh_TW_stroke.txt \
++	zh_charset.txt \
++	zh_pinyin.txt \
++	zh_radical.txt \
++	zh_stroke.txt \
++	zh_zhuyin.txt
+ LOCAL_RULE_LANGS:=$(uniq $(foreach,i,$(tempvar) $(i:s/-/_/:s/_/ /:1)))
+ rules_dependencies:=$(foreach,i,$(tempvar) data$/$i)
+ 
diff --git a/misc/openoffice2/patches/patch-cx b/misc/openoffice2/patches/patch-cx
new file mode 100644
index 00000000000..faa0bf30986
--- /dev/null
+++ b/misc/openoffice2/patches/patch-cx
@@ -0,0 +1,31 @@
+$NetBSD: patch-cx,v 1.1 2007/11/11 03:35:36 hira Exp $
+
+--- solenv/inc/libs.mk.orig	2007-11-09 05:07:41.000000000 +0900
++++ solenv/inc/libs.mk	2007-11-09 05:19:45.000000000 +0900
+@@ -187,14 +187,14 @@
+ LINGULIB=$(HM2LIBST)
+ LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
+ .IF "$(SYSTEM_EXPAT)"=="YES"
+-EXPAT3RDLIB=-lexpat
+-EXPATASCII3RDLIB=-lexpat
++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"
+ .ELSE
+ EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
+ EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
+ .ENDIF
+ .IF "$(SYSTEM_ZLIB)"=="YES"
+-ZLIB3RDLIB=-lz
++ZLIB3RDLIB="-L@BLNK_PREFIX_zlib@/lib -Wl,-R@BLNK_PREFIX_zlib@/lib -lz"
+ .ELSE
+ ZLIB3RDLIB=-lzlib
+ .ENDIF
+@@ -209,7 +209,7 @@
+ JPEG3RDLIB=/usr/lib/libjpeg.so
+ .ENDIF
+ .ELSE
+-JPEG3RDLIB=-ljpeg
++JPEG3RDLIB="-L@BLNK_PREFIX_jpeg@/lib -Wl,-R@BLNK_PREFIX_jpeg@/lib -ljpeg"
+ .ENDIF
+ .ELSE
+ JPEG3RDLIB=-ljpeglib