Attachment #156879 for bug #199993

View | Details | Raw Unified | Return to bug 199993
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	ntfs
PORTVERSION=	2015.3.14
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	http://tuxera.com/opensource/
PKGNAMEPREFIX=	fusefs-

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
CONFLICTS_BUILD=	bonobo-1.*
CONFLICTS_INSTALL=	ntfsprogs-*
USES=		fuse pkgconfig iconv libtool tar:tgz
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
		--disable-mtab --with-fuse=external --disable-ldconfig \
		--enable-crypto --enable-extras
CPPFLAGS+=	-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib


Lines 1-2 Link Here

(-)w/sysutils/fusefs-ntfs/distinfo (-2 / +2 lines)
1	SHA256 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 4c3099400cb14b231a3c9d718b3a8d152d38555059341ce5fc6d02292a4a5b56	1	SHA256 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 97f996015d8316d4a272bd2629978e5e97072dd3cc148ce39802f8037c6538f2
2	SIZE (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575	2	SIZE (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 1210069




 			*) enable_mount_helper="no" ;;
 		esac
 
@@ -9527,7 +9527,7 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
+    freebsd1.*)
       ld_shlibs=no
       ;;
 
@@ -10402,7 +10402,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
+freebsd1.*)
   dynamic_linker=no
   ;;
 
@@ -10413,7 +10413,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[123].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11894,7 +11894,7 @@
 		with_fuse="external"
 		;;




diff --git i/sysutils/fusefs-ntfs/Makefile w/sysutils/fusefs-ntfs/Makefile
index bb7cae8..d3d2c85 100644
--- i/sysutils/fusefs-ntfs/Makefile
+++ w/sysutils/fusefs-ntfs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntfs
-PORTVERSION=	2014.2.15
-PORTREVISION=	2
+PORTVERSION=	2015.3.14
 CATEGORIES=	sysutils
 MASTER_SITES=	http://tuxera.com/opensource/
 PKGNAMEPREFIX=	fusefs-
diff --git i/sysutils/fusefs-ntfs/distinfo w/sysutils/fusefs-ntfs/distinfo
index 112bd68..77af55d 100644
--- i/sysutils/fusefs-ntfs/distinfo
+++ w/sysutils/fusefs-ntfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 4c3099400cb14b231a3c9d718b3a8d152d38555059341ce5fc6d02292a4a5b56
-SIZE (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575
+SHA256 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 97f996015d8316d4a272bd2629978e5e97072dd3cc148ce39802f8037c6538f2
+SIZE (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 1210069
diff --git i/sysutils/fusefs-ntfs/files/patch-configure w/sysutils/fusefs-ntfs/files/patch-configure
index 39fec4d..443dfbc 100644
--- i/sysutils/fusefs-ntfs/files/patch-configure
+++ w/sysutils/fusefs-ntfs/files/patch-configure
@@ -9,33 +9,6 @@
  			*) enable_mount_helper="no" ;;
  		esac
  
-@@ -9527,7 +9527,7 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1.*)
-       ld_shlibs=no
-       ;;
- 
-@@ -10402,7 +10402,7 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -10413,7 +10413,7 @@
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[123].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
 @@ -11894,7 +11894,7 @@
  		with_fuse="external"
  		;;
diff --git i/sysutils/fusefs-ntfs/pkg-plist w/sysutils/fusefs-ntfs/pkg-plist
index 3ef7cef..ee48950 100644
--- i/sysutils/fusefs-ntfs/pkg-plist
+++ w/sysutils/fusefs-ntfs/pkg-plist
@@ -47,8 +47,8 @@ include/ntfs-3g/volume.h
 include/ntfs-3g/xattrs.h
 lib/libntfs-3g.a
 lib/libntfs-3g.so
-lib/libntfs-3g.so.85
-lib/libntfs-3g.so.85.0.0
+lib/libntfs-3g.so.86
+lib/libntfs-3g.so.86.0.0
 libdata/pkgconfig/libntfs-3g.pc
 man/man8/mkntfs.8.gz
 man/man8/ntfs-3g.8.gz

Lines 6-14 bin/ntfs-3g.usermap Link Here

(-)w/sysutils/fusefs-ntfs/pkg-plist (-2 / +11 lines)
6	bin/ntfscat	6	bin/ntfscat
7	bin/ntfscluster	7	bin/ntfscluster
8	bin/ntfscmp	8	bin/ntfscmp
		9	bin/ntfsdecrypt
9	bin/ntfsfix	10	bin/ntfsfix
10	bin/ntfsinfo	11	bin/ntfsinfo
11	bin/ntfsls	12	bin/ntfsls
		13	bin/ntfstruncate
		14	bin/ntfswipe
