aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Polański <michal@polanski.me>2021-05-03 01:14:58 +0200
committerMichał Polański <michal@polanski.me>2021-05-03 01:14:58 +0200
commit6492be017f5c0fe25631cc813cda42d3d7bfdcfe (patch)
treed61908c5f80240c95e7cac4196f9981af40af9b4
parent9b8c73fe17d345e178859186b7db717bc5b49e84 (diff)
downloadaports-6492be017f5c0fe25631cc813cda42d3d7bfdcfe.tar.gz
aports-6492be017f5c0fe25631cc813cda42d3d7bfdcfe.tar.bz2
aports-6492be017f5c0fe25631cc813cda42d3d7bfdcfe.tar.xz
testing/ijq: upgrade to 0.3.3
-rw-r--r--testing/ijq/APKBUILD12
-rw-r--r--testing/ijq/makefile-destdir.patch30
-rw-r--r--testing/ijq/makefile.patch9
3 files changed, 16 insertions, 35 deletions
diff --git a/testing/ijq/APKBUILD b/testing/ijq/APKBUILD
index 7dc352b6c2..8dc66b2104 100644
--- a/testing/ijq/APKBUILD
+++ b/testing/ijq/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=ijq
-pkgver=0.2.5
+pkgver=0.3.3
pkgrel=0
pkgdesc="Interactive jq tool"
url="https://git.sr.ht/~gpanders/ijq/"
@@ -12,7 +12,7 @@ depends="jq"
makedepends="go scdoc"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~gpanders/ijq/archive/v$pkgver.tar.gz
- makefile-destdir.patch
+ makefile.patch
"
builddir="$srcdir/$pkgname-v$pkgver"
@@ -21,8 +21,10 @@ build() {
}
package() {
- DESTDIR="$pkgdir" make PREFIX=/usr install
+ make PREFIX=/usr DESTDIR="$pkgdir" install
}
-sha512sums="e68eb581371f60132e4d5909c079e844886a2d7483593195ba9c79e9c42aedcde8aeba5b926fce348529e36237477ed05c0d2be594b0445e91521d302e9fc739 ijq-0.2.5.tar.gz
-0d7de6f9099d9bb86977f924e6dd7c910d3b85d130a7d7e27634075bb41e45a899165540c638204fa896bfc92e46797883f757d29632df8fc78b7026dc59888b makefile-destdir.patch"
+sha512sums="
+43f37451c36f5f72b531218b9242fdf10c6906b6019db9b4f455b3c177bac80a4b61114ab8120381ee1802e009d1a71ed023c1300518c016c14f9be96604eb5f ijq-0.3.3.tar.gz
+ad49dafd0ae838f98fa6e656eb01bd1216f3e091128310b8d5ad081f5fce266e1dfdf1fe9991883116bc3b29b48828aebabd58481aa822715797c993f6f62e00 makefile.patch
+"
diff --git a/testing/ijq/makefile-destdir.patch b/testing/ijq/makefile-destdir.patch
deleted file mode 100644
index 1136a071bd..0000000000
--- a/testing/ijq/makefile-destdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
--prefix = /usr/local
--bindir = $(prefix)/bin
--mandir = $(prefix)/share/man
-+PREFIX = /usr/local
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/share/man
-
- SRCS = main.go
-
-@@ -20,13 +20,13 @@
-
- .PHONY: install
- install: ijq ijq.1
-- install -d $(bindir) $(mandir)/man1
-- install -m 0755 ijq $(bindir)
-- install -m 0644 ijq.1 $(mandir)/man1
-+ install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-+ install -m 0755 ijq -t $(DESTDIR)$(BINDIR)/
-+ install -m 0644 ijq.1 -t $(DESTDIR)$(MANDIR)/man1/
-
- .PHONY: uninstall
- uninstall:
-- rm $(bindir)/ijq $(mandir)/man1/ijq.1
-+ rm $(BINDIR)/ijq $(MANDIR)/man1/ijq.1
-
- .PHONY: clean
- clean:
diff --git a/testing/ijq/makefile.patch b/testing/ijq/makefile.patch
new file mode 100644
index 0000000000..bec9000b2a
--- /dev/null
+++ b/testing/ijq/makefile.patch
@@ -0,0 +1,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+-prefix = /usr/local
+-bindir = $(prefix)/bin
+-mandir = $(prefix)/share/man
++PREFIX = /usr/local
++bindir = $(PREFIX)/bin
++mandir = $(PREFIX)/share/man