From 8d96dc320b4057b1b22664142ea70a1a0389da26 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 20 Nov 2015 14:28:02 +0000
Subject: Don't link against libcompat, since ftime hasn't been used for a
 while. Fixes build of dynamic library. Bump revision.

---
 audio/opusfile/Makefile                   |  3 +-
 audio/opusfile/distinfo                   |  4 +-
 audio/opusfile/patches/patch-configure    | 75 +++++++++++++++++++++++++++++++
 audio/opusfile/patches/patch-configure.ac | 12 +++++
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 audio/opusfile/patches/patch-configure
 create mode 100644 audio/opusfile/patches/patch-configure.ac

diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index 00bd8b7a02a..7e257490a25 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/08/16 21:30:50 gls Exp $
+# $NetBSD: Makefile,v 1.3 2015/11/20 14:28:02 joerg Exp $
 
 DISTNAME=	opusfile-0.6
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/
 
diff --git a/audio/opusfile/distinfo b/audio/opusfile/distinfo
index ae86e9ff12a..3374ef26276 100644
--- a/audio/opusfile/distinfo
+++ b/audio/opusfile/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 01:12:44 agc Exp $
+$NetBSD: distinfo,v 1.7 2015/11/20 14:28:02 joerg Exp $
 
 SHA1 (opusfile-0.6.tar.gz) = 2422e3c7bf6105a832226850b19053ec5ac41293
 RMD160 (opusfile-0.6.tar.gz) = a5d036100ecb561ad00b43f276585f3b6440f950
 SHA512 (opusfile-0.6.tar.gz) = 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02
 Size (opusfile-0.6.tar.gz) = 437980 bytes
+SHA1 (patch-configure) = e66accedd8adbc6177b0abbec43b2d48b4a154c5
+SHA1 (patch-configure.ac) = d8384babab6d2e3e1fcf61380a8c3db70accf59d
 SHA1 (patch-src_http.c) = 631e7304c825baf5537c871b39e75bfb1f04da8a
diff --git a/audio/opusfile/patches/patch-configure b/audio/opusfile/patches/patch-configure
new file mode 100644
index 00000000000..52b8347f2ef
--- /dev/null
+++ b/audio/opusfile/patches/patch-configure
@@ -0,0 +1,75 @@
+$NetBSD: patch-configure,v 1.1 2015/11/20 14:28:02 joerg Exp $
+
+--- configure.orig	2015-11-18 13:16:26.000000000 +0000
++++ configure
+@@ -11897,70 +11897,6 @@ fi
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ftime" >&5
+-$as_echo_n "checking for library containing ftime... " >&6; }
+-if ${ac_cv_search_ftime+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char ftime ();
+-int
+-main ()
+-{
+-return ftime ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' compat; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_ftime=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_ftime+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_ftime+:} false; then :
+-
+-else
+-  ac_cv_search_ftime=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ftime" >&5
+-$as_echo "$ac_cv_search_ftime" >&6; }
+-ac_res=$ac_cv_search_ftime
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-else
+-  enable_http=no
+-fi
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
diff --git a/audio/opusfile/patches/patch-configure.ac b/audio/opusfile/patches/patch-configure.ac
new file mode 100644
index 00000000000..a5a214f7a4e
--- /dev/null
+++ b/audio/opusfile/patches/patch-configure.ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-configure.ac,v 1.1 2015/11/20 14:28:02 joerg Exp $
+
+--- configure.ac.orig	2015-11-18 13:16:13.000000000 +0000
++++ configure.ac
+@@ -86,7 +86,6 @@ AM_COND_IF(OP_WIN32,
+     )
+   )
+ )
+-AC_SEARCH_LIBS(ftime, [compat], , [enable_http=no])
+ 
+ AS_IF([test "$enable_http" != "no"], [
+    openssl="openssl"
-- 
cgit v1.2.3