update, less patches

3 files changed, 18 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ce51d795ee7..8adc361a291e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
+# Generated by mksrcinfo v8
+# Thu Sep 28 18:52:48 UTC 2017
 pkgbase = sam2p
 	pkgdesc = A bitmap-to-eps-or-pdf-converter that produces very small files
-	pkgver = 0.49.3
+	pkgver = 0.49.4
 	pkgrel = 1
 	url = http://www.inf.bme.hu/~pts
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	makedepends = tar
 	depends = gcc-libs
 	optdepends = ghostscript: PS, EPS, PDF support
 	optdepends = libjpeg: JPEG support
 	optdepends = tif22pnm: for tiff support
 	optdepends = png22pnm: for png support
-	source = https://github.com/pts/sam2p/releases/download/v0.49.3/sam2p-0.49.3.tar.gz
+	noextract = sam2p-0.49.4.tar.gz
+	source = https://github.com/pts/sam2p/releases/download/v0.49.4/sam2p-0.49.4.tar.gz
 	source = makedep.patch
-	sha256sums = 33b1bf018a19b19c30d41defcb8b20c7cdcbc7ddd7703040c3a54d9cb1fcaaea
-	sha256sums = 36f7d93a61fa13ff2ae2925ca8e009ee096e0d491d6ec58b5d254390647938eb
+	sha256sums = d23707b2405ca94e2a237cb81f62fb5916f5e4360cf9a705061479c8fa1dff5c
+	sha256sums = 73c18ac87fa8fc498ea14fb2ed162e50470fa40ce4f273bbc13dfaa2b13c8f7d
 
 pkgname = sam2p
 
diff --git a/PKGBUILD b/PKGBUILD
index 6527a3198441..2193646652e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,38 @@
 # Contributor: menta
 
 pkgname=sam2p
-pkgver=0.49.3
+pkgver=0.49.4
 pkgrel=1
 pkgdesc="A bitmap-to-eps-or-pdf-converter that produces very small files"
 arch=('i686' 'x86_64')
 url="http://www.inf.bme.hu/~pts"
 license=('GPL2')
 depends=('gcc-libs')
-#makedepends=('imake')
+makedepends=('tar')
 optdepends=('ghostscript: PS, EPS, PDF support'
 	    'libjpeg: JPEG support'
 	    'tif22pnm: for tiff support'
 	    'png22pnm: for png support')
 # 'netpbm: PNG support'
 source=("https://github.com/pts/sam2p/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" makedep.patch)
-sha256sums=('33b1bf018a19b19c30d41defcb8b20c7cdcbc7ddd7703040c3a54d9cb1fcaaea'
-            '36f7d93a61fa13ff2ae2925ca8e009ee096e0d491d6ec58b5d254390647938eb')
+sha256sums=('d23707b2405ca94e2a237cb81f62fb5916f5e4360cf9a705061479c8fa1dff5c'
+            '73c18ac87fa8fc498ea14fb2ed162e50470fa40ce4f273bbc13dfaa2b13c8f7d')
+noextract=("$pkgname-$pkgver.tar.gz")
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  tar xf $pkgname-$pkgver.tar.gz
+  cd $pkgname-$pkgver
   patch -p1 < $srcdir/makedep.patch
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   CXX="g++ --std=c++98" ./configure --prefix="$pkgdir"/usr --enable-lzw --enable-gif
-  make all
+  PERL5LIB+=. make all
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   make install
   install -D -m644 README "$pkgdir"/usr/share/sam2p/docs/README
 }
diff --git a/makedep.patch b/makedep.patch
index 35ea36735f19..e5281e25b435 100644
--- a/makedep.patch
+++ b/makedep.patch
@@ -1,15 +1,3 @@
-diff -Naur sam2p-0.49.2.orig/aclocal.m4 sam2p-0.49.2.new/aclocal.m4
---- sam2p-0.49.2.orig/aclocal.m4	2013-09-03 16:32:54.000000000 +0200
-+++ sam2p-0.49.2.new/aclocal.m4	2015-02-23 20:27:49.944550310 +0100
-@@ -777,7 +777,7 @@
- #ifdef __cplusplus
- extern "C" void exit(int);
- #endif                     
--#define _BSD_SOURCE 1 /* vsnprintf */
-+#define _DEFAULT_SOURCE 1 /* vsnprintf */
- #define _POSIX_SOURCE 1
- #define _POSIX_C_SOURCE 2
- #include <stdio.h>
 diff -Naur sam2p-0.49.2.orig/configure sam2p-0.49.2.new/configure
 --- sam2p-0.49.2.orig/configure	2013-09-03 16:32:54.000000000 +0200
 +++ sam2p-0.49.2.new/configure	2015-02-23 20:24:48.251635254 +0100