From cc0ed87da764aff044d7c0edb23d5991e4c61f80 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 13 Mar 2006 17:32:25 +0000
Subject: Include sys/time.h for gettimeofday prototype. Don't hard-code -lc_r,
 it gets dropped by libtool.

---
 multimedia/ogle_gui/distinfo         |  5 +++--
 multimedia/ogle_gui/patches/patch-aa | 39 ++++++++++++++++++++++++++++++++++--
 multimedia/ogle_gui/patches/patch-ad | 12 +++++++++++
 3 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 multimedia/ogle_gui/patches/patch-ad

(limited to 'multimedia')

diff --git a/multimedia/ogle_gui/distinfo b/multimedia/ogle_gui/distinfo
index e122dc585c0..aea35c93def 100644
--- a/multimedia/ogle_gui/distinfo
+++ b/multimedia/ogle_gui/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:04 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/03/13 17:32:25 joerg Exp $
 
 SHA1 (ogle_gui-0.9.2.tar.gz) = 0d73ec30852b9cd2a9714b5088f6ab6deecf097d
 RMD160 (ogle_gui-0.9.2.tar.gz) = a08906940019c0ced828a15b6c220b594a006a3f
 Size (ogle_gui-0.9.2.tar.gz) = 396673 bytes
-SHA1 (patch-aa) = 818777c5474f6a99fbaa732f77c632dad4e12a22
+SHA1 (patch-aa) = 27d7480d43d8c01e76ab109d438e1dc53d69e0a2
 SHA1 (patch-ab) = 05916e5699a6e43f70a27a0b048b95989c4a4c69
 SHA1 (patch-ac) = 2aa173ace19f55d56d9d996b74db2dd59e4e0ef2
+SHA1 (patch-ad) = 2b1f900258cb5bee8d64ae4d9a0346cfe3681711
diff --git a/multimedia/ogle_gui/patches/patch-aa b/multimedia/ogle_gui/patches/patch-aa
index 009eff42634..534a3eb1b65 100644
--- a/multimedia/ogle_gui/patches/patch-aa
+++ b/multimedia/ogle_gui/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2004/02/03 04:34:06 grant Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/13 17:32:26 joerg Exp $
 
---- configure.orig	2003-11-05 23:02:32.000000000 +0100
+--- configure.orig	2003-11-05 22:02:32.000000000 +0000
 +++ configure
 @@ -11554,7 +11554,7 @@ _ACEOF
        *)
@@ -11,3 +11,38 @@ $NetBSD: patch-aa,v 1.1 2004/02/03 04:34:06 grant Exp $
  _ACEOF
  
  	;;
+@@ -12206,13 +12206,13 @@ echo "${ECHO_T}$ac_cv_lib_pthreads_pthre
+ if test $ac_cv_lib_pthreads_pthread_create = yes; then
+   PTHREAD_LIB="-lpthreads"
+ else
+-  echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
+-echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6
++  echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lc_r  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+@@ -12262,7 +12262,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6
+ if test $ac_cv_lib_c_r_pthread_create = yes; then
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ else
+   echo "$as_me:$LINENO: checking for pthread_create" >&5
+ echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6
+@@ -12808,6 +12808,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    # Avoid regenerating for rechecks on pkgsrc
++    exit 0
+     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+ _ACEOF
diff --git a/multimedia/ogle_gui/patches/patch-ad b/multimedia/ogle_gui/patches/patch-ad
new file mode 100644
index 00000000000..510fe2b06f4
--- /dev/null
+++ b/multimedia/ogle_gui/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2006/03/13 17:32:26 joerg Exp $
+
+--- src/callbacks.c.orig	2006-03-13 15:57:21.000000000 +0000
++++ src/callbacks.c
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
++#include <sys/time.h>
+ #include <gtk/gtk.h>
+ #include <ogle/dvdcontrol.h>
+ 
-- 
cgit v1.2.3