11 files changed, 237 insertions, 21 deletions

diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index 5b4b7d8703b3..08f3122bbac6 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lxdvdrip
-PORTVERSION=	1.51
-PORTREVISION=	3
+PORTVERSION=	1.62
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/lxdvdrip/ \
 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
@@ -16,10 +15,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Command Line Tool to make a copy from a Video DVD
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav \
+		dvdread.3:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	buffer:${PORTSDIR}/misc/buffer \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		dvdbackup:${PORTSDIR}/sysutils/dvdbackup \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		mpgtx:${PORTSDIR}/multimedia/mpgtx \
 		mplayer:${PORTSDIR}/multimedia/mplayer \
@@ -30,9 +29,22 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 VAMPSRC=	vamps.c requant.c
-LXDVDRIPSRC=	${PORTNAME}.c streamanalyze.c
+LXDVDRIPSRC=	cputest.c \
+		dvdbackup.c \
+		dvdcell.c \
+		dvdcopy.c \
+		dvdinfo.c \
+		dvdtools.c \
+		ifo.c \
+		lxdvdrip.c \
+		requant.c \
+		streamanalyze.c \
+		systools.c \
+		tcmemcpy.c \
+		vaporize.c
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	Changelog.de Changelog.en Changelog.fr \
 		README.de  README.en README.fr \
