updating to latest version

4 files changed, 34 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8f7485c4310..8928a3036c08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kplot
 	pkgdesc = Cairo plotting library
-	pkgver = 0.1.14
+	pkgver = 0.1.15
 	pkgrel = 1
 	url = https://kristaps.bsd.lv/kplot/
 	arch = i686
@@ -9,9 +9,9 @@ pkgbase = kplot
 	depends = cairo
 	depends = libbsd
 	source = https://kristaps.bsd.lv/kplot/snapshots/kplot.tgz
-	source = makefile_linux.patch
-	sha1sums = cc3ab77a39f5d1d057f8ed5319b3e1f52c4e9343
-	sha1sums = 115e6a685440d14efd682ac6a5418b1cb8204099
+	source = linux.patch
+	sha1sums = f894b9634dde97df3731f1155649350080b8bf8a
+	sha1sums = ce9ac134f39fd7a1b17c74a9cbc3df436522adac
 
 pkgname = kplot
 
diff --git a/PKGBUILD b/PKGBUILD
index b3bf9d9b467e..2bddd5005887 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Vincent Hourdin <vh|at|free-astro=DOT=vinvin.tf>
 pkgname=kplot
-pkgver=0.1.14
+pkgver=0.1.15
 pkgrel=1
 pkgdesc="Cairo plotting library"
 arch=('i686' 'x86_64')
@@ -9,21 +9,20 @@ depends=('cairo' 'libbsd')
 url="https://kristaps.bsd.lv/kplot/"
 
 _pkgname="${pkgname}-${pkgver}"
-source=("https://kristaps.bsd.lv/kplot/snapshots/kplot.tgz" "makefile_linux.patch")
-sha1sums=('cc3ab77a39f5d1d057f8ed5319b3e1f52c4e9343' '115e6a685440d14efd682ac6a5418b1cb8204099')
+source=("https://kristaps.bsd.lv/kplot/snapshots/kplot.tgz" "linux.patch")
+sha1sums=('f894b9634dde97df3731f1155649350080b8bf8a' 'ce9ac134f39fd7a1b17c74a9cbc3df436522adac')
 
 prepare() {
-	cd "${_pkgname}"
-	patch -p1 < ../makefile_linux.patch
+        cd "${_pkgname}"
+        patch --verbose -p1 < ../linux.patch
 }
 
 build() {
-	cd "${_pkgname}"
-	make
+        cd "${_pkgname}"
+        make
 }
 
 package() {
-	cd "${_pkgname}"
-	make PREFIX="/usr" DESTDIR="${pkgdir}" install
+        cd "${_pkgname}"
+        make PREFIX="/usr" DESTDIR="${pkgdir}" install
 }
-
diff --git a/linux.patch b/linux.patch
new file mode 100644
index 000000000000..71cdb2ccd9fa
--- /dev/null
+++ b/linux.patch
@@ -0,0 +1,21 @@
+diff -Nru kplot-0.1.15.orig/Makefile kplot-0.1.15/Makefile
+--- kplot-0.1.15.orig/Makefile	2016-11-03 07:38:25.000000000 +0100
++++ kplot-0.1.15/Makefile	2020-01-28 22:03:56.422383210 +0100
+@@ -6,7 +6,7 @@
+ VERSION		= 0.1.15
+ LDADD		= `pkg-config --libs --silence-errors cairo || echo '-L/opt/X11/lib -lcairo'`
+ #If you're on GNU/Linux, you'll need to uncomment this.
+-#LDADD		+= -L/usr/local/include -lbsd
++LDADD		+= -L/usr/include -lbsd
+ EXAMPLES	= example0 \
+ 		  example1 \
+ 		  example2 \
+@@ -173,7 +173,7 @@
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man3
+ 	install -m 0444 libkplot.a $(DESTDIR)$(PREFIX)/lib
+ 	install -m 0444 kplot.h $(DESTDIR)$(PREFIX)/include
+-	install -m 0444 $(MANS) $(DESTDIR)$(PREFIX)/man/man3
++	install -m 0444 $(MANS) $(DESTDIR)$(PREFIX)/share/man/man3
+ 
+ www: $(HTMLS) $(PNGS) kplot.tgz kplot.tgz.sha512
+ 
diff --git a/makefile_linux.patch b/makefile_linux.patch
deleted file mode 100644
index 10aee3cde96d..000000000000
--- a/makefile_linux.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nu kplot-0.1.14.orig/Makefile kplot-0.1.14/Makefile
---- kplot-0.1.14.orig/Makefile	2016-03-04 01:26:42.000000000 +0100
-+++ kplot-0.1.14/Makefile	2016-09-23 00:17:33.609399803 +0200
-@@ -6,7 +6,7 @@
- VERSION		= 0.1.14
- LDADD		= `pkg-config --libs --silence-errors cairo || echo '-L/opt/X11/lib -lcairo'`
- #If you're on GNU/Linux, you'll need to uncomment this.
--#LDADD		+= -L/usr/local/include -lbsd
-+LDADD		+= -L/usr/local/include -lbsd
- VERSIONS	= version_0_1_4.xml \
- 		  version_0_1_5.xml \
- 		  version_0_1_6.xml \
-@@ -100,7 +100,7 @@
- 		  stddev.o \
- 		  tic.o \
- 		  vector.o
--PREFIX		= /usr/local
-+PREFIX		= /usr
- HTMLS		= index.html \
- 		  man/kdata_array_alloc.3.html \
- 		  man/kdata_array_fill.3.html \
-@@ -181,7 +181,7 @@
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man3
- 	install -m 0444 libkplot.a $(DESTDIR)$(PREFIX)/lib
- 	install -m 0444 kplot.h $(DESTDIR)$(PREFIX)/include
--	install -m 0444 $(MANS) $(DESTDIR)$(PREFIX)/man/man3
-+	install -m 0444 $(MANS) $(DESTDIR)$(PREFIX)/share/man/man3
- 
- www: $(HTMLS) $(PNGS) kplot.tgz kplot.tgz.sha512