- Add run dependencies on streamdvd, transcode, dvdauthor, dvd+rw-tools

- Compile and install vamps on FreeBSD 5.X and newer

PR:		ports/85720 (based on)
Submitted by:	Serge Gagnon <serge.gagnon@b2b2c.ca>

3 files changed, 61 insertions, 2 deletions

diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index 937b4594d1a9..36da00aabcb8 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lxdvdrip
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/lxdvdrip/
 EXTRACT_SUFX=	.tgz
@@ -15,6 +16,10 @@ 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=	streamdvd:${PORTSDIR}/multimedia/streamdvd \
+		transcode:${PORTSDIR}/multimedia/transcode \
+		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
+		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -23,21 +28,39 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN1=		lxdvdrip.1
 
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+.include <bsd.port.pre.mk>
+
+# vamps needs strtof()
+.if ${OSVERSION} > 500000
+PLIST_SUB=	VAMPS=""
+.else
+PLIST_SUB=	VAMPS="@comment "
+.endif
+
 do-build:
 	(cd ${WRKSRC}; \
 	${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
 	-ldvdread -lm -o lxdvdrip lxdvdrip.c; \
-	${CC} ${CFLAGS} -lm -o lxac3scan lxac3scan.c)
+	${CC} ${CFLAGS} -lm -o lxac3scan lxac3scan.c);
+.if ${OSVERSION} > 500000
+	(cd ${WRKSRC}/vamps; \
+	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET});
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lxdvdrip ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/lxac3scan ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/lxdvdrip.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.* ${PREFIX}/etc
+.if ${OSVERSION} > 500000
+	${INSTALL_PROGRAM} ${WRKSRC}/vamps/vamps ${PREFIX}/bin
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc-pak && ${CP} Changelog* README.* TODO freebsd.doc ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/lxdvdrip/files/patch-vamps-Makefile b/multimedia/lxdvdrip/files/patch-vamps-Makefile
new file mode 100644
index 000000000000..7379fa60ed7d
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-vamps-Makefile
@@ -0,0 +1,35 @@
+--- vamps/Makefile.orig	Wed Sep 15 21:21:37 2004
++++ vamps/Makefile	Sat Sep 10 18:48:20 2005
+@@ -12,23 +12,20 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ 
+-CC     = gcc
+-CFLAGS = -Wall -O3 -fomit-frame-pointer -fexpensive-optimizations \
+-         -funroll-loops -march=i686 -mcpu=i686 -falign-functions=4
+-STATIC =
+-STRIP  = strip
++CC?= cc
+ 
++STATIC =
+ 
+-all:			vamps
++all:	vamps
+ 
+-vamps:			vamps.o requant.o
+-			$(CC) -o $@ $(STATIC) vamps.o requant.o -lpthread
+-			$(STRIP) $@
++vamps:	vamps.o requant.o
++	$(CC) -o $@ $(STATIC) vamps.o requant.o ${PTHREAD_LIBS} -lm
+ 
+-requant.o:		requant.h putvlc.h getvlc.h
++requant.o:	requant.h putvlc.h getvlc.h
+ 
+ clean:
+-			rm -f vamps vamps.o requant.o 
++	rm -f vamps vamps.o requant.o
+ 
+ install:
+-			cp vamps /usr/local/bin 
++	cp vamps /usr/local/bin
++
diff --git a/multimedia/lxdvdrip/pkg-plist b/multimedia/lxdvdrip/pkg-plist
index f96cb114e768..d515f95be92c 100644
--- a/multimedia/lxdvdrip/pkg-plist
+++ b/multimedia/lxdvdrip/pkg-plist
@@ -1,5 +1,6 @@
 bin/lxdvdrip
 bin/lxac3scan
+%%VAMPS%%bin/vamps
 etc/lxdvdrip.conf.DE
 etc/lxdvdrip.conf.EN
 etc/lxdvdrip.conf.FR