[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Add `nas' option.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b023ba38036
branches:  trunk
changeset: 535209:9b023ba38036
user:      hira <hira%pkgsrc.org@localhost>
date:      Sun Nov 11 15:46:25 2007 +0000

description:
Add `nas' option.

diffstat:

 misc/openoffice2/Makefile         |   5 +++--
 misc/openoffice2/distinfo         |   4 ++--
 misc/openoffice2/options.mk       |  13 +++++++++++--
 misc/openoffice2/patches/patch-ba |  13 +++++++++++--
 4 files changed, 27 insertions(+), 8 deletions(-)

diffs (99 lines):

diff -r 5246b0e3cf6c -r 9b023ba38036 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Sun Nov 11 11:35:48 2007 +0000
+++ b/misc/openoffice2/Makefile Sun Nov 11 15:46:25 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/11/11 03:35:35 hira Exp $
+# $NetBSD: Makefile,v 1.28 2007/11/11 15:46:25 hira Exp $
 #
 
 OO_VER=                        2.3.0
@@ -62,6 +62,7 @@
 
 CONFIGURE_ENV+=                LIBS=${LIBS:O:u:Q}
 CONFIGURE_ENV+=                X_LIBS=${X11_LDFLAGS:M*:Q}
+CONFIGURE_ENV+=                BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
 
 CONFIGURE_ARGS+=       --with-use-shell=bash
 CONFIGURE_ARGS+=       --enable-binfilter
@@ -80,7 +81,7 @@
 CONFIGURE_ARGS+=       --enable-epm --with-package-format=portable
 
 # XXX: Error in OOo internal libsndfile.
-CONFIGURE_ARGS+=       --disable-pasf --without-nas
+CONFIGURE_ARGS+=       --disable-pasf
 
 # systray quickstarter is broken with mutex handling.
 CONFIGURE_ARGS+=       --disable-systray
diff -r 5246b0e3cf6c -r 9b023ba38036 misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Sun Nov 11 11:35:48 2007 +0000
+++ b/misc/openoffice2/distinfo Sun Nov 11 15:46:25 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2007/11/11 03:35:35 hira Exp $
+$NetBSD: distinfo,v 1.28 2007/11/11 15:46:25 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
@@ -29,7 +29,7 @@
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = c56c8d5a04b172701992bad841795c24d0dd31fa
+SHA1 (patch-ba) = 2745df4a4f7bcfed11ebf0048c76e5e2a5471da1
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
diff -r 5246b0e3cf6c -r 9b023ba38036 misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk       Sun Nov 11 11:35:48 2007 +0000
+++ b/misc/openoffice2/options.mk       Sun Nov 11 15:46:25 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.15 2007/11/11 03:35:36 hira Exp $
+# $NetBSD: options.mk,v 1.16 2007/11/11 15:46:25 hira Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice2
-PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 kde ooo-external-libwpd
+PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 kde nas ooo-external-libwpd
 PKG_OPTIONS_OPTIONAL_GROUPS=   browser
 PKG_OPTIONS_GROUP.browser=     firefox seamonkey # firefox-gtk1 seamonkey-gtk1
 # The list from completelangiso in solenv/inc/postset.mk.
@@ -85,3 +85,12 @@
 .else
 CONFIGURE_ARGS+=       --disable-kde --disable-kdeab
 .endif
+
+.if !empty(PKG_OPTIONS:Mnas)
+CONFIGURE_ARGS+=       --with-system-nas
+# Build error with nas<=1.9.
+BUILDLINK_API_DEPENDS.nas+=    nas>=1.9nb1
+.include "../../audio/nas/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-nas
+.endif
diff -r 5246b0e3cf6c -r 9b023ba38036 misc/openoffice2/patches/patch-ba
--- a/misc/openoffice2/patches/patch-ba Sun Nov 11 11:35:48 2007 +0000
+++ b/misc/openoffice2/patches/patch-ba Sun Nov 11 15:46:25 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.7 2007/10/06 20:02:22 hira Exp $
+$NetBSD: patch-ba,v 1.8 2007/11/11 15:46:25 hira Exp $
 
 --- config_office/configure.orig       2007-08-24 21:31:18.000000000 +0900
-+++ config_office/configure    2007-09-27 10:52:53.000000000 +0900
++++ config_office/configure    2007-11-12 00:42:00.000000000 +0900
 @@ -3010,11 +3010,11 @@
                test_cups=no
                _os=OSF1
@@ -59,6 +59,15 @@
     fi
  
        save_CPPFLAGS="$CPPFLAGS"
+@@ -18928,7 +18928,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
+-   NAS_INCLUDES=/usr/include
++   NAS_INCLUDES=${BLNK_PREFIX_nas}/include
+ else
+ 
+              CFLAGS=-I/usr/X11R6/include
 @@ -22818,7 +22818,7 @@
      fi