[Midnightbsd-cvs] mports: multimedia/ogle: Unbreak ogle.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Unbreak ogle.  Magus found this port was defective.  Switch to liba52 instead of the devel version.

Modified Files:
--------------
    mports/multimedia/ogle:
        Makefile (r1.3 -> r1.4)

Added Files:
-----------
    mports/multimedia/ogle/files:
        patch-ac3-ac3dec_wrap.c (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/multimedia/ogle/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lmultimedia/ogle/Makefile -Lmultimedia/ogle/Makefile -u -r1.3 -r1.4
--- multimedia/ogle/Makefile
+++ multimedia/ogle/Makefile
@@ -3,24 +3,25 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/multimedia/ogle/Makefile,v 1.31 2006/05/10 22:37:34 edwin Exp $
+# $FreeBSD: ports/multimedia/ogle/Makefile,v 1.38 2007/10/04 02:01:28 edwin Exp $
 #
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Open DVD player that supports DVD menus
 
-LIB_DEPENDS=	a52-devel.0:${PORTSDIR}/audio/liba52-devel \
+LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		dvdread.5:${PORTSDIR}/multimedia/libdvdread \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mad.2:${PORTSDIR}/audio/libmad \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
+USE_AUTOTOOLS=	libtool:15
 USE_SUBMAKE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
@@ -30,7 +31,9 @@
 		--with-dvdread=${LOCALBASE} \
 		--with-libmad=${LOCALBASE} \
 		--with-liba52=${LOCALBASE}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+
+DEFAULT_DVD_DEVICE?=	/dev/acd0c
 
 MAN1=	ogle.1
 MAN5=	oglerc.5
@@ -46,28 +49,23 @@
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in
-# hack to make ogle work with liba52-devel + djbfft
+# hack to make ogle work with liba52 + djbfft
 # CFLAGS safeness
-	@${REINPLACE_CMD} -E -e 's|(-la52)|\1-devel ${LIBA52_DEP_LIBS}|; \
+	@${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|; \
 		s,(X?CFLAGS[[:space:]]*=[[:space:]]*"\$$CFLAGS).*(-(fomit-frame-pointer|funroll-loops|march|mcpu)).*",\1",' \
-		-e 's|a52dec/|a52dec-devel/|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -E \
-		-e 's|a52dec/|a52dec-devel/|' \
-		${WRKSRC}/ac3/decode_a52.c
 
 pre-configure:
 	@${TOUCH} `${FIND} -E ${WRKSRC} -regex ".*Makefile\.(am|in)"`
 	@${TOUCH} ${WRKSRC}/configure.in ${WRKSRC}/configure
 
-
 # XXX due to gcc-3.4 (20040706) bug in preprocessing of inline functions,
 # this needs at least -O2 to compile. Fails with -O
 CFLAGS+=	-O2
 
 # hack to make ogle work with liba52 + djbfft
-.if exists(${LOCALBASE}/lib/liba52-devel.so)
-LIBA52_DEP_LIBS!=	${GREP} dependency_libs ${LOCALBASE}/lib/liba52-devel.la | ${CUT} -d \' -f 2
+.if exists(${LOCALBASE}/lib/liba52.la)
+LIBA52_DEP_LIBS!=	${GREP} dependency_libs ${LOCALBASE}/lib/liba52.la | ${CUT} -d \' -f 2
 .else
 LIBA52_DEP_LIBS=
 .endif
@@ -96,7 +94,5 @@
 	@${ECHO_MSG} '===> only with 486 processors and above.'
 .endif
 
-# default DVD devices
-DEFAULT_DVD_DEVICE?=	/dev/acd0
 
 .include <bsd.port.post.mk>
--- /dev/null
+++ multimedia/ogle/files/patch-ac3-ac3dec_wrap.c
@@ -0,0 +1,11 @@
+--- ac3/ac3dec_wrap.c.orig	Sun Mar  2 16:50:03 2003
++++ ac3/ac3dec_wrap.c	Wed Jul  4 21:14:18 2007
+@@ -48,7 +48,7 @@
+ static void handle_events(MsgEventQ_t *q, MsgEvent_t *ev);
+ 
+ 
+-static char *program_name;
++char *program_name;
+ 
+ static FILE *outfile;
+