rebase and improve patches

4 files changed, 83 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32bed0cf564c..caa086e42853 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = apfsprogs-git
 	pkgdesc = Experimental APFS tools for linux
-	pkgver = r23.0dac1d6
+	pkgver = r304.26f3461
 	pkgrel = 1
 	url = https://github.com/eafer/apfsprogs
 	arch = x86_64
 	license = GPL2
 	makedepends = git
 	depends = glibc
-	provides = apfsprogs=r23.0dac1d6
+	provides = apfsprogs=r304.26f3461
 	conflicts = apfsprogs
 	source = git+https://github.com/eafer/apfsprogs
 	source = add-ldflags.patch
+	source = destdir.patch
 	sha256sums = SKIP
-	sha256sums = a47c0056a94cf8bc7bba443e467a1a434356cad71ce0a88be460c727e6aee6c9
+	sha256sums = 30c173d08a6ceeb40ba09f267f3bbacc1486fa51e155fef17456da03bd35d741
+	sha256sums = 65c7af8a2538536bcf9e62b152893849b2cd1092040f5bc6ec2a33040027f8ac
 
 pkgname = apfsprogs-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 84081d1901d9..d23f5d89450c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=apfsprogs
 pkgname=$_pkgname-git
-pkgver=r23.0dac1d6
+pkgver=r304.26f3461
 pkgrel=1
 pkgdesc='Experimental APFS tools for linux'
 arch=(x86_64)