12	include/ntfs-3g/acls.h	15	include/ntfs-3g/acls.h
13	include/ntfs-3g/attrib.h	16	include/ntfs-3g/attrib.h
14	include/ntfs-3g/attrlist.h	17	include/ntfs-3g/attrlist.h
Lines 22-31 include/ntfs-3g/debug.h Link Here
22	include/ntfs-3g/device.h	25	include/ntfs-3g/device.h
23	include/ntfs-3g/device_io.h	26	include/ntfs-3g/device_io.h
24	include/ntfs-3g/dir.h	27	include/ntfs-3g/dir.h
		28	include/ntfs-3g/ea.h
25	include/ntfs-3g/efs.h	29	include/ntfs-3g/efs.h
26	include/ntfs-3g/endians.h	30	include/ntfs-3g/endians.h
27	include/ntfs-3g/index.h	31	include/ntfs-3g/index.h
28	include/ntfs-3g/inode.h	32	include/ntfs-3g/inode.h
		33	include/ntfs-3g/ioctl.h
29	include/ntfs-3g/layout.h	34	include/ntfs-3g/layout.h
30	include/ntfs-3g/lcnalloc.h	35	include/ntfs-3g/lcnalloc.h
31	include/ntfs-3g/logfile.h	36	include/ntfs-3g/logfile.h
Lines 47-54 include/ntfs-3g/volume.h Link Here
47	include/ntfs-3g/xattrs.h	52	include/ntfs-3g/xattrs.h
48	lib/libntfs-3g.a	53	lib/libntfs-3g.a
49	lib/libntfs-3g.so	54	lib/libntfs-3g.so
50	lib/libntfs-3g.so.85	55	lib/libntfs-3g.so.86
51	lib/libntfs-3g.so.85.0.0	56	lib/libntfs-3g.so.86.0.0
52	libdata/pkgconfig/libntfs-3g.pc	57	libdata/pkgconfig/libntfs-3g.pc
53	man/man8/mkntfs.8.gz	58	man/man8/mkntfs.8.gz
54	man/man8/ntfs-3g.8.gz	59	man/man8/ntfs-3g.8.gz
Lines 60-72 man/man8/ntfsclone.8.gz Link Here
60	man/man8/ntfscluster.8.gz	65	man/man8/ntfscluster.8.gz
61	man/man8/ntfscmp.8.gz	66	man/man8/ntfscmp.8.gz
62	man/man8/ntfscp.8.gz	67	man/man8/ntfscp.8.gz
		68	man/man8/ntfsdecrypt.8.gz
		69	man/man8/ntfsfallocate.8.gz
63	man/man8/ntfsfix.8.gz	70	man/man8/ntfsfix.8.gz
64	man/man8/ntfsinfo.8.gz	71	man/man8/ntfsinfo.8.gz
65	man/man8/ntfslabel.8.gz	72	man/man8/ntfslabel.8.gz
66	man/man8/ntfsls.8.gz	73	man/man8/ntfsls.8.gz
67	man/man8/ntfsprogs.8.gz	74	man/man8/ntfsprogs.8.gz
68	man/man8/ntfsresize.8.gz	75	man/man8/ntfsresize.8.gz
		76	man/man8/ntfstruncate.8.gz
69	man/man8/ntfsundelete.8.gz	77	man/man8/ntfsundelete.8.gz
		78	man/man8/ntfswipe.8.gz
70	sbin/mkntfs	79	sbin/mkntfs
71	sbin/ntfsclone	80	sbin/ntfsclone
72	sbin/ntfscp	81	sbin/ntfscp

Return to bug 199993

Lines 2-9 Link Here

(-)w/sysutils/fusefs-ntfs/Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ntfs	4	PORTNAME= ntfs
5	PORTVERSION= 2014.2.15	5	PORTVERSION= 2015.3.14
6	PORTREVISION= 2
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= http://tuxera.com/opensource/	7	MASTER_SITES= http://tuxera.com/opensource/
9	PKGNAMEPREFIX= fusefs-	8	PKGNAMEPREFIX= fusefs-
Lines 15-27 COMMENT= Mount NTFS partitions (read/write) and disk images Link Here
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
17		16
		17	LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
18	CONFLICTS_BUILD= bonobo-1.*	18	CONFLICTS_BUILD= bonobo-1.*
19	CONFLICTS_INSTALL= ntfsprogs-*	19	CONFLICTS_INSTALL= ntfsprogs-*
20	USES= fuse pkgconfig iconv libtool tar:tgz	20	USES= fuse pkgconfig iconv libtool tar:tgz
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \	23	CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \
24	--disable-mtab --with-fuse=external --disable-ldconfig	24	--disable-mtab --with-fuse=external --disable-ldconfig \
		25	--enable-crypto --enable-extras
25	CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include	26	CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
26	LDFLAGS+= -L${LOCALBASE}/lib	27	LDFLAGS+= -L${LOCALBASE}/lib
27		28

Lines 9-41 Link Here

