Subject: [PATCH 8/8] Changes in accordance with Perl package guidelines in Arch Wiki

---
 .SRCINFO |  7 +++----
 PKGBUILD | 20 +++++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 8a0368e..6cfebc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 # Generated by mksrcinfo v8
-# Fri Mar 18 22:27:06 UTC 2016
+# Sat Mar 19 17:59:25 UTC 2016
 pkgbase = gscan2pdf
    pkgdesc = A GUI with OCR capability to produce PDFs or DjVus from scanned documents
    pkgver = 1.3.9
-   pkgrel = 1
+   pkgrel = 2
    url = http://gscan2pdf.sourceforge.net/
-   arch = i686
-   arch = x86_64
+   arch = any
    license = GPL
    depends = imagemagick
    depends = perl-config-general
diff --git a/PKGBUILD b/PKGBUILD
index 8c60a81..5087adf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,9 @@

 pkgname=gscan2pdf
 pkgver=1.3.9
-pkgrel=1
+pkgrel=2
 pkgdesc='A GUI with OCR capability to produce PDFs or DjVus from scanned documents'
-arch=('i686' 'x86_64')
+arch=('any')
 url='http://gscan2pdf.sourceforge.net/'
 license=('GPL')
 depends=('imagemagick' 'perl-config-general' 'perl-goo-canvas' 'perl-gtk2-ex-simple-list' 'perl-gtk2-imageview'
@@ -21,23 +21,17 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz")
 sha512sums=('0f55cc95e63d02c7416bd58e9555497f55744c83587432547068ea5674671dc8318bbfdd5dad46be25f2065e5fdae8daf8803edc9963f1a603ec11be64f72e82')

 build() {
-
   cd ${srcdir}/${pkgname}-${pkgver}
-  perl Makefile.PL
+  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
+  /usr/bin/perl Makefile.PL
   make
-
 }

 package() {
-
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # Create symlinks to /usr/bin/site_perl/* in /usr/bin/
-  cd ${pkgdir}
-  ln -sf site_perl/gscan2pdf usr/bin/
-  ln -sf site_perl/scanadf-perl usr/bin/
-  ln -sf site_perl/scanimage-perl usr/bin/
+  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
+  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"

   # Standard perl cleaning
   /usr/bin/find ${pkgdir} -name '.packlist' -o -name 'perllocal.pod' -delete
--
2.7.4