- Use security/openssl, textproc/hunspell and textproc/icu.

 - Add missing -Wl to patch-ch and patch-cs.
 - Correct flag for disabling optimizations.

Bump PKGREVISION.

7 files changed, 53 insertions, 48 deletions

diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 479f511ad72..c99357ab086 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/10/15 23:17:29 hira Exp $
+# $NetBSD: Makefile,v 1.4 2008/10/16 23:16:46 hira Exp $
 #
 
 OO_VER=			3.0.0
+PKG_REVISION=		1
 OO_TAG=			OOO300_m9
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice3-${OO_VER}
@@ -62,19 +63,11 @@ 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
-SUBST_FILES.bash=	hunspell/hunspell-1.1.12.patch
-SUBST_SED.bash+=	-e 's,@BASH@,${BASH},g'
-
 SUBST_CLASSES+=		lib
 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
+.for pkg in db4 expat icu jpeg zlib
 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'
@@ -96,10 +89,13 @@ CONFIGURE_ARGS+=	--with-system-curl
 CONFIGURE_ARGS+=	--with-system-db
 CONFIGURE_ARGS+=	--with-system-expat
 CONFIGURE_ARGS+=	--with-system-freetype
+CONFIGURE_ARGS+=	--with-system-hunspell
+CONFIGURE_ARGS+=	--with-system-icu
 CONFIGURE_ARGS+=	--with-system-jpeg
 CONFIGURE_ARGS+=	--with-system-libxml
 CONFIGURE_ARGS+=	--with-system-libxslt
 CONFIGURE_ARGS+=	--with-system-neon
+CONFIGURE_ARGS+=	--with-system-openssl
 CONFIGURE_ARGS+=	--with-system-python
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-dynamic-xinerama
@@ -205,7 +201,10 @@ post-install:
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 5b783023b87..5be11d76099 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2008/10/15 23:17:29 hira Exp $
+$NetBSD: distinfo,v 1.3 2008/10/16 23:16:46 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
@@ -26,7 +26,7 @@ SHA1 (patch-aq) = 651dad01336dce6901f1aacebe438b565a321be0
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 6f6992430e3cea8a914ad3dcbe9ebcdf288ddc2a
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 0b715158cc2e2b80a5cc6e5127a3c2271eabb483
+SHA1 (patch-ba) = c3b27c83c69b515d2774acb88d56370eb263f872
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
 SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
@@ -46,7 +46,7 @@ SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = 0e3af3133273f2d82ad893bf1a165c0897dc0c3d
+SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a
 SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f
@@ -54,7 +54,7 @@ SHA1 (patch-cn) = 12e09dde1e8fd8afaf2f48fd6455625790b9ecc4
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = 10c7021fe46e702338f2f065fd666008a886292b
+SHA1 (patch-cs) = dc9afc7cd55cad8f801cb163d25fe2e1803f889a
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
@@ -68,11 +68,10 @@ SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0
 SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf
 SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7
 SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74
-SHA1 (patch-dl) = 100063c6239efddbc9b7bb994e607d2ea314844e
 SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e
 SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b
 SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75
-SHA1 (patch-du) = b0c573d0721b050ccf10472ad2c360a3231a5ad5
+SHA1 (patch-du) = 85a7ccaffc5165617b031359873727f7a29d1938
 SHA1 (patch-dw) = de171dec68a1a55a47f2652ecdad429020d773ef
 SHA1 (patch-dx) = 7579b1f7326951c57bd2ff597209c17d5d54f28d
 SHA1 (patch-dy) = 1feec77ce8c87fc1afb797401047669b3da41c54
diff --git a/misc/openoffice3/patches/patch-ba b/misc/openoffice3/patches/patch-ba
index 19c5a19d8f7..1a4eeba7792 100644
--- a/misc/openoffice3/patches/patch-ba
+++ b/misc/openoffice3/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+$NetBSD: patch-ba,v 1.2 2008/10/16 23:16:46 hira Exp $
 
 --- config_office/configure.orig	2008-09-01 20:50:01.000000000 +0900
-+++ config_office/configure	2008-10-01 11:42:40.000000000 +0900
++++ config_office/configure	2008-10-16 19:07:22.000000000 +0900
 @@ -4183,11 +4183,11 @@
          test_randr=no
  		_os=OSF1
@@ -121,6 +121,24 @@ $NetBSD: patch-ba,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
          MOZ_FLAVOUR="mozilla"
      fi
  
