[arch-commits] Commit in gocryptfs/trunk (PKGBUILD makefile.patch)

[Maxim Baz]

    Date: Monday, March 18, 2019 @ 19:16:20
  Author: maximbaz
Revision: 442493

upgpkg: gocryptfs 1.7-2

Added:
  gocryptfs/trunk/makefile.patch
Modified:
  gocryptfs/trunk/PKGBUILD

----------------+
 PKGBUILD       |   17 ++++++++---------
 makefile.patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-18 19:12:36 UTC (rev 442492)
+++ PKGBUILD	2019-03-18 19:16:20 UTC (rev 442493)
@@ -4,7 +4,7 @@
 _pkgauthor=rfjakob
 pkgname=gocryptfs
 pkgver=1.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Encrypted overlay filesystem written in Go.'
 arch=('x86_64')
 url="https://github.com/${_pkgauthor}/${pkgname}"
@@ -13,10 +13,12 @@
 makedepends=('go-pie' 'pandoc' 'man-db')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgauthor}/${pkgname}/releases/download/v${pkgver}/${pkgname}_v${pkgver}_src-deps.tar.gz"
         "${pkgname}-${pkgver}.tar.gz.asc::https://github.com/${_pkgauthor}/${pkgname}/releases/download/v${pkgver}/${pkgname}_v${pkgver}_src-deps.tar.gz.asc"
-        "build_flags.patch")
+        "build_flags.patch"
+        "makefile.patch")
 sha256sums=('2d1a2cfd072d554a28ee6e6807474b00ac710fb1aaf7aa81f3d8e94e80f6a703'
             'SKIP'
-            'f43c3d2cc8c7f0338dbd553d0189eda269d7ceee6a3539dd6096c18e7344e567')
+            'f43c3d2cc8c7f0338dbd553d0189eda269d7ceee6a3539dd6096c18e7344e567'
+            '2821a72db020d4d5b3aeb0ce6584ec1edcda2b0948c155bc95ead634e760d37e')
 validpgpkeys=('FFF3E01444FED7C316A3545A895F5BC123A02740')
 
 prepare() {
@@ -25,19 +27,16 @@
 
     cd "${srcdir}/gopath/src/github.com/${_pkgauthor}/${pkgname}"
     patch -Np1 -i "${srcdir}/build_flags.patch"
+    patch -Np1 -i "${srcdir}/makefile.patch"
 }
 
 build() {
     export GOPATH="${srcdir}/gopath"
     cd "${srcdir}/gopath/src/github.com/${_pkgauthor}/${pkgname}"
-    ./build.bash
-    ./Documentation/MANPAGE-render.bash >/dev/null
+    make build
 }
 
 package() {
     cd "${srcdir}/gopath/src/github.com/${_pkgauthor}/${pkgname}"
-    install -Dm755 -t "${pkgdir}/usr/bin/" "${pkgname}"
-    install -Dm755 -t "${pkgdir}/usr/bin/" "${pkgname}-xray/${pkgname}-xray"
-    install -Dm644 -t "${pkgdir}/usr/share/man/man1/" "Documentation/${pkgname}.1"
-    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+    make DESTDIR="${pkgdir}" install
 }

Added: makefile.patch
===================================================================
--- makefile.patch	                        (rev 0)
+++ makefile.patch	2019-03-18 19:16:20 UTC (rev 442493)
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,7 @@
+ .phony: build
+ build:
+ 	./build.bash
++	./Documentation/MANPAGE-render.bash
+
+ .phony: test
+ test:
+@@ -9,3 +10,11 @@ test:
+ .phony: format
+ format:
+ 	go fmt ./...
++
++.phony: install
++install:
++	install -Dm755 -t "$(DESTDIR)/usr/bin/" gocryptfs
++	install -Dm755 -t "$(DESTDIR)/usr/bin/" gocryptfs-xray/gocryptfs-xray
++	install -Dm644 -t "$(DESTDIR)/usr/share/man/man1/" Documentation/gocryptfs.1
++	install -Dm644 -t "$(DESTDIR)/usr/share/man/man1/" Documentation/gocryptfs-xray.1
++	install -Dm644 -t "$(DESTDIR)/usr/share/licenses/gocryptfs" LICENSE