Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 07 Jan 2006 18:21:11 -0500
From:      Serge Gagnon <serge.gagnon@b2b2c.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/91486: Update port: multimedia/lxdvdrip to 1.51
Message-ID:  <E1EvNN1-0003bA-UX@quenix1.dyndns.org>
Resent-Message-ID: <200601072330.k07NU4PU019102@freefall.freebsd.org>

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

>Number:         91486
>Category:       ports
>Synopsis:       Update port: multimedia/lxdvdrip to 1.51
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 07 23:30:04 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Serge Gagnon
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Thu Jan 5 13:45:24 EST 2006 root@quenix1.dyndns.org:/usr/obj/usr/src/sys/QUENIX1 i386


>Description:
	- Update to 1.51 [*]
	- Add multimedia/mplayer as dependency [*]
	- Install lxdvdrip.wav under DATADIR [*]
	- Change playwave reference in the source code to wavplay [*]
	- Stop building of vamps in the source code and add a dependency
	to multimedia/vamps
	- Pass maintainership to ports@FreeBSD.org

	[*]Mario Sergio Fujikawa Ferreira <lioux _at_ FreeBSD _dot_ org>
>How-To-Repeat:
	
>Fix:

	

--- patch-lxdvdrip.diff begins here ---
diff -urN multimedia/lxdvdrip.orig/Makefile multimedia/lxdvdrip/Makefile
--- multimedia/lxdvdrip.orig/Makefile	Sat Jan  7 17:54:38 2006
+++ multimedia/lxdvdrip/Makefile	Sat Jan  7 18:08:34 2006
@@ -2,34 +2,36 @@
 # Date created:				26.01.2005
 # Whom:					Ulrich Spoerlein <q@uni.de>
 #
-# $FreeBSD: ports/multimedia/lxdvdrip/Makefile,v 1.12 2006/01/05 03:57:29 edwin Exp $
+# $FreeBSD: ports/multimedia/lxdvdrip/Makefile,v 1.11 2005/12/16 16:13:14 ehaupt Exp $
 #
 
 PORTNAME=	lxdvdrip
-PORTVERSION=	1.47
-PORTREVISION=	5
+PORTVERSION=	1.51
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/lxdvdrip/ \
 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	serge.gagnon@b2b2c.ca
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command Line Tool to make a copy from a Video DVD
 
 LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	buffer:${PORTSDIR}/misc/buffer \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		dvdbackup:${PORTSDIR}/sysutils/dvdbackup \
-		dvdwizard:${PORTSDIR}/multimedia/dvdwizard \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		mpgtx:${PORTSDIR}/multimedia/mpgtx \
-		transcode:${PORTSDIR}/multimedia/transcode
+		mplayer:${PORTSDIR}/multimedia/mplayer \
+		transcode:${PORTSDIR}/multimedia/transcode \
+		vamps:${PORTSDIR}/multimedia/vamps
+
+USE_REINPLACE=	yes
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-VAMPSRC=	vamps.c requant.c
+LXDVDRIPSRC=	${PORTNAME}.c streamanalyze.c
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm
 
@@ -41,22 +43,16 @@
 
 .include <bsd.port.pre.mk>
 
-# vamps needs strtof()
-.if ${OSVERSION} > 500000
-PLIST_SUB=	VAMPS=""
-.else
-PLIST_SUB=	VAMPS="@comment "
-.endif
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's|playwave[[:space:]]+-r[[:space:]]+|wavplay -s|' \
+		-e 's|playwave|wavplay|' \
+		-e 's|/usr/local/share/lxdvdrip.wav|${DATADIR}/lxdvdrip.wav|' \
+		${WRKSRC}/${PORTNAME}.c
 
 do-build:
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/${PORTNAME} ${LXDVDRIPSRC:C/^/${WRKSRC}\//}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/lxac3scan ${WRKSRC}/lxac3scan.c
-.if ${OSVERSION} > 500000
-.for f in ${VAMPSRC}
-	${CC} ${CFLAGS} -c ${WRKSRC}/vamps/${f} -o ${WRKSRC}/vamps/${f:C/\.c$/.o/}
-.endfor
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/vamps/vamps ${VAMPSRC:C/(.*)\.c$/${WRKSRC}\/vamps\/\1.o/}
-.endif
 
 do-install:
 .for f in lxdvdrip lxac3scan
@@ -67,13 +63,12 @@
 .if !exists(${PREFIX}/etc/lxdvdrip.conf)
 	${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.EN ${PREFIX}/etc/lxdvdrip.conf
 .endif
-.if ${OSVERSION} > 500000
-	${INSTALL_PROGRAM} ${WRKSRC}/vamps/vamps ${PREFIX}/bin
-.endif
 	@${MKDIR} ${EXAMPLESDIR}
 .for f in lxdvdrip.conf.DE lxdvdrip.conf.EN lxdvdrip.conf.FR
 	${INSTALL_DATA} ${WRKSRC}/doc-pak/${f} ${EXAMPLESDIR}
 .endfor
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.wav ${DATADIR}
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff -urN multimedia/lxdvdrip.orig/distinfo multimedia/lxdvdrip/distinfo
--- multimedia/lxdvdrip.orig/distinfo	Sat Jan  7 17:54:38 2006
+++ multimedia/lxdvdrip/distinfo	Sat Jan  7 17:54:50 2006
@@ -1,2 +1,3 @@
-MD5 (lxdvdrip-1.47.tgz) = 793a3d37e98c329b6392e32ad1a04bb4
-SIZE (lxdvdrip-1.47.tgz) = 514792
+MD5 (lxdvdrip-1.51.tgz) = 712f05e604ba52579f6d77df7d1945cd
+SHA256 (lxdvdrip-1.51.tgz) = c26a8c1a3e3966684d3fe0e4e541cfc997e7f7fe16a84db83606013e4f8b6e5c
+SIZE (lxdvdrip-1.51.tgz) = 524189
diff -urN multimedia/lxdvdrip.orig/pkg-plist multimedia/lxdvdrip/pkg-plist
--- multimedia/lxdvdrip.orig/pkg-plist	Sat Jan  7 17:54:38 2006
+++ multimedia/lxdvdrip/pkg-plist	Sat Jan  7 17:54:50 2006
@@ -1,6 +1,5 @@
 bin/lxdvdrip
 bin/lxac3scan
-%%VAMPS%%bin/vamps
 @unexec if cmp -s %D/etc/lxdvdrip.conf %D/etc/lxdvdrip.conf.sample; then rm -f %D/etc/lxdvdrip.conf; fi
 etc/lxdvdrip.conf.sample
 @exec [ -f %B/lxdvdrip.conf ] || cp %B/%f %B/lxdvdrip.conf
--- patch-lxdvdrip.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1EvNN1-0003bA-UX>