@@ -13,9 +13,13 @@ makedepends=('git')
 conflicts=("$_pkgname")
 provides=("$_pkgname=$pkgver")
 source=('git+https://github.com/eafer/apfsprogs'
-        'add-ldflags.patch')
+        'add-ldflags.patch'
+        'destdir.patch')
 sha256sums=('SKIP'
-            'a47c0056a94cf8bc7bba443e467a1a434356cad71ce0a88be460c727e6aee6c9')
+            '30c173d08a6ceeb40ba09f267f3bbacc1486fa51e155fef17456da03bd35d741'
+            '65c7af8a2538536bcf9e62b152893849b2cd1092040f5bc6ec2a33040027f8ac')
+
+_progs=(apfsck mkapfs)
 
 pkgver() {
   cd $_pkgname
@@ -25,16 +29,22 @@ pkgver() {
 prepare() {
   cd $_pkgname
   patch -Np1 -i ../add-ldflags.patch
+  patch -Np1 -i ../destdir.patch
 }
 
 build() {
-  cd $_pkgname/apfsck
+  cd $_pkgname
 
-  make
+  make -C lib
+  for prog in "${_progs[@]}" ; do
+    make -C $prog
+  done
 }
 
 package() {
-  cd $_pkgname/apfsck
+  cd $_pkgname
 
-  install -Dm755 apfsck -t "$pkgdir"/usr/bin
+  for prog in "${_progs[@]}" ; do
+    make -C $prog install DESTDIR="$pkgdir" BINDIR=/usr/bin MANDIR=/usr/share/man8
+  done
 }
diff --git a/add-ldflags.patch b/add-ldflags.patch
index 2e5d11200cc4..58da2f5dac61 100644
--- a/add-ldflags.patch
+++ b/add-ldflags.patch
@@ -1,13 +1,26 @@
 diff --git a/apfsck/Makefile b/apfsck/Makefile
-index d516a3a..dee5c50 100644
+index e6d6f84..6f65668 100644
 --- a/apfsck/Makefile
 +++ b/apfsck/Makefile
-@@ -3,7 +3,7 @@ OBJS = $(SRCS:.c=.o)
- DEPS = $(SRCS:.c=.d)
+@@ -15,7 +15,7 @@ override CFLAGS += -Wall -I$(CURDIR)/../include
  
- apfsck: $(OBJS)
--	gcc $(CFLAGS) -o apfsck $(OBJS)
-+	gcc $(CFLAGS) $(LDFLAGS) -o apfsck $(OBJS)
+ apfsck: $(OBJS) $(LIBRARY)
+ 	@echo '  Linking...'
+-	@gcc $(CFLAGS) -o apfsck $(OBJS) $(LIBRARY)
++	@gcc $(CFLAGS) $(LDFLAGS) -o apfsck $(OBJS) $(LIBRARY)
+ 	@echo '  Build complete'
  
- %.o: %.c
- 	gcc $(CFLAGS) -o $@ -MMD -MP -c $<
+ # Build the common libraries
+diff --git a/mkapfs/Makefile b/mkapfs/Makefile
+index 67b39ab..2280615 100644
+--- a/mkapfs/Makefile
++++ b/mkapfs/Makefile
+@@ -14,7 +14,7 @@ override CFLAGS += -Wall -I$(CURDIR)/../include
+ 
+ mkapfs: $(OBJS) $(LIBRARY)
+ 	@echo '  Linking...'
+-	@gcc $(CFLAGS) -o mkapfs $(OBJS) $(LIBRARY)
++	@gcc $(CFLAGS) $(LDFLAGS) -o mkapfs $(OBJS) $(LIBRARY)
+ 	@echo '  Build complete'
+ 
+ # Build the common libraries
diff --git a/destdir.patch b/destdir.patch
new file mode 100644
index 000000000000..c49773277cf5
--- /dev/null
+++ b/destdir.patch
@@ -0,0 +1,40 @@
+diff --git a/apfsck/Makefile b/apfsck/Makefile
+index e6d6f84..3636b2b 100644
+--- a/apfsck/Makefile
++++ b/apfsck/Makefile
+@@ -37,9 +37,9 @@ endif
+ clean:
+ 	rm -f $(OBJS) $(DEPS) apfsck
+ install:
+-	install -d $(BINDIR)
+-	install -t $(BINDIR) apfsck
+-	ln -fs -T $(BINDIR)/apfsck $(BINDIR)/fsck.apfs
+-	install -d $(MANDIR)
+-	install -m 644 -t $(MANDIR) apfsck.8
+-	ln -fs -T $(MANDIR)/apfsck.8 $(MANDIR)/fsck.apfs.8
++	install -d $(DESTDIR)$(BINDIR)
++	install -t $(DESTDIR)$(BINDIR) apfsck
++	ln -fs -T $(BINDIR)/apfsck $(DESTDIR)$(BINDIR)/fsck.apfs
++	install -d $(DESTDIR)$(MANDIR)
++	install -m 644 -t $(DESTDIR)$(MANDIR) apfsck.8
++	ln -fs -T $(MANDIR)/apfsck.8 $(DESTDIR)$(MANDIR)/fsck.apfs.8
+diff --git a/mkapfs/Makefile b/mkapfs/Makefile
+index 67b39ab..bb66dd1 100644
+--- a/mkapfs/Makefile
++++ b/mkapfs/Makefile
+@@ -36,9 +36,9 @@ endif
+ clean:
+ 	rm -f $(OBJS) $(DEPS) mkapfs
+ install:
+-	install -d $(BINDIR)
+-	install -t $(BINDIR) mkapfs
+-	ln -fs -T $(BINDIR)/mkapfs $(BINDIR)/mkfs.apfs
+-	install -d $(MANDIR)
+-	install -m 644 -t $(MANDIR) mkapfs.8
+-	ln -fs -T $(MANDIR)/mkapfs.8 $(MANDIR)/mkfs.apfs.8
++	install -d $(DESTDIR)$(BINDIR)
++	install -t $(DESTDIR)$(BINDIR) mkapfs
++	ln -fs -T $(BINDIR)/mkapfs $(DESTDIR)$(BINDIR)/mkfs.apfs
++	install -d $(DESTDIR)$(MANDIR)
++	install -m 644 -t $(DESTDIR)$(MANDIR) mkapfs.8
++	ln -fs -T $(MANDIR)/mkapfs.8 $(DESTDIR)$(MANDIR)/mkfs.apfs.8