0.9.2

8 files changed, 38 insertions, 19 deletions

diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index fff1a544099..05aa326d40d 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ogle
-PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTVERSION=	0.9.2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -16,9 +15,9 @@ DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	An add-on graphical user interface for Ogle
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.10:${PORTSDIR}/multimedia/ogle
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
-		glade.4:${PORTSDIR}/devel/libglade \
+		glade-2.0:${PORTSDIR}/devel/libglade2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
@@ -26,7 +25,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
 		gnomeprefix \
-		gtk12
+		gtk20
 WANT_GNOME=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
@@ -35,10 +34,10 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 		--with-dvdcontrol=${LOCALBASE} \
 		--without-included-gettext \
+		--enable-gtk2 \
 		--with-gtk-prefix=${X11BASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-libglade-config=${X11BASE}/bin/libglade-config \
 		--with-xml-prefix=${LOCALBASE}
 
 .include <bsd.port.pre.mk>
diff --git a/multimedia/ogle-gui/distinfo b/multimedia/ogle-gui/distinfo
index ffce8e0cc44..e3430434825 100644
--- a/multimedia/ogle-gui/distinfo
+++ b/multimedia/ogle-gui/distinfo
@@ -1 +1 @@
-MD5 (ogle_gui-0.9.1.tar.gz) = 2010a629b3a16d8228529b092ebdde7e
+MD5 (ogle_gui-0.9.2.tar.gz) = e685aa3046f9da13532ede9300f2f794
diff --git a/multimedia/ogle-gui/files/patch-src::callbacks.c b/multimedia/ogle-gui/files/patch-src::callbacks.c
new file mode 100644
index 00000000000..acabe375746
--- /dev/null
+++ b/multimedia/ogle-gui/files/patch-src::callbacks.c
@@ -0,0 +1,11 @@
+--- src/callbacks.c.orig	Sun Nov  9 18:20:31 2003
++++ src/callbacks.c	Sun Nov  9 18:21:14 2003
+@@ -22,7 +22,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <time.h>
++#include <sys/time.h>
+ #include <gtk/gtk.h>
+ #include <ogle/dvdcontrol.h>
+ 
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 40aef4fc0f2..24b3ec5b459 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -6,6 +6,7 @@ share/gnome/ogle_gui/go_up.xpm
 share/gnome/ogle_gui/menus.xpm
 share/gnome/ogle_gui/ogle.xpm
 share/gnome/ogle_gui/ogle_gui.glade
+share/gnome/ogle_gui/ogle_gui.glade2
 share/gnome/ogle_gui/rewind.xpm
 share/gnome/ogle_gui/skip_backwards.xpm
 share/gnome/ogle_gui/skip_forwards.xpm
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index b7b6eab33d4..e5fd2684280 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ogle
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/multimedia/ogle/distinfo b/multimedia/ogle/distinfo
index 559453ec3e3..027fbb9d65a 100644
--- a/multimedia/ogle/distinfo
+++ b/multimedia/ogle/distinfo
@@ -1 +1 @@
-MD5 (ogle-0.9.1.tar.gz) = 8f10da2837a227af7a7190d7c63d4033
+MD5 (ogle-0.9.2.tar.gz) = a76a9892bdb807a4bcf859d15a91f0f9
diff --git a/multimedia/ogle/files/patch-ogle.in b/multimedia/ogle/files/patch-ogle.in
index 370c029a200..513c6eba934 100644
--- a/multimedia/ogle/files/patch-ogle.in
+++ b/multimedia/ogle/files/patch-ogle.in
@@ -1,11 +1,11 @@
---- scripts/ogle.in.orig	Sat Oct 13 18:49:29 2001
-+++ scripts/ogle.in	Sun Dec 23 17:59:41 2001
-@@ -27,7 +27,7 @@
- if [ -x $DVDP_ROOT/ogle_gui ]; then
- DVDP_UI=$DVDP_ROOT/ogle_gui
+--- scripts/ogle.in.orig	Sun Nov  9 18:14:38 2003
++++ scripts/ogle.in	Sun Nov  9 18:15:28 2003
+@@ -330,7 +330,7 @@
+ if [ -x $DVDP_ROOT/ogle_gui$gui_debug ]; then
+ DVDP_UI=$DVDP_ROOT/ogle_gui$gui_debug
  else
--DVDP_UI=$exec_prefix/bin/ogle_gui
-+DVDP_UI=%%X11BASE%%/lib/ogle/ogle_gui
+-DVDP_UI=$exec_prefix/bin/ogle_gui$gui_debug
++DVDP_UI=%%X11BASE%%/lib/ogle/ogle_gui$gui_debug
+ fi
  fi
  export DVDP_UI
- #DVDP_AC3=$DVDP_ROOT/ogle_ac3_p
diff --git a/multimedia/ogle/pkg-plist b/multimedia/ogle/pkg-plist
index 486c0f7f5ea..d0a7051d6f3 100644
--- a/multimedia/ogle/pkg-plist
+++ b/multimedia/ogle/pkg-plist
@@ -8,19 +8,27 @@ include/ogle/msgevents.h
 lib/ogle/libdvdcontrol.a
 lib/ogle/libdvdcontrol.la
 lib/ogle/libdvdcontrol.so
-lib/ogle/libdvdcontrol.so.10
+lib/ogle/libdvdcontrol.so.11
 lib/ogle/libmsgevents.a
 lib/ogle/libmsgevents.la
 lib/ogle/libmsgevents.so
-lib/ogle/libmsgevents.so.7
+lib/ogle/libmsgevents.so.8
 lib/ogle/ogle_ac3_p
 lib/ogle/ogle_audio
+lib/ogle/ogle_audio_debug
 lib/ogle/ogle_cli
+lib/ogle/ogle_cli_debug
 lib/ogle/ogle_ctrl
+lib/ogle/ogle_ctrl_debug
+lib/ogle/ogle_gui_debug
 lib/ogle/ogle_mpeg_ps
+lib/ogle/ogle_mpeg_ps_debug
 lib/ogle/ogle_mpeg_vs
+lib/ogle/ogle_mpeg_vs_debug
 lib/ogle/ogle_nav
+lib/ogle/ogle_nav_debug
 lib/ogle/ogle_vout
+lib/ogle/ogle_vout_debug
 share/ogle/ogle_conf.dtd
 share/ogle/oglerc
 @dirrm share/ogle