o Update to 0.8.3

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

4 files changed, 7 insertions, 75 deletions

diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 6fd51a8b4656..222b1928233d 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 ff9d664a1a4a..e1c9b3e5f843 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 f1ab072871a7..000000000000
--- 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 b591d480f4ba..50d827dd024c 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