Ticket #33279: Portfile.new.diff

Portfile

@@ -4 +4 @@
 
 name                ntfs-3g
 version             2012.1.15
-revision            1
+revision            2
 categories          fuse
 platforms           darwin
 maintainers         kelotti.net:petri \
@@ -55 +55 @@
     # but on darwin mount wants mount_* instead of mount.*
 
     # /sbin/mount.ntfs-3g is no longer installed with recent versions of ntfs-3g
-    # but check here to verify so an update doesn't miss it if it's turned back on
+    # but check here to verify so updates doesn't miss it if it's turned back on
     if {[file exists ${destroot}/sbin/mount.ntfs-3g]} {
+       # This violated the tree restrictions, hopefully fixed by now.
        file rename -- ${destroot}/sbin/mount.ntfs-3g \
-                      ${destroot}/sbin/mount_ntfs-3g
+                      ${destroot}{prefix}/sbin/mount_ntfs-3g
     }
     file rename -- ${destroot}${prefix}/share/man/man8/mount.ntfs-3g.8 \
                    ${destroot}${prefix}/share/man/man8/mount_ntfs-3g.8
+
+    # This violated the tree restrictions, hopefully fixed by now.
+    file rename -- ${destroot}/sbin/mkfs.ntfs \
+                   ${destroot}${prefix}/sbin/mkfs.ntfs
+    file delete ${destroot}/sbin
 }