From 147234acb3c30cabf6a3860121f004b2fcdda4c6 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Mon, 3 Mar 2025 12:00:45 -0500
Subject: [PATCH] ntfs-3g - apply usrmerge

---
 ntfs-3g.yaml | 87 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 28 deletions(-)

diff --git a/ntfs-3g.yaml b/ntfs-3g.yaml
index 307e8a008df..07ac628e63f 100644
--- a/ntfs-3g.yaml
+++ b/ntfs-3g.yaml
@@ -2,10 +2,15 @@
 package:
   name: ntfs-3g
   version: 2022.10.3
-  epoch: 1
+  epoch: 20
   description: Stable, full-featured, read-write NTFS
   copyright:
     - license: GPL-2.0-only
+  dependencies:
+    runtime:
+      - merged-sbin
+      - ntfs-3g-progs=${{package.full-version}}
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -32,14 +37,18 @@ pipeline:
 
   - runs: |
       autoreconf -fiv
+      mkdir -p ${{targets.destdir}}
+      mkdir -p ${{targets.destdir}}/usr
 
   - uses: autoconf/configure
+    with:
+      opts: --sbin=/usr/bin --prefix=/usr
 
   - uses: autoconf/make
 
-  - runs: mkdir -p ${{targets.destdir}}/lib
-
   - uses: autoconf/make-install
+    with:
+      opts: rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib
 
   - uses: strip
 
@@ -48,6 +57,10 @@ subpackages:
     pipeline:
       - uses: split/static
     description: ntfs-3g static
+    dependencies:
+      runtime:
+        - merged-sbin
+        - wolfi-baselayout
 
   - name: ntfs-3g-doc
     pipeline:
@@ -56,13 +69,19 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-sbin
+        - wolfi-baselayout
 
   - name: ntfs-3g-dev
     pipeline:
       - uses: split/dev
     dependencies:
       runtime:
+        - merged-sbin
         - ntfs-3g
+        - wolfi-baselayout
     description: ntfs-3g dev
     test:
       pipeline:
@@ -74,55 +93,67 @@ subpackages:
   - name: ntfs-3g-libs
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/lib/
-          mv ${{targets.destdir}}/lib/*.so.* ${{targets.subpkgdir}}/lib/
+          mkdir -p ${{targets.subpkgdir}}/usr/lib/
+          mv ${{targets.destdir}}/usr/lib/*.so.* ${{targets.subpkgdir}}/usr/lib/
     test:
       pipeline:
         - uses: test/ldd-check
           with:
             packages: $(basename ${{targets.contextdir}})
+    dependencies:
+      runtime:
+        - merged-sbin
+        - wolfi-baselayout
 
   - name: ntfs-3g-progs
+    dependencies:
+      runtime:
+        - merged-sbin
+        - wolfi-baselayout
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/sbin
-          mv ${{targets.destdir}}/usr ${{targets.destdir}}/lib ${{targets.subpkgdir}}/
+          mkdir -p ${{targets.subpkgdir}}/usr/
+          mv ${{targets.destdir}}/usr ${{targets.subpkgdir}}
           rm -fr ${{targets.subpkgdir}}/lib ${{targets.subpkgdir}}/usr/lib
+          # Cleanup the sbin/mount.{lowntfs-3g,mount.ntfs-3g} which are always installed
+          # to /sbin for some reason
+          mv ${{targets.destdir}}/sbin/* ${{targets.subpkgdir}}/usr/bin/
+          rmdir ${{targets.destdir}}/sbin
     test:
       pipeline:
         - runs: |
+            lowntfs-3g --version
+            mkfs.ntfs --help
+            mkfs.ntfs --version
+            mkntfs --help
+            mkntfs --version
+            mount.lowntfs-3g --version
+            mount.ntfs-3g --version
+            ntfs-3g --help 2>&1 | grep "Third Generation NTFS Driver"
+            ntfs-3g --version 2>&1 | grep "${{package.version}}"
             ntfs-3g.probe --help
-            ntfscat --version
             ntfscat --help
-            ntfscluster --version
+            ntfscat --version
+            ntfsclone --help
+            ntfsclone --version
             ntfscluster --help
-            ntfsfix --version
+            ntfscluster --version
+            ntfscp --help
+            ntfscp --version
             ntfsfix --help
-            ntfsinfo --version
+            ntfsfix --version
             ntfsinfo --help
-            mkfs.ntfs --version
-            mkfs.ntfs --help
-            mkntfs --version
-            mkntfs --help
-            ntfsclone --version
-            ntfsclone --help
-            ntfscp --version
-            ntfscp --help
-            ntfslabel --version
+            ntfsinfo --version
             ntfslabel --help
-            ntfsresize --version
+            ntfslabel --version
             ntfsresize --help
-            ntfsundelete --version
+            ntfsresize --version
             ntfsundelete --help
+            ntfsundelete --version
 
 test:
   pipeline:
-    - runs: |
-        ntfs-3g --help 2>&1 | grep "Third Generation NTFS Driver"
-        ntfs-3g --version 2>&1 | grep "${{package.version}}"
-        lowntfs-3g --version
-        mount.lowntfs-3g --version
-        mount.ntfs-3g --version
+    - uses: test/emptypackage
 
 update:
   enabled: true