Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jan 2003 15:32:54 +0100 (CET)
From:      Ulrich Spoerlein <q@uni.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/47407: Unbreak/Update Port: multimedia/xmms-avi
Message-ID:  <200301231432.h0NEWsTN071627@coyote.dnsalias.net>

next in thread | raw e-mail | index | archive | help

>Number:         47407
>Category:       ports
>Synopsis:       Unbreak/Update Port: multimedia/xmms-avi
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 23 06:40:07 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD 4.7-STABLE: Mon Nov 18 09:46:38 CET 2002 i386

>Description:
Attached Patch updates/unbreaks the xmms-avi port.

>How-To-Repeat:

>Fix:


--- patch.xmms begins here ---
diff -urN /usr/ports/multimedia/xmms-avi/Makefile xmms-avi/Makefile
--- /usr/ports/multimedia/xmms-avi/Makefile	Thu Dec 12 03:17:47 2002
+++ xmms-avi/Makefile	Thu Jan 23 12:49:00 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmms-avi
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xmms.org/files/plugins/avi-xmms/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/avi-xmms/ \
@@ -15,24 +15,24 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=		Maintainer is working on a fix
-
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 ONLY_FOR_ARCHS=	i386
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 pre-patch:
-	@${PERL} -pi.orig -e "s|SDL/SDL.h|SDL11/SDL.h|g" ${WRKSRC}/src/ctrackbar.cpp
-	@${PERL} -pi.orig -e "s|lc_r|pthread|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|SDL/SDL.h|SDL11/SDL.h|g" ${WRKSRC}/src/ctrackbar.cpp
+	@${REINPLACE_CMD} -e "s|lc_r|pthread|g" ${WRKSRC}/configure
 
 # This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input
 do-install:
diff -urN /usr/ports/multimedia/xmms-avi/distinfo xmms-avi/distinfo
--- /usr/ports/multimedia/xmms-avi/distinfo	Tue Mar 20 03:32:42 2001
+++ xmms-avi/distinfo	Thu Jan 23 01:48:15 2003
@@ -1 +1 @@
-MD5 (avi-xmms-1.2.2.tar.gz) = 0532dce534cf6f7ba1d1563547128659
+MD5 (avi-xmms-1.2.3.tar.gz) = 1eb3ce58d21ec00b38d7786363ff271c
diff -urN /usr/ports/multimedia/xmms-avi/files/patch-configure xmms-avi/files/patch-configure
--- /usr/ports/multimedia/xmms-avi/files/patch-configure	Tue Mar 20 03:32:42 2001
+++ xmms-avi/files/patch-configure	Thu Jan 23 11:18:54 2003
@@ -1,6 +1,6 @@
 --- configure.orig	Wed Feb  7 22:07:08 2001
 +++ configure	Wed Feb  7 22:08:06 2001
-@@ -2192,7 +2192,8 @@
+@@ -6305,7 +6305,8 @@
      no_sdl=yes
    else
      SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
--- patch.xmms ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301231432.h0NEWsTN071627>