+@@ -21084,7 +21087,7 @@
+     NEON_CFLAGS=
+     BUILD_TYPE="$BUILD_TYPE NEON"
+ fi
+-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
++if test "$_os" = "Darwin" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
+    with_system_openssl=yes
+ fi
+ { echo "$as_me:$LINENO: checking which libssl to use" >&5
+@@ -21095,7 +21098,7 @@
+ echo "${ECHO_T}external" >&6; }
+     # Mac OS builds should get out without extra stuff is the Mac porters'
+     # wish. And pkg-config is although Xcode ships a .pc for openssl
+-    if test "$_os" = "Darwin"; then
++    if test "$_os" = "Darwin" -o "$_os" = "NetBSD" ; then
+         OPENSSL_CFLAGS=
+         OPENSSL_LIBS="-lssl -lcrypto"
+     else
 @@ -25060,7 +25063,7 @@
    ENABLE_MEDIAWIKI=YES
    { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
diff --git a/misc/openoffice3/patches/patch-ch b/misc/openoffice3/patches/patch-ch
index 81309b5aa7e..4ec30f1c0a6 100644
--- a/misc/openoffice3/patches/patch-ch
+++ b/misc/openoffice3/patches/patch-ch
@@ -1,7 +1,7 @@
-$NetBSD: patch-ch,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+$NetBSD: patch-ch,v 1.2 2008/10/16 23:16:46 hira Exp $
 
 --- solenv/inc/unxbsdi3.mk.orig	2007-10-05 10:11:25.000000000 +0900
-+++ solenv/inc/unxbsdi3.mk	2007-10-05 10:14:03.000000000 +0900
++++ solenv/inc/unxbsdi3.mk	2008-10-16 19:14:03.000000000 +0900
 @@ -0,0 +1,178 @@
 +#
 +# mk file for NetBSD/i386 with gcc 3.4.x and higher.
@@ -91,7 +91,7 @@ $NetBSD: patch-ch,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
 +# reduce to -O1 to avoid optimization problems
 +CFLAGSOPT=-O1
 +# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O
++CFLAGSNOOPT=-O0
 +# Compiler flags for describing the output path
 +CFLAGSOUTOBJ=-o
 +
@@ -111,9 +111,9 @@ $NetBSD: patch-ch,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
 +LINKC*=$(CC)
 +
 +# default linker flags
-+LINKFLAGSDEFS*=-z defs
++LINKFLAGSDEFS*=-Wl,-z,defs
 +LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
 +
 +# linker flags for linking applications
 +LINKFLAGSAPPGUI= -Wl,-export-dynamic 
diff --git a/misc/openoffice3/patches/patch-cs b/misc/openoffice3/patches/patch-cs
index 3683acf40e3..60986df1378 100644
--- a/misc/openoffice3/patches/patch-cs
+++ b/misc/openoffice3/patches/patch-cs
@@ -1,7 +1,7 @@
-$NetBSD: patch-cs,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
+$NetBSD: patch-cs,v 1.2 2008/10/16 23:16:46 hira Exp $
 
 --- solenv/inc/unxbsdx3.mk.orig	2007-10-13 00:24:19.000000000 +0900
-+++ solenv/inc/unxbsdx3.mk	2007-10-13 00:28:56.000000000 +0900
++++ solenv/inc/unxbsdx3.mk	2008-10-16 19:28:56.000000000 +0900
 @@ -0,0 +1,178 @@
 +#
 +# mk file for NetBSD/amd64 with gcc 3.4.x and higher.
@@ -91,7 +91,7 @@ $NetBSD: patch-cs,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
 +# reduce to -O1 to avoid optimization problems
 +CFLAGSOPT=-O1
 +# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O
++CFLAGSNOOPT=-O0
 +# Compiler flags for describing the output path
 +CFLAGSOUTOBJ=-o
 +
@@ -111,9 +111,9 @@ $NetBSD: patch-cs,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $
 +LINKC*=$(CC)
 +
 +# default linker flags
-+LINKFLAGSDEFS*=-z defs
++LINKFLAGSDEFS*=-Wl,-z,defs
 +LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
 +
 +# linker flags for linking applications
 +LINKFLAGSAPPGUI= -Wl,-export-dynamic 
diff --git a/misc/openoffice3/patches/patch-dl b/misc/openoffice3/patches/patch-dl
deleted file mode 100644
index 57e711b9250..00000000000
--- a/misc/openoffice3/patches/patch-dl
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-dl,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $
-
---- hunspell/hunspell-1.1.12.patch.orig	2008-06-27 18:06:37.000000000 +0900
-+++ hunspell/hunspell-1.1.12.patch	2008-06-27 18:07:11.000000000 +0900
-@@ -450,3 +450,11 @@
-  i68568utf.test \
-  1706659.test \
-  digits_in_words.test \
-+--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-06-27 18:05:30.000000000 +0900
-+@@ -1,4 +1,4 @@
-+-#!/bin/bash
-++#!@BASH@
-+ export LC_ALL="C"
-+ 
-+ function check_valgrind_log () {
diff --git a/misc/openoffice3/patches/patch-du b/misc/openoffice3/patches/patch-du
index 428d49adbe2..a881c03880a 100644
--- a/misc/openoffice3/patches/patch-du
+++ b/misc/openoffice3/patches/patch-du
@@ -1,8 +1,8 @@
-$NetBSD: patch-du,v 1.2 2008/10/15 23:17:29 hira Exp $
+$NetBSD: patch-du,v 1.3 2008/10/16 23:16:47 hira Exp $
 
---- solenv/inc/pkgsrc.mk.orig	2008-08-28 19:43:59.000000000 +0900
-+++ solenv/inc/pkgsrc.mk	2008-10-16 02:44:28.000000000 +0900
-@@ -0,0 +1,18 @@
+--- solenv/inc/pkgsrc.mk.orig	2008-10-16 18:30:22.000000000 +0900
++++ solenv/inc/pkgsrc.mk	2008-10-16 18:32:40.000000000 +0900
+@@ -0,0 +1,23 @@
 +#
 +# Settings for pkgsrc.
 +#
@@ -13,6 +13,11 @@ $NetBSD: patch-du,v 1.2 2008/10/15 23:17:29 hira Exp $
 +EXPAT3RDLIB="@LIB_expat@ -lexpat"
 +EXPATASCII3RDLIB="@LIB_expat@ -lexpat"
 +
++ICUINLIB="@LIB_icu@ -licui18n"
++ICULELIB="@LIB_icu@ -licule"
++ICUUCLIB="@LIB_icu@ -licuuc"
++ICUDATALIB="@LIB_icu@ -licudata"
++
 +JPEG3RDLIB="@LIB_jpeg@ -ljpeg"
 +
 +ZLIB3RDLIB="@LIB_zlib@ -lz"