1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-15 07:56:36 +00:00

Update to 1.1.1

PR:		ports/123283
Submitted by:	maintainer
This commit is contained in:
Ion-Mihai Tetcu 2008-05-05 16:55:12 +00:00
parent 77bd3af976
commit 90ce3c3996
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=212676
3 changed files with 28 additions and 63 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= vobcopy
PORTVERSION= 1.0.2
PORTVERSION= 1.1.1
CATEGORIES= sysutils
MASTER_SITES= http://lpn.rnbhq.org/download/
@ -25,7 +25,7 @@ ALL_TARGET= ${PORTNAME}
MAN1= vobcopy.1
PLIST_FILES= bin/vobcopy
PORTDOCS= COPYING Changelog README Release-Notes TODO \
PORTDOCS= Changelog FAQ README THANKS TODO \
alternative_programs.txt
.include <bsd.port.pre.mk>

View File

@ -1,3 +1,3 @@
MD5 (vobcopy-1.0.2.tar.bz2) = 8bc06614d4e8131b13faa1339cdb0b64
SHA256 (vobcopy-1.0.2.tar.bz2) = b17637d0cdaa8ed7a45ef53c46d2ac47cdbc75d5e5ab6c38797320005d7d42ed
SIZE (vobcopy-1.0.2.tar.bz2) = 43626
MD5 (vobcopy-1.1.1.tar.bz2) = f3331ff362c8f271731944b1a9dea108
SHA256 (vobcopy-1.1.1.tar.bz2) = 4c7ddc3f7618d72c579c2d708df96ca54757420feaa56b9b3546c73787b90583
SIZE (vobcopy-1.1.1.tar.bz2) = 43362

View File

@ -1,63 +1,28 @@
--- 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 )
#include <sys/param.h>
-#else
#endif
#if defined( __GNUC__ ) && \
@@ -31,6 +30,8 @@
/* by some bugreport:*/
#if !( defined( BSD ) && ( BSD >= 199306 ) ) && !defined( sun )
#include <stdint.h>
+#else
+#include <inttypes.h>
#endif
/*for/from play_title.c*/
@@ -66,24 +67,23 @@
-- vobcopy.h.orig 2008-04-13 14:01:03.000000000 +0000
+++ vobcopy.h 2008-04-13 14:08:18.000000000 +0000
@@ -58,7 +58,7 @@
/* ////////// *BSD ////////// */
#if ( defined( BSD ) && ( BSD >= 199306 ) )
-# if !defined( __NetBSD__ ) ) || \
- ( defined( __NetBSD__) && ( __NetBSD_Version__ < 200040000 ) )
-#include <sys/mount.h>
-#define USE_STATFS 1
+# if ( defined( __NetBSD__) && ( __NetBSD_Version__ < 200040000 ) ) || \
+ ( defined( __FreeBSD__) && ( __FreeBSD_version >= 500040 ) )
+#include <sys/statvfs.h>
# else
-#include <sys/statvfs.h>
+#include <sys/mount.h>
+#define USE_STATFS 1
# endif
-# if defined(NetBSD)
-
-#include <sys/param.h>
+# if defined(__NetBSD__) || defined(__FreeBSD__)
#define USE_GETMNTINFO
-# if ( __NetBSD_Version__ < 200040000 )
+# if (defined( __NetBSD__ ) && ( __NetBSD_Version__ < 200040000 )) || \
+ (defined( __FreeBSD__ ))
+# if ! ( defined( __NetBSD__ ) ) || \
( defined( __NetBSD__) && ( __NetBSD_Version__ < 200040000 ) )
#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
#define USE_STATFS 1
@@ -87,12 +87,13 @@
#define GETMNTINFO_USES_STATVFS
# endif
+# endif
-# else
-
+#if defined(__FreeBSD__)
+#include <sys/statvfs.h>
+#else
#include <sys/vfs.h>
-
-# endif
+#endif
void usage(char *);
int add_end_slash( char * );
#define HAS_LARGEFILE 1