Link to dynamic Xinerama library instead of static one. This fixes

build problem on NetBSD/amd64.  Problem reported by darcy@.

3 files changed, 21 insertions, 11 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 21c22dc245d..d832e3ee4ad 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/12/18 22:24:29 hira Exp $
+# $NetBSD: Makefile,v 1.32 2007/12/24 02:07:10 hira Exp $
 #
 
 OO_VER=			2.3.1
@@ -79,6 +79,7 @@ CONFIGURE_ARGS+=	--with-system-libxslt
 CONFIGURE_ARGS+=	--with-system-neon
 CONFIGURE_ARGS+=	--with-system-python
 CONFIGURE_ARGS+=	--with-system-zlib
+CONFIGURE_ARGS+=	--with-dynamic-xinerama
 
 # `portable' supports all platforms.
 CONFIGURE_ARGS+=	--enable-epm --with-package-format=portable
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 544a1057b35..5ef8c112d8f 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2007/12/12 10:07:55 hira Exp $
+$NetBSD: distinfo,v 1.31 2007/12/24 02:07:10 hira Exp $
 
 SHA1 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 0643c52da3850a164928342e7651897b7a76ca1f
 RMD160 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 497aec1de49ea941ab8305331a9fc9e8e04a5162
@@ -29,7 +29,7 @@ SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 5d282799df910ed8cb91e8d8f077f89955654018
+SHA1 (patch-ba) = e1cc1c4dd80c3151c9f43d1030d89404f0537b47
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index a8bd0d53bf5..df8e1ad511f 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
+$NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
 
---- config_office/configure.orig	2007-08-24 21:31:18.000000000 +0900
-+++ config_office/configure	2007-11-13 10:30:55.000000000 +0900
+--- config_office/configure.orig	2007-11-02 17:30:08.000000000 +0900
++++ config_office/configure	2007-12-24 09:04:32.000000000 +0900
 @@ -3010,11 +3010,11 @@
  		test_cups=no
  		_os=OSF1
@@ -59,7 +59,7 @@ $NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
     fi
  
        save_CPPFLAGS="$CPPFLAGS"
-@@ -13090,7 +13090,7 @@
+@@ -13200,7 +13200,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
  echo "${ECHO_T}$ac_cv_header_db_h" >&6
  if test $ac_cv_header_db_h = yes; then
@@ -68,7 +68,7 @@ $NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
  else
  
               CFLAGS=-I/usr/include/db4
-@@ -13213,13 +13213,13 @@
+@@ -13323,13 +13323,13 @@
      #AC_CHECK_LIB(db, db_create, [],
      #  [AC_MSG_ERROR([db library not installed or functional])], [])
  
@@ -85,7 +85,7 @@ $NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13276,7 +13276,7 @@
+@@ -13386,7 +13386,7 @@
  #define HAVE_LIBDB 1
  _ACEOF
  
@@ -94,7 +94,7 @@ $NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
  
  else
    { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -18928,7 +18928,7 @@
+@@ -19101,7 +19101,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
  echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
  if test $ac_cv_header_audio_audiolib_h = yes; then
@@ -103,7 +103,7 @@ $NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
  else
  
               CFLAGS=-I/usr/X11R6/include
-@@ -22818,7 +22818,7 @@
+@@ -22998,7 +22998,7 @@
      fi
  
          KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -112,3 +112,12 @@ $NetBSD: patch-ba,v 1.9 2007/11/17 16:28:09 hira Exp $
  fi
  
  
+@@ -23652,7 +23652,7 @@
+    XINERAMA_LINK=dynamic
+    echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
++elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+    if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
+       # we have both versions, let the user decide but use the static one
+       # per default