[Midnightbsd-cvs] mports: devel/libvolume_id: Update to .75

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to .75

Modified Files:
--------------
    mports/devel/libvolume_id:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)

Added Files:
-----------
    mports/devel/libvolume_id/files:
        patch-fat.c (r1.1)

Removed Files:
-------------
    mports/devel/libvolume_id/files:
        patch-udf.c

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/libvolume_id/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/libvolume_id/Makefile -L devel/libvolume_id/Makefile -u -r1.1 -r1.2
--- devel/libvolume_id/Makefile
+++ devel/libvolume_id/Makefile
@@ -6,13 +6,14 @@
 # $FreeBSD: ports/devel/libvolume_id/Makefile,v 1.3 2007/01/13 21:37:38 marcus Exp $
 
 PORTNAME=	libvolume_id
-PORTVERSION=	0.71.0
+PORTVERSION=	0.75.0
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.marcuscom.com/downloads/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Library to provide file system type information
+LICENSE=	gpl2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/libvolume_id/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/libvolume_id/distinfo -L devel/libvolume_id/distinfo -u -r1.1 -r1.2
--- devel/libvolume_id/distinfo
+++ devel/libvolume_id/distinfo
@@ -1,3 +1,3 @@
-MD5 (libvolume_id-0.71.0.tar.bz2) = 7a27f133d6c441801bc0626c2393cdcf
-SHA256 (libvolume_id-0.71.0.tar.bz2) = 65446fa12c2556cea6cab3cd406d0bb9a6e672894f89ff84e168c8add9ce1038
-SIZE (libvolume_id-0.71.0.tar.bz2) = 18951
+MD5 (libvolume_id-0.75.0.tar.bz2) = 804d222ea29b9401fb4a6ba00a22b072
+SHA256 (libvolume_id-0.75.0.tar.bz2) = 54072554468f732e60dae024947efaa880cf7847df2651b6dfcc16f2a58832d8
+SIZE (libvolume_id-0.75.0.tar.bz2) = 19408
--- devel/libvolume_id/files/patch-udf.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- udf.c.orig	Sat Jan 13 16:35:48 2007
-+++ udf.c	Sat Jan 13 16:36:03 2007
-@@ -127,7 +127,7 @@ nsr:
- 
- anchor:
- 	/* read anchor volume descriptor */
--	vd = (struct volume_descriptor *) volume_id_get_buffer(id, off + (256 * bs), 0x200);
-+	vd = (struct volume_descriptor *) volume_id_get_buffer(id, off + (256 * bs), bs);
- 	if (vd == NULL)
- 		return -1;
- 
-@@ -142,7 +142,7 @@ anchor:
- 
- 	/* pick the primary descriptor from the list */
- 	for (b = 0; b < count; b++) {
--		vd = (struct volume_descriptor *) volume_id_get_buffer(id, off + ((loc + b) * bs), 0x200);
-+		vd = (struct volume_descriptor *) volume_id_get_buffer(id, off + ((loc + b) * bs), bs);
- 		if (vd == NULL)
- 			return -1;
- 
--- /dev/null
+++ devel/libvolume_id/files/patch-fat.c
@@ -0,0 +1,38 @@
+--- fat.c.orig	Wed May 30 16:16:49 2007
++++ fat.c	Wed May 30 16:17:12 2007
+@@ -277,7 +277,7 @@ magic:
+ 
+ 	label = get_attr_volume_id(dir, root_dir_entries);
+ 
+-	vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
++	vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
+ 	if (vs == NULL)
+ 		return -1;
+ 
+@@ -294,7 +294,7 @@ magic:
+ fat32:
+ 	/* FAT32 should have a valid signature in the fsinfo block */
+ 	fsinfo_sect = le16_to_cpu(vs->type.fat32.fsinfo_sector);
+-	buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), 0x200);
++	buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), sector_size);
+ 	if (buf == NULL)
+ 		return -1;
+ 	fsinfo = (struct fat32_fsinfo *) buf;
+@@ -303,7 +303,7 @@ fat32:
+ 	if (memcmp(fsinfo->signature2, "\x72\x72\x41\x61", 4) != 0)
+ 		err("Found invalid signature2: 0x%08x", fsinfo->signature2);
+ 
+-	vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
++	vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
+ 	if (vs == NULL)
+ 		return -1;
+ 
+@@ -355,7 +355,7 @@ fat32:
+ 	if (maxloop == 0)
+ 		dbg("reached maximum follow count of root cluster chain, give up");
+ 
+-	vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
++	vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
+ 	if (vs == NULL)
+ 		return -1;
+