(-)w/sysutils/fusefs-ntfs/files/patch-configure (-27 lines)
9	*) enable_mount_helper="no" ;;	9	*) enable_mount_helper="no" ;;
10	esac	10	esac
11		11
12	@@ -9527,7 +9527,7 @@
13	hardcode_shlibpath_var=no
14	;;
15
16	- freebsd1*)
17	+ freebsd1.*)
18	ld_shlibs=no
19	;;
20
21	@@ -10402,7 +10402,7 @@
22	shlibpath_var=LD_LIBRARY_PATH
23	;;
24
25	-freebsd1*)
26	+freebsd1.*)
27	dynamic_linker=no
28	;;
29
30	@@ -10413,7 +10413,7 @@
31	objformat=`/usr/bin/objformat`
32	else
33	case $host_os in
34	- freebsd[123]*) objformat=aout ;;
35	+ freebsd[123].*) objformat=aout ;;
36	*) objformat=elf ;;
37	esac
38	fi
39	@@ -11894,7 +11894,7 @@	12	@@ -11894,7 +11894,7 @@
40	with_fuse="external"	13	with_fuse="external"
41	;;	14	;;

Added Link Here

(-)w/sysutils/fusefs-ntfs/fusefs-ntfs-2015.3.14.diff (+76 lines)
1	diff --git i/sysutils/fusefs-ntfs/Makefile w/sysutils/fusefs-ntfs/Makefile
2	index bb7cae8..d3d2c85 100644
3	--- i/sysutils/fusefs-ntfs/Makefile
4	+++ w/sysutils/fusefs-ntfs/Makefile
5	@@ -2,8 +2,7 @@
6	# $FreeBSD$
7
8	PORTNAME= ntfs
9	-PORTVERSION= 2014.2.15
10	-PORTREVISION= 2
11	+PORTVERSION= 2015.3.14
12	CATEGORIES= sysutils
13	MASTER_SITES= http://tuxera.com/opensource/
14	PKGNAMEPREFIX= fusefs-
15	diff --git i/sysutils/fusefs-ntfs/distinfo w/sysutils/fusefs-ntfs/distinfo
16	index 112bd68..77af55d 100644
17	--- i/sysutils/fusefs-ntfs/distinfo
18	+++ w/sysutils/fusefs-ntfs/distinfo
19	@@ -1,2 +1,2 @@
20	-SHA256 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 4c3099400cb14b231a3c9d718b3a8d152d38555059341ce5fc6d02292a4a5b56
21	-SIZE (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575
22	+SHA256 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 97f996015d8316d4a272bd2629978e5e97072dd3cc148ce39802f8037c6538f2
23	+SIZE (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 1210069
24	diff --git i/sysutils/fusefs-ntfs/files/patch-configure w/sysutils/fusefs-ntfs/files/patch-configure
25	index 39fec4d..443dfbc 100644
26	--- i/sysutils/fusefs-ntfs/files/patch-configure
27	+++ w/sysutils/fusefs-ntfs/files/patch-configure
28	@@ -9,33 +9,6 @@
29	*) enable_mount_helper="no" ;;
30	esac
31
32	-@@ -9527,7 +9527,7 @@
33	- hardcode_shlibpath_var=no
34	- ;;
35	-
36	-- freebsd1*)
37	-+ freebsd1.*)
38	- ld_shlibs=no
39	- ;;
40	-
41	-@@ -10402,7 +10402,7 @@
42	- shlibpath_var=LD_LIBRARY_PATH
43	- ;;
44	-
45	--freebsd1*)
46	-+freebsd1.*)
47	- dynamic_linker=no
48	- ;;
49	-
50	-@@ -10413,7 +10413,7 @@
51	- objformat=`/usr/bin/objformat`
52	- else
53	- case $host_os in
54	-- freebsd[123]*) objformat=aout ;;
55	-+ freebsd[123].*) objformat=aout ;;
56	- *) objformat=elf ;;
57	- esac
58	- fi
59	@@ -11894,7 +11894,7 @@
60	with_fuse="external"
61	;;
62	diff --git i/sysutils/fusefs-ntfs/pkg-plist w/sysutils/fusefs-ntfs/pkg-plist
63	index 3ef7cef..ee48950 100644
64	--- i/sysutils/fusefs-ntfs/pkg-plist
65	+++ w/sysutils/fusefs-ntfs/pkg-plist
66	@@ -47,8 +47,8 @@ include/ntfs-3g/volume.h
67	include/ntfs-3g/xattrs.h
68	lib/libntfs-3g.a
69	lib/libntfs-3g.so
70	-lib/libntfs-3g.so.85
71	-lib/libntfs-3g.so.85.0.0
72	+lib/libntfs-3g.so.86
73	+lib/libntfs-3g.so.86.0.0
74	libdata/pkgconfig/libntfs-3g.pc
75	man/man8/mkntfs.8.gz
76	man/man8/ntfs-3g.8.gz