Merge pull request #1939 from xen0l/ntfs

Adam Števko

2016-05-04 ea5fec388f48d14e5b363a2e342798d22c5fd124

Merge pull request #1939 from xen0l/ntfs

ntfs-3g fixes

 components/sysutils/ntfsprogs/Makefile

@@ -19,7 +19,7 @@
COMPONENT_NAME= ntfs-3g_ntfsprogs
COMPONENT_VERSION= 2016.2.22AR.1
IPS_COMPONENT_VERSION= 2016.2.22
COMPONENT_REVISION= 1
COMPONENT_REVISION= 2
COMPONENT_SUMMARY= ntfsprogs - Utilities that provide access to NTFS
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz

 components/sysutils/ntfsprogs/files/fstyp

@@ -5,7 +5,7 @@
                shift
                ;;
        *)
                %{_bindir}/ntfs-3g.probe --readonly "$1" >/dev/null 2>&1 && echo "ntfs-3g" && exit 0
                /usr/bin/ntfs-3g.probe --readonly "$1" >/dev/null 2>&1 && echo "ntfs-3g" && exit 0
                exit 1
                ;;
        esac

 components/sysutils/ntfsprogs/patches/dir.c.patch

New file
@@ -0,0 +1,19 @@
diff -ruN ntfs-3g_ntfsprogs-2016.2.22AR.1.orig/libntfs-3g/dir.c ntfs-3g_ntfsprogs-2016.2.22AR.1/libntfs-3g/dir.c
--- ntfs-3g_ntfsprogs-2016.2.22AR.1.orig/libntfs-3g/dir.c    2016-04-01 08:37:45.000000000 +0200
+++ ntfs-3g_ntfsprogs-2016.2.22AR.1/libntfs-3g/dir.c    2016-05-04 18:16:08.517144523 +0200
@@ -40,9 +40,15 @@
 #include <sys/stat.h>
 #endif
 
+#if defined(__sun) && defined (__SVR4)
+#ifdef HAVE_SYS_MKDEV_H
+#include <sys/mkdev.h>
+#endif
+#else /* defined(__sun) && defined (__SVR4) */
 #ifdef HAVE_SYS_SYSMACROS_H
 #include <sys/sysmacros.h>
 #endif
+#endif /* defined(__sun) && defined (__SVR4) */
 
 #include "param.h"
 #include "types.h"