@@ -53,17 +65,20 @@ post-patch:
 		-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} ${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_${PORTNAME} ${VAMPSRC:C/(.*)\.c$/${WRKSRC}\/vamps\/\1.o/}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/vamps/play_cell_${PORTNAME} ${WRKSRC}/vamps/play_cell.c
-.endif
+	@${REINPLACE_CMD} -E \
+		-e 's|^.+alloca.h.+$$||' \
+		${WRKSRC}/dvdbackup.c
+	@${REINPLACE_CMD} -E \
+		-e 's|fopen64|fopen|' \
+		${WRKSRC}/dvdinfo.c \
+		${WRKSRC}/lxdvdrip.c
+	@${REINPLACE_CMD} -E \
+		-e 's|stat64|stat|' \
+		${WRKSRC}/systools.c
+	@${REINPLACE_CMD} -E \
+		-e 's|uint([[:space:]]+)|unsigned int\1|g' \
+		-e 's|int([[:digit:]]+)|int\1_t|' \
+		${WRKSRC}/vamps/requant.c
 
 do-install:
 .for f in lxdvdrip lxac3scan
@@ -74,17 +89,21 @@ do-install:
 .if !exists(${PREFIX}/etc/lxdvdrip.conf)
 	${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.EN ${PREFIX}/etc/lxdvdrip.conf
 .endif
+# binaries
 .if ${OSVERSION} > 500000
 	${INSTALL_PROGRAM} ${WRKSRC}/vamps/vamps_${PORTNAME} ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vamps/play_cell_${PORTNAME} ${PREFIX}/bin
 .endif
+	${INSTALL_PROGRAM} ${WRKSRC}/dvdbackup/dvdbackup_${PORTNAME} ${PREFIX}/bin
+# examples
 	@${MKDIR} ${EXAMPLESDIR}
 .for f in lxdvdrip.conf.DE lxdvdrip.conf.EN lxdvdrip.conf.FR
 	${INSTALL_DATA} ${WRKSRC}/doc-pak/${f} ${EXAMPLESDIR}
 .endfor
+# data
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.wav ${DATADIR}
-
+# docs
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/multimedia/lxdvdrip/distinfo b/multimedia/lxdvdrip/distinfo
index 004139ce4ea5..1806213f030c 100644
--- a/multimedia/lxdvdrip/distinfo
+++ b/multimedia/lxdvdrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (lxdvdrip-1.51.tgz) = 712f05e604ba52579f6d77df7d1945cd
-SHA256 (lxdvdrip-1.51.tgz) = c26a8c1a3e3966684d3fe0e4e541cfc997e7f7fe16a84db83606013e4f8b6e5c
-SIZE (lxdvdrip-1.51.tgz) = 524189
+MD5 (lxdvdrip-1.62.tgz) = 345843a50b1ef0a9d8df01951d3373d9
+SHA256 (lxdvdrip-1.62.tgz) = 53f1dca6c4eb9eebf826ebc501c15ec6f8bed8d290379c135618a2604a5bc29c
+SIZE (lxdvdrip-1.62.tgz) = 605497
diff --git a/multimedia/lxdvdrip/files/patch-Makefile b/multimedia/lxdvdrip/files/patch-Makefile
new file mode 100644
index 000000000000..87fb93095eb2
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile.orig	Thu May  4 16:36:46 2006
++++ Makefile	Sat Dec 16 14:00:55 2006
+@@ -4,10 +4,10 @@
+ HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
+ 
+ all:
+-	gcc -g -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c
+-	gcc -g -lm -o lxac3scan lxac3scan.c
+-	cd vamps && make && cd ..
+-	cd dvdbackup && make && cd ..
++	${CC} -L${LOCALBASE}/lib -I${LOCALBASE}/include ${CFLAGS} -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c
++	${CC} -L${LOCALBASE}/lib -I${LOCALBASE}/include ${CFLAGS} -lm -o lxac3scan lxac3scan.c
++	cd vamps && make all && cd ..
++	cd dvdbackup && make all && cd ..
+ 
+ clean: 
+ 	rm -f lxdvdrip lxac3scan *.o
diff --git a/multimedia/lxdvdrip/files/patch-bswap.h b/multimedia/lxdvdrip/files/patch-bswap.h
new file mode 100644
index 000000000000..539a2bc7c368
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-bswap.h
@@ -0,0 +1,11 @@
+--- bswap.h.orig	Fri Dec 15 14:17:04 2006
++++ bswap.h	Fri Dec 15 14:19:58 2006
+@@ -29,7 +29,7 @@
+ #else 
+ 
+ /* For __FreeBSD_version */
+-#if defined(HAVE_SYS_PARAM_H)
++#if defined(HAVE_SYS_PARAM_H) || ((defined(__unix__) || defined(unix)) && !defined(USG))
+ #include <sys/param.h>
+ #endif
+ 
diff --git a/multimedia/lxdvdrip/files/patch-dvdbackup__Makefile b/multimedia/lxdvdrip/files/patch-dvdbackup__Makefile
new file mode 100644
index 000000000000..98db6b7a5ca8
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-dvdbackup__Makefile
@@ -0,0 +1,22 @@
+--- dvdbackup/Makefile.orig	Thu May  4 15:55:26 2006
++++ dvdbackup/Makefile	Sat Dec 16 14:05:20 2006
+@@ -2,10 +2,8 @@
+ #
+ 
+ 
+-PREFIX    ?= /usr/local
+ 
+-CC         = gcc
+-CFLAGS    ?= -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
++CFLAGS    += -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ 	       -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
+ CFLAGS    += -Wall
+ LDFLAGS   += -s
+@@ -17,6 +15,7 @@
+ all:			dvdbackup_lxdvdrip
+ 
+ dvdbackup_lxdvdrip:	dvdbackup_lxdvdrip.o
++		${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ 
+ install:	all
+ 		$(INSTALL) -d $(PREFIX)/bin
diff --git a/multimedia/lxdvdrip/files/patch-dvdbackup__dvdbackup_lxdvdrip.c b/multimedia/lxdvdrip/files/patch-dvdbackup__dvdbackup_lxdvdrip.c
new file mode 100644
index 000000000000..cc438647da7a
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-dvdbackup__dvdbackup_lxdvdrip.c
@@ -0,0 +1,15 @@
+--- dvdbackup/dvdbackup_lxdvdrip.c.orig	Sat Dec 16 13:51:34 2006
++++ dvdbackup/dvdbackup_lxdvdrip.c	Sat Dec 16 13:51:54 2006
+@@ -2382,9 +2382,9 @@
+ 
+ 	/* Switches */
+ 	int title_set = 0;
+-	int titles;
+-	int start_chapter;
+-	int end_chapter;
++	int titles = 0;
++	int start_chapter = 0;
++	int end_chapter = 0;
+ 
+ 	int do_mirror = 0;
+ 	int do_title_set = 0;
diff --git a/multimedia/lxdvdrip/files/patch-systools.c b/multimedia/lxdvdrip/files/patch-systools.c
new file mode 100644
index 000000000000..e70fbd019067
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-systools.c
@@ -0,0 +1,26 @@
+--- systools.c.orig	Fri Dec 15 14:15:09 2006
++++ systools.c	Sat Dec 16 13:06:19 2006
+@@ -11,6 +11,10 @@
+ ================================================================================
+ 
+ ==============================================================================*/
++#if defined(HAVE_SYS_PARAM_H) || ((defined(__unix__) || defined(unix)) && !defined(USG))
++#include <sys/param.h>
++#endif
++
+ #define __USE_LARGEFILE64
+ #define _LARGEFILE64_SOURCE
+ #include <stdio.h>
+@@ -18,7 +22,12 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#if (defined(BSD) && (BSD >= 199306))
++#include <sys/param.h>
++#include <sys/mount.h>
++#else
+ #include <sys/statfs.h>
++#endif
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
diff --git a/multimedia/lxdvdrip/files/patch-vamps__Makefile b/multimedia/lxdvdrip/files/patch-vamps__Makefile
new file mode 100644
index 000000000000..e5092a465d6c
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-vamps__Makefile
@@ -0,0 +1,35 @@
+--- vamps/Makefile.orig	Sat Mar 11 19:49:54 2006
++++ vamps/Makefile	Sat Dec 16 14:07:04 2006
+@@ -15,14 +15,12 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+ 
+-PREFIX    ?= /usr/local
+ 
+-CC         = gcc
+-CFLAGS    ?= -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
++CFLAGS    += -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ 	       -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
+ CFLAGS    += -Wall
+ LDFLAGS   += -s
+-LOADLIBES += -lm -lpthread -ldvdread
++LOADLIBES += -lm -ldvdread
+ 
+ INSTALL   ?= install
+ 
+@@ -30,6 +28,7 @@
+ all:			vamps_lxdvdrip play_cell_lxdvdrip
+ 
+ vamps_lxdvdrip:		vamps_lxdvdrip.o requant.o cputest.o tcmemcpy.o strlcpy.o strlcat.o
++			${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ 
+ vamps_lxdvdrip.o:	ac.h requant.h
+ 
+@@ -44,6 +43,7 @@
+ strlcat.o:		ac.h libtc.h
+ 
+ play_cell_lxdvdrip:	play_cell_lxdvdrip.o tcmemcpy.o cputest.o strlcpy.o strlcat.o
++			${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ 
+ play_cell_lxdvdrip.o:	ac.h libtc.h
+ 
diff --git a/multimedia/lxdvdrip/files/patch-vamps__lxdvdrip.c b/multimedia/lxdvdrip/files/patch-vamps__lxdvdrip.c
new file mode 100644
index 000000000000..c74ef1f5ac80
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-vamps__lxdvdrip.c
@@ -0,0 +1,13 @@
+--- vamps/vamps_lxdvdrip.c.orig	Sat Dec 16 13:49:31 2006
++++ vamps/vamps_lxdvdrip.c	Sat Dec 16 13:50:13 2006
+@@ -88,6 +88,10 @@
+ #include <inttypes.h>
+ #include <sys/stat.h>
+ 
++// strtoull(3)
++#include <stdlib.h>
++#include <limits.h>
++
+ #include "ac.h"
+ 
+ 
diff --git a/multimedia/lxdvdrip/files/patch-vamps__requant.c b/multimedia/lxdvdrip/files/patch-vamps__requant.c
new file mode 100644
index 000000000000..c162118a1281
--- /dev/null
+++ b/multimedia/lxdvdrip/files/patch-vamps__requant.c
@@ -0,0 +1,57 @@
+--- vamps/requant.c.orig	Mon Mar  6 16:50:05 2006
++++ vamps/requant.c	Sat Dec 16 13:48:39 2006
+@@ -66,6 +66,7 @@
+ #include <string.h>
+ #include <assert.h>
+ #include <math.h>
++#include <inttypes.h>
+ 
+ #ifndef USE_FD
+ #include <unistd.h>
+@@ -98,37 +99,6 @@
+ 	#define unlikely(x) (x)
+ #endif
+ 
+-// user defined types
+-//typedef unsigned int		uint;
+-typedef unsigned char		uint8;
+-typedef unsigned short		uint16;
+-typedef unsigned int		uint32;
+-#ifdef WIN
+-typedef __int64				uint64;
+-#else
+-typedef unsigned long long	uint64;
+-#endif
+-
+-typedef char				int8;
+-typedef short				int16;
+-typedef int					int32;
+-#ifdef WIN
+-typedef __int64				int64;
+-#else
+-typedef long long			int64;
+-#endif
+-
+-
+-typedef signed int			sint;
+-typedef signed char			sint8;
+-typedef signed short		sint16;
+-typedef signed int			sint32;
+-#ifdef WIN
+-typedef __int64				sint64;
+-#else
+-typedef signed long long	sint64;
+-#endif
+-
+ #define BITS_IN_BUF (8)
+ 
+ 
+@@ -661,7 +631,7 @@
+ 	{
+ 		putbits(1l, 6); /* Escape */
+ 		putbits(run, 6); /* 6 bit code for run */
+-		putbits(((uint)signed_level) & 0xFFF, 12);
++		putbits(((unsigned int)signed_level) & 0xFFF, 12);
+ 	}
+ 	
+ 	return 0;
diff --git a/multimedia/lxdvdrip/pkg-plist b/multimedia/lxdvdrip/pkg-plist
index af02aa58e988..60f7a121a039 100644
--- a/multimedia/lxdvdrip/pkg-plist
+++ b/multimedia/lxdvdrip/pkg-plist
@@ -1,5 +1,6 @@
-bin/lxdvdrip
+bin/dvdbackup_lxdvdrip
 bin/lxac3scan
+bin/lxdvdrip
 @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