[pkgsrc/trunk]: pkgsrc/misc/openoffice3 - Fix build with USE_BUILTIN.openssl=no.

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9810264d272f
branches:  trunk
changeset: 549315:9810264d272f
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri Oct 31 09:40:58 2008 +0000

description:
- Fix build with USE_BUILTIN.openssl=no.
 - Fix configure with builtin openssl on FreeBSD.

diffstat:

 misc/openoffice3/Makefile         |  3 ++-
 misc/openoffice3/distinfo         |  4 ++--
 misc/openoffice3/patches/patch-ba |  8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r 42052ce12543 -r 9810264d272f misc/openoffice3/Makefile
--- a/misc/openoffice3/Makefile Fri Oct 31 02:04:06 2008 +0000
+++ b/misc/openoffice3/Makefile Fri Oct 31 09:40:58 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/10/30 11:30:34 hira Exp $
+# $NetBSD: Makefile,v 1.14 2008/10/31 09:40:58 hira Exp $
 #
 
 OO_VER=                        3.0.0
@@ -82,6 +82,7 @@
 CONFIGURE_ENV+=                ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk
 CONFIGURE_ENV+=                ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode
 CONFIGURE_ENV+=                ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn
+CONFIGURE_ENV+=                USE_BUILTIN_openssl=${USE_BUILTIN.openssl}
 
 CONFIGURE_ARGS+=       --with-use-shell=bash
 CONFIGURE_ARGS+=       --enable-binfilter
diff -r 42052ce12543 -r 9810264d272f misc/openoffice3/distinfo
--- a/misc/openoffice3/distinfo Fri Oct 31 02:04:06 2008 +0000
+++ b/misc/openoffice3/distinfo Fri Oct 31 09:40:58 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/10/30 11:30:34 hira Exp $
+$NetBSD: distinfo,v 1.14 2008/10/31 09:40:58 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
@@ -29,7 +29,7 @@
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 6f6992430e3cea8a914ad3dcbe9ebcdf288ddc2a
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = c3b27c83c69b515d2774acb88d56370eb263f872
+SHA1 (patch-ba) = f7fc5e04a5af2f6ee8bdb4689b8b5b897eb43912
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
 SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
diff -r 42052ce12543 -r 9810264d272f misc/openoffice3/patches/patch-ba
--- a/misc/openoffice3/patches/patch-ba Fri Oct 31 02:04:06 2008 +0000
+++ b/misc/openoffice3/patches/patch-ba Fri Oct 31 09:40:58 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.2 2008/10/16 23:16:46 hira Exp $
+$NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $
 
 --- config_office/configure.orig       2008-09-01 20:50:01.000000000 +0900
-+++ config_office/configure    2008-10-16 19:07:22.000000000 +0900
++++ config_office/configure    2008-10-31 18:07:22.000000000 +0900
 @@ -4183,11 +4183,11 @@
          test_randr=no
                _os=OSF1
@@ -126,7 +126,7 @@
      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
++if test "$USE_BUILTIN_openssl" = "yes" && test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
     with_system_openssl=yes
  fi
  { echo "$as_me:$LINENO: checking which libssl to use" >&5
@@ -135,7 +135,7 @@
      # 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
++    if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
          OPENSSL_CFLAGS=
          OPENSSL_LIBS="-lssl -lcrypto"
      else