Bump to version 0.8.10

3 files changed, 18 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1b71de79429..7bbef3e1cbbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = openradtool
 	pkgdesc = Generator for front-end and back-end code for Web applications written in C
-	pkgver = 0.7.8
+	pkgver = 0.8.10
 	pkgrel = 1
 	url = https://kristaps.bsd.lv/openradtool
 	arch = x86_64
 	license = custom:BSD
 	makedepends = bc
+	makedepends = bmake
 	depends = expat
-	optdepends = ksql: Needed by code generated by openradtool
+	optdepends = sqlbox: Needed by code generated by openradtool
 	conflicts = kwebapp
 	replaces = kwebapp
-	source = https://kristaps.bsd.lv/openradtool/snapshots/openradtool-0.7.8.tar.gz
+	source = https://kristaps.bsd.lv/openradtool/snapshots/openradtool-0.8.10.tar.gz
 	source = makefile-ldflags.patch
-	sha512sums = c06d6b5a0e5f6f5039a40e04957163c1f07e380ce8f5b06bb98ede587199eacdc029d4b73ebcbd56fed47a826938e2718e4f62bdc2f0db9459d99dcfb5f066eb
-	sha512sums = 4b77c7b740f8654ac089a5d34154066282b0c74cfc4121039c7e3551897d60f745df83dec9ed1ce178d016e5c9f520781809e0e231988e086a3a07254e5d7466
+	sha512sums = 37773d248c6a6c7c8bfcd97f5217fc517c2eb9adf587ab3daffd7555bc3416f06696afe33a68bc7d38586010d24b87115754cd54a93eb7e790ecf397b6bdecee
+	sha512sums = f09505fffbe3d732880a1b95ca46c57d385ed70d15b1158cdc525f2a0887ef81e0f521bbf5a75348d03f8404586b99eb179b21b94a62312801cf284ca302bb52
 
 pkgname = openradtool
 
diff --git a/PKGBUILD b/PKGBUILD
index e61f4268688b..2066a6034040 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Adrian Perez de Castro <aperez@igalia.com>
 pkgname=openradtool
 pkgdesc='Generator for front-end and back-end code for Web applications written in C'
-pkgver=0.7.8
+pkgver=0.8.10
 pkgrel=1
 url='https://kristaps.bsd.lv/openradtool'
 license=(custom:BSD)
-makedepends=(bc)
+makedepends=(bc bmake)
 depends=(expat)
 conflicts=(kwebapp)
 replaces=(kwebapp)
-optdepends=('ksql: Needed by code generated by openradtool')
+optdepends=('sqlbox: Needed by code generated by openradtool')
 arch=('x86_64')
 source=("${url}/snapshots/openradtool-${pkgver}.tar.gz" makefile-ldflags.patch)
-sha512sums=('c06d6b5a0e5f6f5039a40e04957163c1f07e380ce8f5b06bb98ede587199eacdc029d4b73ebcbd56fed47a826938e2718e4f62bdc2f0db9459d99dcfb5f066eb'
-            '4b77c7b740f8654ac089a5d34154066282b0c74cfc4121039c7e3551897d60f745df83dec9ed1ce178d016e5c9f520781809e0e231988e086a3a07254e5d7466')
+sha512sums=('37773d248c6a6c7c8bfcd97f5217fc517c2eb9adf587ab3daffd7555bc3416f06696afe33a68bc7d38586010d24b87115754cd54a93eb7e790ecf397b6bdecee'
+            'f09505fffbe3d732880a1b95ca46c57d385ed70d15b1158cdc525f2a0887ef81e0f521bbf5a75348d03f8404586b99eb179b21b94a62312801cf284ca302bb52')
 
 prepare () {
 	cd "${pkgname}-${pkgver}"
@@ -22,14 +22,13 @@ prepare () {
 
 build () {
 	cd "${pkgname}-${pkgver}"
-	CFLAGS="${CFLAGS}" ./configure PREFIX=/usr MANDIR=/usr/share/man
-	echo "LDFLAGS += ${LDFLAGS}" >> Makefile.configure
-	make
+	CFLAGS="${CFLAGS}" ./configure PREFIX=/usr MANDIR=/usr/share/man LDFLAGS="${LDFLAGS}"
+	bmake
 }
 
 package () {
 	cd "${pkgname}-${pkgver}"
-	make install DESTDIR="${pkgdir}"
+	bmake install DESTDIR="${pkgdir}"
 	strip -x --strip-unneeded "${pkgdir}"/usr/bin/ort*
 	awk '/^\/\*/,/\*\// { print ; }' main.c > COPYING
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
diff --git a/makefile-ldflags.patch b/makefile-ldflags.patch
index 4a5409d83c56..a999e60b65d1 100644
--- a/makefile-ldflags.patch
+++ b/makefile-ldflags.patch
@@ -1,46 +1,11 @@
---- a/Makefile	2019-11-27 01:36:44.974092183 +0200
-+++ b/Makefile	2019-11-27 01:37:37.623529624 +0200
-@@ -121,34 +121,34 @@
+--- a/Makefile	2020-04-01 16:44:39.539747058 +0300
++++ b/Makefile	2020-04-01 16:44:54.359849503 +0300
+@@ -141,7 +141,7 @@
  	cp $(BINS) afl
  
  ort: main.o libort.a
 -	$(CC) -o $@ main.o libort.a
-+	$(CC) -o $@ main.o libort.a $(LDFLAGS)
++	$(CC) -o $@ main.o libort.a $(LDFLAGS) $(LDADD)
  
  libort.a: $(LIBOBJS)
  	$(AR) rs $@ $(LIBOBJS)
- 
- ort-c-source: source.o libort.a
--	$(CC) -o $@ source.o libort.a
-+	$(CC) -o $@ source.o libort.a $(LDFLAGS)
- 
- ort-c-header: header.o libort.a
--	$(CC) -o $@ header.o libort.a
-+	$(CC) -o $@ header.o libort.a $(LDFLAGS)
- 
- ort-javascript: javascript.o libort.a
--	$(CC) -o $@ javascript.o libort.a
-+	$(CC) -o $@ javascript.o libort.a $(LDFLAGS)
- 
- ort-sql: sql.o libort.a
--	$(CC) -o $@ sql.o libort.a
-+	$(CC) -o $@ sql.o libort.a $(LDFLAGS)
- 
- ort-sqldiff: sql.o libort.a
--	$(CC) -o $@ sql.o libort.a
-+	$(CC) -o $@ sql.o libort.a $(LDFLAGS)
- 
- ort-audit: audit.o libort.a
--	$(CC) -o $@ audit.o libort.a
-+	$(CC) -o $@ audit.o libort.a $(LDFLAGS)
- 
- ort-audit-gv: audit.o libort.a
--	$(CC) -o $@ audit.o libort.a
-+	$(CC) -o $@ audit.o libort.a $(LDFLAGS)
- 
- ort-audit-json: audit.o libort.a
--	$(CC) -o $@ audit.o libort.a
-+	$(CC) -o $@ audit.o libort.a $(LDFLAGS)
- 
- ort-xliff: xliff.o libort.a
- 	$(CC) -o $@ xliff.o libort.a $(LDFLAGS) -lexpat