Update to ogle 0.8.4. Miscellaneous bug fixes, mostly to navigation.

6 files changed, 36 insertions, 40 deletions

diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index d508b9d8706..f81a950480f 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2002/06/16 18:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/07/12 18:29:29 mycroft Exp $
 
-DISTNAME=	ogle-0.8.3
+DISTNAME=	ogle-0.8.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -13,6 +13,7 @@ DEPENDS+=	liba52>=0.7.3:../../audio/liba52
 BUILDLINK_DEPENDS.libxml2=	libxml2>=2.4.19
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5[Y-Z]*-i386 NetBSD-1.[6-9]*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-1.6[D-Z]*-powerpc NetBSD-1.[7-9]*-powerpc
 
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 #CONFIGURE_ARGS+=--enable-obsdaudio
diff --git a/graphics/ogle/PLIST b/graphics/ogle/PLIST
index e2f3d0d4f85..291fa7ccafd 100644
--- a/graphics/ogle/PLIST
+++ b/graphics/ogle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/16 18:12:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/12 18:29:29 mycroft Exp $
 bin/ifo_dump
 bin/ogle
 include/ogle/dvd.h
@@ -10,8 +10,8 @@ lib/ogle/libmsgevents.so.4
 lib/ogle/libmsgevents.so
 lib/ogle/libmsgevents.la
 lib/ogle/libmsgevents.a
-lib/ogle/libdvdcontrol.so.6.0
-lib/ogle/libdvdcontrol.so.6
+lib/ogle/libdvdcontrol.so.7.0
+lib/ogle/libdvdcontrol.so.7
 lib/ogle/libdvdcontrol.so
 lib/ogle/libdvdcontrol.la
 lib/ogle/libdvdcontrol.a
diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo
index 5c0f72c8005..e3d724a4529 100644
--- a/graphics/ogle/distinfo
+++ b/graphics/ogle/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.5 2002/06/16 18:12:58 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/07/12 18:29:29 mycroft Exp $
 
-SHA1 (ogle-0.8.3.tar.gz) = 80517f375b13b637ee15069368ff703b5d1b7e52
-Size (ogle-0.8.3.tar.gz) = 405249 bytes
+SHA1 (ogle-0.8.4.tar.gz) = 15ab65b6ec9cd7631b1c4341896072fa308fc15c
+Size (ogle-0.8.4.tar.gz) = 437475 bytes
 SHA1 (patch-aa) = c7ed5f7b957c0303c451650df2e4b1044d7430ef
-SHA1 (patch-ab) = 63aae484dbbb4e0746807f208f3fadb84a16341a
-SHA1 (patch-ac) = 85d5664419706bce042e564acadff75e0d5def58
-SHA1 (patch-ad) = da39bea384f78a63b94dec2c47a2c39750858bc2
+SHA1 (patch-ab) = 4f921f7c65de8bc0f9b1ef54442ae6f9462bb8d3
+SHA1 (patch-ac) = 0443cd0493039150c79b54f876349ab2c7601fcf
 SHA1 (patch-ae) = a37d75d4c15ab60060df5339680ce863488c2f26
 SHA1 (patch-af) = 66a5c30aaf455e794a4c8940dc2a98815c62ae58
 SHA1 (patch-ag) = 386f8be5ce347f150b6b836a3d9c9b3db12cfbc7
diff --git a/graphics/ogle/patches/patch-ab b/graphics/ogle/patches/patch-ab
index a1240803a62..a4775be0d4d 100644
--- a/graphics/ogle/patches/patch-ab
+++ b/graphics/ogle/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2002/06/16 18:12:58 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2002/07/12 18:29:29 mycroft Exp $
 
---- configure.in.orig	Wed Jun 12 00:00:28 2002
-+++ configure.in	Thu Jun 13 12:03:11 2002
+--- configure.in.orig	Sat Jun 29 22:49:43 2002
++++ configure.in	Thu Jul 11 02:18:38 2002
 @@ -351,16 +351,16 @@
      esac
  fi
@@ -21,14 +21,14 @@ $NetBSD: patch-ab,v 1.2 2002/06/16 18:12:58 wiz Exp $
 -        AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao OpenBSD audio support])
 +        AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao NetBSD/OpenBSD audio support])
  	DEFAULT_AUDIO_DRIVER="obsd"
+ 	DEFAULT_AUDIO_DEVICE="/dev/audio"
      ;;
-     esac
-@@ -371,7 +371,7 @@
+@@ -372,7 +372,7 @@
      [  --disable-sunaudio      make a version not using Sun audio])
  if test "x$enable_sunaudio" != xno; then
      case "$host" in
 -    *-sun-solaris*|*-netbsd*)
 +    *-sun-solaris*)
  
- dnl check for headers.. only define LIBOGLEAO_OSS if headers are found.
+ dnl check for headers.. only define LIBOGLEAO_SOLARIS if headers are found.
          AC_DEFINE([LIBOGLEAO_SOLARIS],,[libogleao solaris audio support])
diff --git a/graphics/ogle/patches/patch-ac b/graphics/ogle/patches/patch-ac
index 9e75ec2b9b8..d76ba406a76 100644
--- a/graphics/ogle/patches/patch-ac
+++ b/graphics/ogle/patches/patch-ac
@@ -1,22 +1,31 @@
-$NetBSD: patch-ac,v 1.2 2002/06/16 18:12:58 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2002/07/12 18:29:29 mycroft Exp $
 
---- configure.orig	Wed Jun 12 00:11:32 2002
-+++ configure	Thu Jun 13 12:02:17 2002
-@@ -7367,7 +7367,7 @@
- 
+--- configure.orig	Sun Jun 30 00:54:14 2002
++++ configure	Thu Jul 11 02:22:13 2002
+@@ -1004,7 +1004,7 @@
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --disable-xv            disable the use of Xv
+   --disable-oss           make a version not using oss
+-  --disable-obsdaudio     make a version not using OpenBSD audio
++  --disable-obsdaudio     make a version not using NetBSD/OpenBSD audio
+   --disable-sunaudio      make a version not using Sun audio
+   --disable-alsa          make a version not using alsa
+   --disable-xmltest       Do not try to compile and run a test LIBXML program
+@@ -10989,7 +10989,7 @@
+ fi;
  if test "x$enable_obsdaudio" != xno; then
      case "$host" in
 -    *-openbsd*)
 +    *-netbsd*|*-openbsd*)
  
-         cat >> confdefs.h <<\EOF
- #define LIBOGLEAO_OBSD 
-@@ -7386,7 +7386,7 @@
  
+ cat >>confdefs.h <<\_ACEOF
+@@ -11009,7 +11009,7 @@
+ fi;
  if test "x$enable_sunaudio" != xno; then
      case "$host" in
 -    *-sun-solaris*|*-netbsd*)
 +    *-sun-solaris*)
  
-         cat >> confdefs.h <<\EOF
- #define LIBOGLEAO_SOLARIS 
+ 
+ cat >>confdefs.h <<\_ACEOF
diff --git a/graphics/ogle/patches/patch-ad b/graphics/ogle/patches/patch-ad
deleted file mode 100644
index 906a8021f68..00000000000
--- a/graphics/ogle/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/06/16 18:12:58 wiz Exp $
-
---- libogleao/oss_audio.c.orig	Wed Jun  5 20:34:58 2002
-+++ libogleao/oss_audio.c	Thu Jun 13 12:12:17 2002
-@@ -26,7 +26,7 @@
- #endif
- #include <stdio.h>
- 
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <soundcard.h>
- #elif defined(__FreeBSD__)
- #include <machine/soundcard.h>