Update to 10.31

2 files changed, 15 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6315d603a312..9997a12af523 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Aug 16 05:02:40 UTC 2017
+# Thu Feb 15 19:11:33 UTC 2018
 pkgbase = pcre2-svn
 	pkgdesc = A regex library that implements Perl 5-style regular expressions, 2nd version, includes pcregrep
-	pkgver = 10.30.r854
+	pkgver = 10.31.r914
 	pkgrel = 1
 	url = http://www.pcre.org/
 	arch = i686
@@ -15,7 +15,7 @@ pkgbase = pcre2-svn
 	depends = zlib
 	depends = bzip2
 	depends = bash
-	provides = pcre2=10.30
+	provides = pcre2=10.31
 	conflicts = pcre2
 	source = pcre2-svn::svn://vcs.exim.org/pcre2/code/trunk
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 61824f3b133b..7dbb377eb2c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ set -u
 _pkgname='pcre2'
 pkgname="${_pkgname}-svn"
 _srcdir="${pkgname}"
-pkgver=10.30.r854
+pkgver=10.31.r914
 pkgrel=1
 pkgdesc='A regex library that implements Perl 5-style regular expressions, 2nd version, includes pcregrep'
 arch=('i686' 'x86_64')
@@ -21,7 +21,6 @@ depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
 makedepends=('subversion' 'libtool')
 provides=("${_pkgname}=${pkgver%.r*}")
 conflicts=("${_pkgname}")
-#validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
 _verwatch=('ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/' 'pcre2-\([0-9\.]\+\)\.tar\.bz2' 'f')
 source=("${_srcdir}::svn://vcs.exim.org/${_pkgname}/code/trunk")
 validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
@@ -36,25 +35,21 @@ pkgver() {
   set +u
 }
 
-prepare() {
-  set -u
-  cd "${_srcdir}"
-  ./autogen.sh
-  ./configure \
-    --prefix='/usr' \
-    --enable-pcre2-16 \
-    --enable-pcre2-32 \
-    --enable-jit \
-    --enable-pcre2grep-libz \
-    --enable-pcre2grep-libbz2 \
-    --enable-pcre2test-libreadline
-  set +u
-}
-
 build() {
   set -u
   cd "${_srcdir}"
   local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
+  if [ ! -s 'Makefile' ]; then
+    ./autogen.sh
+    ./configure \
+      --prefix='/usr' \
+      --enable-pcre2-16 \
+      --enable-pcre2-32 \
+      --enable-jit \
+      --enable-pcre2grep-libz \
+      --enable-pcre2grep-libbz2 \
+      --enable-pcre2test-libreadline
+  fi
   nice make -s -j "${_nproc}"
   set +u
 }
@@ -62,7 +57,6 @@ build() {
 check() {
   set -u
   cd "${_srcdir}"
-  local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
   make -s -j1 check
   set +u
 }
@@ -74,17 +68,6 @@ package() {
 
   install -Dpm644 'LICENCE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   set +u
-  # Ensure there are no forbidden paths. Place at the end of package() and comment out as you find or need exceptions. (git-aurcheck)
-  ! test -d "${pkgdir}/bin" || { echo "Line ${LINENO} Forbidden: /bin"; false; }
-  ! test -d "${pkgdir}/sbin" || { echo "Line ${LINENO} Forbidden: /sbin"; false; }
-  ! test -d "${pkgdir}/lib" || { echo "Line ${LINENO} Forbidden: /lib"; false; }
-  ! test -d "${pkgdir}/share" || { echo "Line ${LINENO} Forbidden: /share"; false; }
-  ! test -d "${pkgdir}/usr/sbin" || { echo "Line ${LINENO} Forbidden: /usr/sbin"; false; }
-  ! test -d "${pkgdir}/usr/local" || { echo "Line ${LINENO} Forbidden: /usr/local"; false; }
-  ! grep -lr "/sbin" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /sbin"; false; }
-  ! grep -lr "/usr/tmp" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /usr/tmp"; false; }
-  #! grep -lr "/usr/local" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /usr/local"; false; }
-  #! pcre2grep -Ilr "(?<!/usr)/bin" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /bin"; false; } # 1 script has /bin/sh
 }
 set +u