From 12165a9f0cf456be17f52cf1b1332b700a2686de Mon Sep 17 00:00:00 2001 From: ehaupt Date: Tue, 18 Oct 2005 20:27:08 +0000 Subject: - Update to 1.47 - Add multimedia/mpgtx to RUN_DEPENDS (requrired since 1.30) - Cleanup Makefile - Pass maintainership to submitter PR: 87569 Submitted by: Serge Gagnon Reworked by: ehaupt --- multimedia/lxdvdrip/Makefile | 50 +++++++++++++++++--------- multimedia/lxdvdrip/distinfo | 4 +-- multimedia/lxdvdrip/files/patch-vamps-Makefile | 35 ------------------ multimedia/lxdvdrip/pkg-plist | 21 ++++------- 4 files changed, 42 insertions(+), 68 deletions(-) delete mode 100644 multimedia/lxdvdrip/files/patch-vamps-Makefile (limited to 'multimedia/lxdvdrip') diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile index 36da00aabcb8..f2d9b9e73600 100644 --- a/multimedia/lxdvdrip/Makefile +++ b/multimedia/lxdvdrip/Makefile @@ -6,30 +6,35 @@ # PORTNAME= lxdvdrip -PORTVERSION= 1.46 -PORTREVISION= 1 +PORTVERSION= 1.47 CATEGORIES= multimedia MASTER_SITES= http://download.berlios.de/lxdvdrip/ EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= serge.gagnon@b2b2c.ca 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 + growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ + mpgtx:${PORTSDIR}/multimedia/mpgtx SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message WRKSRC= ${WRKDIR}/${PORTNAME} +VAMPSRC= vamps.c requant.c +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm +PORTDOCS= Changelog.de Changelog.en Changelog.fr \ + README.de README.en README.fr \ + README.dvdwizard.DE README.dvdwizard.EN README.dvdwizard.FR \ + TODO freebsd.doc MAN1= lxdvdrip.1 -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" - .include # vamps needs strtof() @@ -40,27 +45,40 @@ 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} ${LDFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c + ${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/lxac3scan ${WRKSRC}/lxac3scan.c .if ${OSVERSION} > 500000 - (cd ${WRKSRC}/vamps; \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}); +.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: - ${INSTALL_PROGRAM} ${WRKSRC}/lxdvdrip ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/lxac3scan ${PREFIX}/bin +.for f in lxdvdrip lxac3scan + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin +.endfor ${INSTALL_MAN} ${WRKSRC}/lxdvdrip.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.* ${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.EN ${PREFIX}/etc/lxdvdrip.conf.sample +.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 + .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc-pak && ${CP} Changelog* README.* TODO freebsd.doc ${DOCSDIR} +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc-pak/${f} ${DOCSDIR} +.endfor .endif + +post-install: @${CAT} ${PKGMESSAGE} .include diff --git a/multimedia/lxdvdrip/distinfo b/multimedia/lxdvdrip/distinfo index 8803cb022dc2..f03dedbdc95e 100644 --- a/multimedia/lxdvdrip/distinfo +++ b/multimedia/lxdvdrip/distinfo @@ -1,2 +1,2 @@ -MD5 (lxdvdrip-1.46.tgz) = 025fc4b3c1de1a716a579b90fd9bb1b6 -SIZE (lxdvdrip-1.46.tgz) = 512236 +MD5 (lxdvdrip-1.47.tgz) = 793a3d37e98c329b6392e32ad1a04bb4 +SIZE (lxdvdrip-1.47.tgz) = 514792 diff --git a/multimedia/lxdvdrip/files/patch-vamps-Makefile b/multimedia/lxdvdrip/files/patch-vamps-Makefile deleted file mode 100644 index 7379fa60ed7d..000000000000 --- a/multimedia/lxdvdrip/files/patch-vamps-Makefile +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 d515f95be92c..daa91471172f 100644 --- a/multimedia/lxdvdrip/pkg-plist +++ b/multimedia/lxdvdrip/pkg-plist @@ -1,18 +1,9 @@ bin/lxdvdrip bin/lxac3scan %%VAMPS%%bin/vamps -etc/lxdvdrip.conf.DE -etc/lxdvdrip.conf.EN -etc/lxdvdrip.conf.FR -%%PORTDOCS%%%%DOCSDIR%%/Changelog.de -%%PORTDOCS%%%%DOCSDIR%%/Changelog.en -%%PORTDOCS%%%%DOCSDIR%%/Changelog.fr -%%PORTDOCS%%%%DOCSDIR%%/README.de -%%PORTDOCS%%%%DOCSDIR%%/README.dvdwizard.DE -%%PORTDOCS%%%%DOCSDIR%%/README.dvdwizard.EN -%%PORTDOCS%%%%DOCSDIR%%/README.dvdwizard.FR -%%PORTDOCS%%%%DOCSDIR%%/README.en -%%PORTDOCS%%%%DOCSDIR%%/README.fr -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/freebsd.doc -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@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 +%%EXAMPLESDIR%%/lxdvdrip.conf.DE +%%EXAMPLESDIR%%/lxdvdrip.conf.EN +%%EXAMPLESDIR%%/lxdvdrip.conf.FR -- cgit