mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
Update to 1.0.1
This commit is contained in:
Mario Sergio Fujikawa Ferreira
parent
ffb63ffb23
commit
075fbb61a1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=179394
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= vobcopy
|
||||
PORTVERSION= 0.5.16
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.0.1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://lpn.rnbhq.org/download/
|
||||
|
||||
@ -52,8 +51,10 @@ post-patch:
|
||||
-e 's|FreeBSD_Version|FreeBSD_version|' \
|
||||
${WRKSRC}/dvd.c
|
||||
# no such flag under FreeBSD
|
||||
# fdatasync(2) -> fsync(2)
|
||||
@${REINPLACE_CMD} -E \
|
||||
-e 's|O_LARGEFILE|0|' \
|
||||
-e 's|fdatasync|fsync|g' \
|
||||
${WRKSRC}/vobcopy.c
|
||||
|
||||
post-configure:
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (vobcopy-0.5.16.tar.bz2) = b36267dd8bc5b4aabb1ac1217fc8183b
|
||||
SHA256 (vobcopy-0.5.16.tar.bz2) = 08aa16c6cde587c1fc83c6a1942b89e885c260476d370105203e10d24e9c376f
|
||||
SIZE (vobcopy-0.5.16.tar.bz2) = 39087
|
||||
MD5 (vobcopy-1.0.1.tar.bz2) = 0fae0c80dbe3a9dd3d06aba54275cf8d
|
||||
SHA256 (vobcopy-1.0.1.tar.bz2) = aa6955b67324e27a78d8cadf9cd597ac1bd406a949e3144422c6542eeb94428a
|
||||
SIZE (vobcopy-1.0.1.tar.bz2) = 44094
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
--- dvd.c.orig Wed Dec 7 21:31:56 2005
|
||||
+++ dvd.c Wed Feb 1 22:23:15 2006
|
||||
@@ -692,28 +692,6 @@
|
||||
/* fprintf(stderr,"debug: vob_size: %lli\n",buf.st_size); */
|
||||
}
|
||||
--- dvd.c.orig Tue Dec 5 00:06:52 2006
|
||||
+++ dvd.c Tue Dec 5 00:09:54 2006
|
||||
@@ -637,21 +637,6 @@
|
||||
return ( off_t ) vob_size;
|
||||
}
|
||||
- strcpy( stat_path, path_to_vobs3 );
|
||||
- strcat( stat_path, "_1.vob" );
|
||||
|
||||
- sprintf( stat_path, "%s_1.vob", path_to_vobs3 );
|
||||
- if( ( tmp_streamin1 = fopen( stat_path, "r" ) ) != NULL ) /*check if this path is correct */
|
||||
- {
|
||||
- fclose ( tmp_streamin1 );
|
||||
@ -14,18 +13,12 @@
|
||||
- {
|
||||
- /* adjust path for next subvob */
|
||||
- subvob++;
|
||||
- strcpy( stat_path, path_to_vobs3 );
|
||||
- strcat( stat_path, "_" );
|
||||
- sprintf( temp1, "%d", subvob );
|
||||
- strcat( stat_path, temp1 );
|
||||
- strcat( stat_path, ".vob" );
|
||||
-
|
||||
- sprintf( stat_path, "%s_%d.vob", path_to_vobs3, subvob );
|
||||
- vob_size += buf.st_size;
|
||||
-/* fprintf(stderr,"debug: vob_size: %lli\n",vob_size); */
|
||||
-/* fprintf(stderr,"debug: vob_size: %lli\n",buf.st_size); */
|
||||
- }
|
||||
- return ( off_t ) vob_size;
|
||||
- }
|
||||
-
|
||||
return ( off_t ) vob_size; /* think that (off_t) is not really needed here?
|
||||
/*none of the above seemed to have caught it, so this is the error return */
|
||||
return ( off_t ) 0; /* think that (off_t) is not really needed here?
|
||||
as it is defined as off_t and the function is
|
||||
also defined as off_t */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- vobcopy.c.orig Wed Dec 7 21:31:56 2005
|
||||
+++ vobcopy.c Sun Jan 8 10:47:02 2006
|
||||
--- vobcopy.c.orig Mon Dec 4 23:50:04 2006
|
||||
+++ vobcopy.c Mon Dec 4 23:52:23 2006
|
||||
@@ -146,6 +146,8 @@
|
||||
#endif
|
||||
|
||||
@ -9,29 +9,3 @@
|
||||
|
||||
/*
|
||||
* the getopt part (getting the options from command line)
|
||||
@@ -1695,8 +1697,12 @@
|
||||
fprintf( stderr, "Used statvfs\n" );
|
||||
#endif
|
||||
temp1 = buf1.f_bavail;
|
||||
+#ifdef USE_STATFS
|
||||
+ temp2 = buf1.f_bsize;
|
||||
+#else
|
||||
/* On Solaris at least, f_bsize is not the actual block size -- lb */
|
||||
temp2 = buf1.f_frsize;
|
||||
+#endif
|
||||
sum = ( ( off_t )temp1 * ( off_t )temp2 );
|
||||
if( verbosity_level >= 1 )
|
||||
{
|
||||
@@ -1733,8 +1739,12 @@
|
||||
fprintf( stderr, "Used statvfs\n" );
|
||||
#endif
|
||||
temp1 = buf2.f_blocks;
|
||||
+#ifdef USE_STATFS
|
||||
+ temp2 = buf2.f_bsize;
|
||||
+#else
|
||||
/* On Solaris at least, f_bsize is not the actual block size -- lb */
|
||||
temp2 = buf2.f_frsize;
|
||||
+#endif
|
||||
sum = ( ( off_t )temp1 * ( off_t )temp2 );
|
||||
if( verbosity_level >= 1 )
|
||||
{
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- vobcopy.h.orig Wed Dec 7 21:32:10 2005
|
||||
+++ vobcopy.h Sun Jan 8 15:26:43 2006
|
||||
--- vobcopy.h.orig Mon Nov 13 19:57:24 2006
|
||||
+++ vobcopy.h Mon Dec 4 23:57:12 2006
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
#if ( defined( __unix__ ) || defined( unix )) && !defined( USG )
|
||||
@ -8,7 +8,7 @@
|
||||
#endif
|
||||
|
||||
#if defined( __GNUC__ ) && \
|
||||
@@ -32,6 +31,8 @@
|
||||
@@ -31,6 +30,8 @@
|
||||
/* by some bugreport:*/
|
||||
#if !( defined( BSD ) && ( BSD >= 199306 ) ) && !defined( sun )
|
||||
#include <stdint.h>
|
||||
@ -17,7 +17,7 @@
|
||||
#endif
|
||||
|
||||
/*for/from play_title.c*/
|
||||
@@ -67,24 +68,23 @@
|
||||
@@ -66,24 +67,23 @@
|
||||
/* ////////// *BSD ////////// */
|
||||
#if ( defined( BSD ) && ( BSD >= 199306 ) )
|
||||
|
||||
@ -50,3 +50,14 @@
|
||||
|
||||
#include <sys/mount.h>
|
||||
#define USE_STATFS_FOR_DEV
|
||||
@@ -170,7 +170,10 @@
|
||||
|
||||
#include "dvd.h"
|
||||
|
||||
+/* BSD already have off_t definition */
|
||||
+#if !(defined(BSD) && (BSD >= 199306))
|
||||
#define off_t __off64_t
|
||||
+#endif
|
||||
|
||||
void usage(char *);
|
||||
int add_end_slash( char * );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user