Date: Sun, 3 Jul 2005 11:31:01 +0200 (CEST) From: Jose M Rodriguez <josemi@freebsd.jazztel.es> To: FreeBSD-gnats-submit@FreeBSD.org Cc: q@galgenberg.net Subject: ports/82917: [PATCH] update multimedia/lxdvdrip to 1.46 Message-ID: <200507030931.j639V1fI049732@redesjm.local> Resent-Message-ID: <200507030940.j639eBBv033969@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82917
>Category: ports
>Synopsis: [PATCH] update multimedia/lxdvdrip to 1.46
>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: Sun Jul 03 09:40:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jose M Rodriguez
>Release: FreeBSD 5.4-RELEASE-p3 i386
>Organization:
RedesJM
>Environment:
System: FreeBSD orion.redesjm.local 5.4-RELEASE-p3 FreeBSD 5.4-RELEASE-p3 #0: Thu Jun 30 23:20:37 CEST 2005 root@orion.redesjm.local:/usr/obj/usr/src/sys/ORION2 i386
>Description:
Update lxdvdrip to 1.46
Install the new lxac3scan program
Install the new lxdvdrip.1 man page
Use ${PREFIX} instead of ${LOCALBASE}
>How-To-Repeat:
>Fix:
--- patch-lxdvdrip begins here ---
diff -Nru /usr/ports/multimedia/lxdvdrip/Makefile multimedia/lxdvdrip/Makefile
--- /usr/ports/multimedia/lxdvdrip/Makefile Fri May 13 22:17:25 2005
+++ multimedia/lxdvdrip/Makefile Sun Jul 3 11:12:31 2005
@@ -6,10 +6,9 @@
#
PORTNAME= lxdvdrip
-PORTVERSION= 1.41
+PORTVERSION= 1.46
CATEGORIES= multimedia
MASTER_SITES= http://download.berlios.de/lxdvdrip/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-3
EXTRACT_SUFX= .tgz
MAINTAINER= q@galgenberg.net
@@ -22,13 +21,19 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
+MAN1= lxdvdrip.1
+
do-build:
- (cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
- -ldvdread -lm -o lxdvdrip lxdvdrip.c)
+ (cd ${WRKSRC}; \
+ ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
+ -ldvdread -lm -o lxdvdrip lxdvdrip.c; \
+ ${CC} ${CFLAGS} -lm -o lxac3scan lxac3scan.c)
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/lxdvdrip ${LOCALBASE}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.* ${LOCALBASE}/etc
+ ${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 !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc-pak && ${CP} Changelog* README.* TODO freebsd.doc ${DOCSDIR}
diff -Nru /usr/ports/multimedia/lxdvdrip/distinfo multimedia/lxdvdrip/distinfo
--- /usr/ports/multimedia/lxdvdrip/distinfo Sat Jan 29 16:00:19 2005
+++ multimedia/lxdvdrip/distinfo Sat Jun 25 08:48:35 2005
@@ -1,2 +1,2 @@
-MD5 (lxdvdrip-1.41-3.tgz) = bd325a8a4a5519a2146a2ca9ecfea3b3
-SIZE (lxdvdrip-1.41-3.tgz) = 456578
+MD5 (lxdvdrip-1.46.tgz) = 025fc4b3c1de1a716a579b90fd9bb1b6
+SIZE (lxdvdrip-1.46.tgz) = 512236
diff -Nru /usr/ports/multimedia/lxdvdrip/files/patch-lxdvdrip.c multimedia/lxdvdrip/files/patch-lxdvdrip.c
--- /usr/ports/multimedia/lxdvdrip/files/patch-lxdvdrip.c Sat Jan 29 16:00:20 2005
+++ multimedia/lxdvdrip/files/patch-lxdvdrip.c Thu Jan 1 01:00:00 1970
@@ -1,94 +0,0 @@
---- lxdvdrip.c.orig Wed Jan 12 23:31:49 2005
-+++ lxdvdrip.c Wed Jan 26 21:31:51 2005
-@@ -229,6 +229,11 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#ifndef __FreeBSD__
-+#include <sys/statfs.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -621,16 +626,19 @@
- // Gibt die Groesse einer Datei zurueck, ohne die stat Beschraenkung auf < 2 GB
- long long filesize64 (char * szFileName)
- {
-+#ifdef __FreeBSD__
-+ struct stat buf;
-+
-+ if (stat(szFileName, &buf) < 0)
-+ return 0LL;
-+
-+ return buf.st_size;
-+#else
- FILE * fp;
- long long lSize;
- char szBuffer[128];
- char szTempl[32] = "/tmp/groesse.lxdvdrip";
--// FreeBSD hat fopen64 als Standard
--#ifdef _FREEBSD
-- fp = (FILE*)fopen (szFileName, "rb");
--#else
- fp = (FILE*)fopen64 (szFileName, "rb");
--#endif
- if (!fp)
- {
- return (long long)0;
-@@ -644,39 +652,28 @@
- system ("rm /tmp/groesse.lxdvdrip");
- lSize = atoll (szBuffer);
- return lSize;
-+#endif
- }
-
- // Berechnet freien Festplattenplatz
- long long calculate_discfree (char * szPfad, long lSprache)
- {
-- char szTempl[32] = "/tmp/lxdf.lxdvdrip";
-- char szBefehl[1024];
-+ struct statfs buf;
- long long lGroesse=0;
-- sprintf (szBefehl, "stat -f %s -c ", szPfad);
-- strcat (szBefehl, "'%a %s' > ");
-- strcat (szBefehl, szTempl);
-- if (system (szBefehl) == 0)
-+
-+ if (statfs(szPfad, &buf) < 0)
-+ return 0;
-+
-+ lGroesse = buf.f_bavail*buf.f_bsize;
-+
-+ switch (lSprache)
- {
-- FILE * fTmp;
-- long long lFrei;
-- long long lBlockGroesse;
-- fTmp = fopen(szTempl,"r");
-- if (fTmp)
-- {
-- fscanf (fTmp, "%lld %lld", &lFrei, &lBlockGroesse);
-- fclose (fTmp);
-- lGroesse = lFrei * lBlockGroesse;
-- }
-- system ("rm /tmp/lxdf.lxdvdrip");
-- switch (lSprache)
-- {
-- case 0: printf ("Frei in %s: %lld Bytes\n", szPfad, lGroesse);
-- break;
-- case 1: printf ("Free in %s: %lld Bytes\n", szPfad, lGroesse);
-- break;
-- case 2: printf ("Espace libre sur %s: %lld octets\n", szPfad, lGroesse);
-- break;
-- }
-+ case 0: printf ("Frei in %s: %lld Bytes\n", szPfad, lGroesse);
-+ break;
-+ case 1: printf ("Free in %s: %lld Bytes\n", szPfad, lGroesse);
-+ break;
-+ case 2: printf ("Espace libre sur %s: %lld octets\n", szPfad, lGroesse);
-+ break;
- }
- return lGroesse;
- }
diff -Nru /usr/ports/multimedia/lxdvdrip/pkg-plist multimedia/lxdvdrip/pkg-plist
--- /usr/ports/multimedia/lxdvdrip/pkg-plist Sat Jan 29 16:00:19 2005
+++ multimedia/lxdvdrip/pkg-plist Sun Jul 3 11:00:00 2005
@@ -1,4 +1,5 @@
bin/lxdvdrip
+bin/lxac3scan
etc/lxdvdrip.conf.DE
etc/lxdvdrip.conf.EN
etc/lxdvdrip.conf.FR
--- patch-lxdvdrip ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507030931.j639V1fI049732>