Synch with ogle.

okay maintainer.

x11/ogle_gui/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/05/27 14:39:17 espie Exp $
+# $OpenBSD: Makefile,v 1.2 2002/06/15 23:53:50 espie Exp $
 
 CATEGORIES=	x11
 
 COMMENT=	"GUI for ogle"
-DISTNAME=	ogle_gui-0.8.2
+DISTNAME=	ogle_gui-0.8.3
 HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 # Authors can be reached at dvd@dtek.chalmers.se
 MASTER_SITES=	${HOMEPAGE}dist/

x11/ogle_gui/distinfo

@@ -1,3 +1,3 @@
-MD5 (ogle_gui-0.8.2.tar.gz) = 2475844fc862d4e280a4d07e83177199
-RMD160 (ogle_gui-0.8.2.tar.gz) = ba7705165b9c7b5853810562f151a14f1d07b09d
-SHA1 (ogle_gui-0.8.2.tar.gz) = 078c45d0b64ae909d67eaebe8216116e724e9fe8
+MD5 (ogle_gui-0.8.3.tar.gz) = 6e0581059278088bad8d6fe0ae7d5a65
+RMD160 (ogle_gui-0.8.3.tar.gz) = ffa1a832ec961483408274e99b54c3ebb370fc8a
+SHA1 (ogle_gui-0.8.3.tar.gz) = aa418375f455f82fbff7b4af04d44e36f9c0a7cf

x11/ogle_gui/patches/patch-configure

@@ -1,13 +1,13 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2002/05/27 14:39:17 espie Exp $
+$OpenBSD: patch-configure,v 1.2 2002/06/15 23:53:50 espie Exp $
 
---- configure.orig	Wed Dec  5 22:43:32 2001
-+++ configure	Mon May 27 16:06:32 2002
-@@ -16643,7 +16643,7 @@ fi
- LIBGLADE_PREFIX=`$LIBGLADE_CONFIG --prefix`
+--- configure.orig	Mon Jun 10 23:58:10 2002
++++ configure	Sun Jun 16 01:09:11 2002
+@@ -10877,7 +10877,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
  
  cat >>confdefs.h <<_ACEOF
--#define LIBGLADE_LIB "${LIBGLADE_PREFIX}/lib/libglade.so.0"
-+#define LIBGLADE_LIB "${LIBGLADE_PREFIX}/lib/libglade.so.5.0"
+-#define LIBGLADE_LIB "libglade.so.0"
++#define LIBGLADE_LIB "libglade.so.5.0"
  _ACEOF
  
  if test "x${prefix}" = "xNONE"; then

x11/ogle_gui/patches/patch-src_my_glade_c

@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_my_glade_c,v 1.1.1.1 2002/05/27 14:39:17 espie Exp $
+$OpenBSD: patch-src_my_glade_c,v 1.2 2002/06/15 23:53:50 espie Exp $
 
---- src/my_glade.c.orig	Tue Dec  4 19:36:57 2001
-+++ src/my_glade.c	Mon May 27 16:32:18 2002
-@@ -48,13 +48,58 @@ static void *my_dlsym(void *handle, char
+--- src/my_glade.c.orig	Sun Dec 16 18:50:08 2001
++++ src/my_glade.c	Sun Jun 16 01:13:28 2002
+@@ -48,6 +48,51 @@ static void *my_dlsym(void *handle, char
    return fun;
  }
  
@@ -46,18 +46,21 @@ $OpenBSD: patch-src_my_glade_c,v 1.1.1.1 2002/05/27 14:39:17 espie Exp $
 +    return NULL;
 +}
 +#endif
++
++#ifndef RTLD_NOW
++#define RTLD_NOW	0
++#endif
 +
  // to be called first
  void my_glade_setup ()
  {
-   void *glade_lib;
-   char *home;
- 
--  glade_lib = dlopen (LIBGLADE_LIB, RTLD_NOW);
-+  glade_lib = dlopen (LIBGLADE_LIB, DL_LAZY);
+@@ -60,6 +105,10 @@ void my_glade_setup ()
+     // next, try without path
+     glade_lib = dlopen (LIBGLADE_LIB, RTLD_NOW);
+   }
 +#ifdef __OpenBSD__
 +  if (glade_lib == NULL)
-+      glade_lib = findlibrary(LIBGLADE_LIB);
++      glade_lib = findlibrary(LIBGLADE_LIBDIR "/" LIBGLADE_LIB);
 +#endif
    if (glade_lib == NULL) {
      fprintf(stderr, "Error during dlopen: %s\n", dlerror());

x11/ogle_gui/patches/patch-src_xsniffer_c

@@ -1,43 +0,0 @@
-$OpenBSD: patch-src_xsniffer_c,v 1.1.1.1 2002/05/27 14:39:17 espie Exp $
-
---- src/xsniffer.c.orig	Thu May 16 20:46:28 2002
-+++ src/xsniffer.c	Thu May 16 20:48:52 2002
-@@ -16,6 +16,11 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+#define HAVE_SYS_PARAM_H
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -35,6 +40,10 @@
- #include "callbacks.h"
- #include "bindings.h"
- 
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+
- extern int msgqid;
- 
- 
-@@ -64,7 +73,14 @@ void* xsniff_mouse(void* args) {
-   init_actions(nav2);
-   
-   while(1) {
--    DVDNextEvent(nav2, &mev);
-+
-+#if (defined(BSD) && (BSD >= 199306))
-+       if (DVDNextEventNonBlocking(nav2, &mev) != DVD_E_Ok)
-+#else
-+       if (DVDNextEvent(nav2, &mev) != DVD_E_Ok)
-+#endif
-+               pthread_exit(NULL);
-+
-     
-     switch(mev.type) {
-