o Update to 0.8.3

o Drop USE_LIBTOOL as dependency
o Remove patches merged back into distribution

9 files changed, 22 insertions, 129 deletions

diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index a250e11edd5..124e5eb44ba 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ogle
-PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTVERSION=	0.8.3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -15,7 +14,7 @@ DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.5:${PORTSDIR}/graphics/ogle
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.6:${PORTSDIR}/graphics/ogle
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
 		glade.4:${PORTSDIR}/devel/libglade \
 		xml2.5:${PORTSDIR}/textproc/libxml2
@@ -26,13 +25,13 @@ USE_GTK=	yes
 USE_XPM=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 		--with-dvdcontrol=${LOCALBASE} \
 		--without-included-gettext \
 		--with-gtk-prefix=${X11BASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
+		--with-libintl-prefix=${LOCALBASE} \
 		--with-libglade-config=${X11BASE}/bin/libglade-config \
 		--with-xml-prefix=${LOCALBASE}
 
@@ -53,11 +52,7 @@ post-patch:
 		s!(CONFIG_FILE(\s|=)\")[^/]+?/!\1${LOCALBASE}/!; \
 		s|(CONFIG_FILE_DTD=\")[^/]+?/|\1${LOCALBASE}/|g; \
 		s|(PACKAGE_PIXMAPS_DIR=\").+\"|\1${PREFIX}/${SHARE_DATADIR}/ogle_gui/\"|; \
-		s|%%LOCALBASE%%|${LOCALBASE}|; \
-		s|(xmlversion.h>)|libxml/\1|" \
+		s|%%LOCALBASE%%|${LOCALBASE}|" \
 			${CONFIGURE_WRKSRC}/configure
 
-post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/ogle-gui/distinfo b/multimedia/ogle-gui/distinfo
index 96519dab80e..892fe09e917 100644
--- a/multimedia/ogle-gui/distinfo
+++ b/multimedia/ogle-gui/distinfo
@@ -1 +1 @@
-MD5 (ogle_gui-0.8.2.tar.gz) = 2475844fc862d4e280a4d07e83177199
+MD5 (ogle_gui-0.8.3.tar.gz) = 6e0581059278088bad8d6fe0ae7d5a65
diff --git a/multimedia/ogle-gui/files/patch-configure b/multimedia/ogle-gui/files/patch-configure
index a40c438664f..ee5bc6b30fb 100644
--- a/multimedia/ogle-gui/files/patch-configure
+++ b/multimedia/ogle-gui/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Wed Dec  5 19:43:10 2001
-+++ configure	Fri Dec 21 01:20:00 2001
-@@ -1506,6 +1506,8 @@
+--- configure.orig	Mon Jun 10 17:42:29 2002
++++ configure	Mon Jun 10 17:42:43 2002
+@@ -1648,6 +1648,8 @@
    ogle_pkglibdir=${exec_prefix}/lib/ogle
  fi
  
 +ogle_pkglibdir=%%LOCALBASE%%/lib/ogle
 +
- echo "$as_me:1509: checking for ogle helper dir" >&5
+ echo "$as_me:$LINENO: checking for ogle helper dir" >&5
  echo $ECHO_N "checking for ogle helper dir... $ECHO_C" >&6
  if test ! -x ${ogle_pkglibdir}/ogle_ctrl; then
diff --git a/multimedia/ogle-gui/files/patch-src::xsniffer.c b/multimedia/ogle-gui/files/patch-src::xsniffer.c
deleted file mode 100644
index dd574820837..00000000000
--- a/multimedia/ogle-gui/files/patch-src::xsniffer.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/xsniffer.c.orig	Sat Dec  8 14:28:37 2001
-+++ src/xsniffer.c	Sat Dec  8 15:33:28 2001
-@@ -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,13 @@
-   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) {
- 
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 90f9e739f7e..9debf2b3947 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -1,5 +1,7 @@
 lib/ogle/ogle_gui
 %%SHARE_DATADIR%%/locale/de/LC_MESSAGES/ogle_gui.mo
+%%SHARE_DATADIR%%/locale/fr/LC_MESSAGES/ogle_gui.mo
+%%SHARE_DATADIR%%/locale/nl/LC_MESSAGES/ogle_gui.mo
 %%SHARE_DATADIR%%/locale/sv/LC_MESSAGES/ogle_gui.mo
 %%SHARE_DATADIR%%/ogle_gui/angle.xpm
 %%SHARE_DATADIR%%/ogle_gui/enter.xpm
@@ -26,6 +28,10 @@ lib/ogle/ogle_gui
 @dirrm %%SHARE_DATADIR%%/ogle_gui
 @unexec rmdir %D/%%SHARE_DATADIR%%/locale/sv/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/%%SHARE_DATADIR%%/locale/sv 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/fr 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/nl 2>/dev/null || true
 @unexec rmdir %D/%%SHARE_DATADIR%%/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/%%SHARE_DATADIR%%/locale/de 2>/dev/null || true
 @unexec rmdir %D/%%SHARE_DATADIR%%/locale 2>/dev/null || true
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 6fd51a8b465..222b1928233 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ogle
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -21,8 +20,8 @@ LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 USE_SUBMAKE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--with-libjpeg=${LOCALBASE} \
 		--with-dvdread=${LOCALBASE} \
 		--with-liba52=${LOCALBASE}
@@ -43,17 +42,13 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in
-	@${PERL} -pi -e 's|(xmlversion.h>)|libxml/\1|; \
-		s|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
+	@${PERL} -pi -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 pre-configure:
 	@${TOUCH} `find -E ${WRKSRC} -regex ".*Makefile\.(am|in)"`
 	@${TOUCH} ${WRKSRC}/configure.in ${WRKSRC}/configure
 
-post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/multimedia/ogle/distinfo b/multimedia/ogle/distinfo
index ff9d664a1a4..e1c9b3e5f84 100644
--- a/multimedia/ogle/distinfo
+++ b/multimedia/ogle/distinfo
@@ -1 +1 @@
-MD5 (ogle-0.8.2.tar.gz) = 0b2c949e372b7e79f9106d99c5d2ba45
+MD5 (ogle-0.8.3.tar.gz) = aabe417346cdeca3bef18b77718a3906
diff --git a/multimedia/ogle/files/patch-ac3:a52_decoder.c b/multimedia/ogle/files/patch-ac3:a52_decoder.c
deleted file mode 100644
index f1ab072871a..00000000000
--- a/multimedia/ogle/files/patch-ac3:a52_decoder.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- ac3/a52_decoder.c.orig	Sun Dec  2 19:37:37 2001
-+++ ac3/a52_decoder.c	Fri Apr 12 18:25:07 2002
-@@ -46,6 +46,7 @@
- 
- /* A/52 */
- static ao_instance_t * output = NULL;
-+static a52_state_t *state;
- static sample_t * samples;
- static int disable_dynrng = 0;
- static clocktime_t a52_decode_data(uint8_t *start, uint8_t *end);
-@@ -216,15 +217,20 @@
- 
-   {
-     uint32_t accel;
--    accel = MM_ACCEL_MLIB;
-+    accel = MM_ACCEL_DJBFFT;
- 
-     open_output(get_speaker_flags());
- 
--    samples = a52_init(accel);
--    if(samples == NULL) {
-+    state = a52_init(accel);
-+    if(state == NULL) {
-         FATAL("A/52 init failed\n");
-         exit(1);
-     }
-+    samples = a52_samples(state);
-+    if(samples == NULL) {
-+        FATAL("A/52 samples failed\n");
-+        exit(1);
-+    }
-   }
- 
-   if(msgqid != -1) {
-@@ -675,7 +681,6 @@
- }
- 
- static clocktime_t a52_decode_data(uint8_t *start, uint8_t *end) {
--  static a52_state_t state;
-   
-   static uint8_t buf[3840];
-   static uint8_t *bufptr = buf;
-@@ -736,17 +741,16 @@
- 	
- 	flags = speaker_flags;
- 	flags |= A52_ADJUST_LEVEL;
--	memset(&state, 0, sizeof(a52_state_t));
- 	/* flags (speaker) [in/out] level [in/out] bias [in] */
--	if(a52_frame(&state, buf, &flags, &level, bias)) {
-+	if(a52_frame(state, buf, &flags, &level, bias)) {
- 	  DNOTE("a52_frame() error\n");
- 	  goto error;
- 	}
- 
- 	if(disable_dynrng)
--	  a52_dynrng(&state, NULL, NULL);
-+	  a52_dynrng(state, NULL, NULL);
- 	for(i = 0; i < 6; i++) {
--	  if(a52_block(&state, samples)) {
-+	  if(a52_block(state)) {
- 	    DNOTE("a52_block() error\n");
- 	    goto error;
- 	  }
diff --git a/multimedia/ogle/pkg-plist b/multimedia/ogle/pkg-plist
index b591d480f4b..50d827dd024 100644
--- a/multimedia/ogle/pkg-plist
+++ b/multimedia/ogle/pkg-plist
@@ -7,12 +7,12 @@ include/ogle/msgevents.h
 lib/ogle/libdvdcontrol.a
 lib/ogle/libdvdcontrol.la
 lib/ogle/libdvdcontrol.so
-lib/ogle/libdvdcontrol.so.5
+lib/ogle/libdvdcontrol.so.6
 lib/ogle/libmsgevents.a
 lib/ogle/libmsgevents.la
 lib/ogle/libmsgevents.so
 lib/ogle/libmsgevents.so.4
-lib/ogle/ogle_a52
+lib/ogle/ogle_audio
 lib/ogle/ogle_ac3_p
 lib/ogle/ogle_cli
 lib/ogle/ogle_ctrl