Update to 9.18

2 files changed, 53 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 637266b33f82..55d4a42ca105 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ghostpdl
 	pkgdesc = Ghostscript RIP for PS, PDF, PCL-5, PCL-XL, SVG and XPS.
-	pkgver = 9.16
+	pkgver = 9.18
 	pkgrel = 1
 	url = http://www.ghostscript.com
 	arch = i686
@@ -11,8 +11,8 @@ pkgbase = ghostpdl
 	depends = freeglut
 	depends = libjpeg
 	depends = libxt
-	source = http://downloads.ghostscript.com/public/ghostpdl-9.16.tar.bz2
-	sha256sums = 4a2e23bd61b345ddb14ee942c51dc817dcb8e3a8cdbbd507fa9401e5946f2915
+	source = http://downloads.ghostscript.com/public/ghostpdl-9.18.tar.bz2
+	sha256sums = bfb0bf5bd17694686bbf505dc47c1c1788f8795a4136bfde1c604006476c8160
 
 pkgname = ghostpdl
 
diff --git a/PKGBUILD b/PKGBUILD
index a4d2a3bcf7c9..052ba226d1fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,12 @@
 # Contributor: vorbote P. A. López-Valencia;  palopezv on Google's email service
 # Contributor: ... (unknown)
 # Contributor: fnord0; fnord0 AAAAAAAAAAAAATTTTTTTTTTTTTTTTT riseup net
-# See AUR page for current maintainer.
 # Category: system
 
 # Versions after 9.10 drop svg and pspcl6. The extra binaries will be
 # installed if the version you choose has a makefile produces them.
-# This PKGBUILD is tested to work with versions 9.10 and 9.16
+# This PKGBUILD is tested to work with versions 9.10, 9.16, 9.18
 # and should work with later versions.
-# Just change pkgver and run updpgksums.
 
 # 6. What is GhostSVG?
 # GhostSVG is an interpreter for SVG (Scalable Vector Graphics) files. This
@@ -21,54 +19,77 @@
 
 set -u
 pkgname='ghostpdl'
-pkgver='9.16'
+pkgver='9.18'
 pkgrel='1'
 pkgdesc='Ghostscript RIP for PS, PDF, PCL-5, PCL-XL, SVG and XPS.'
 arch=('i686' 'x86_64')
 url='http://www.ghostscript.com'
 license=('AGPL')
 depends=('ghostscript' 'glu' 'freeglut' 'libjpeg' 'libxt')
-source=("http://downloads.ghostscript.com/public/${pkgname}-${pkgver}.tar.bz2") # .gz and .bz2 are available. Unpacking .bz2 is a LOT slower so is not suited for package testing.
-sha256sums=('4a2e23bd61b345ddb14ee942c51dc817dcb8e3a8cdbbd507fa9401e5946f2915')
+_verwatch=('http://downloads.ghostscript.com/public/' "${pkgname}-\(.*\)\.tar\.bz2" 'l')
+source=("${_verwatch[0]}${pkgname}-${pkgver}.tar.bz2") # .gz and .bz2 are available. Unpacking .bz2 is a LOT slower so is not suited for package testing.
+sha256sums=('bfb0bf5bd17694686bbf505dc47c1c1788f8795a4136bfde1c604006476c8160')
 
-build() {
+prepare() {
   set -u
   cd "${pkgname}-${pkgver}"
   # get rid of a harmless shell warning
-  sed -i -e 's:^\(if test \)\($ac_cv_c_compiler_gnu\)\( = yes; then\)$:\1"\2"\3:g' configure
-  # Compiling is several minutes even on a very fast computer. 
-  # This prevents recompile so we can use 'makepkg -fe' to test packaging.
-  if [ ! -s 'config.status' ]; then
-    ./configure --prefix=/usr
-  fi
-  make -s -j $(nproc)
+  sed -i -e 's:^\(if test \)\($ac_cv_c_compiler_gnu\)\( = yes; then\)$:\1"\2"\3:g' 'configure'
+  ./configure --prefix='/usr'
+  set +u
+}
+
+build() {
+  set -u
+  cd "${pkgname}-${pkgver}"
+  make -s -j "$(nproc)"
   set +u
 }
 
 package() {
   set -u
   cd "${pkgname}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/bin"
-  install -dm755 "${pkgdir}/usr/share/${pkgname}/doc"
-  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.AFPL"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  for _exe in 'main/obj/pcl6' 'svg/obj/gsvg' 'language_switch/obj/pspcl6' 'xps/obj/gxps'; do
-    if [ -x "${srcdir}/${pkgname}-${pkgver}/${_exe}" ]; then # pspcl6 and svg were dropped after 9.10
-      _exeb="`basename "${_exe}"`"
-      install -Dm755 "${srcdir}/${pkgname}-${pkgver}/${_exe}" "${pkgdir}/usr/share/${pkgname}/${_exeb}"
+  if [ -f 'COPYING' ]; then
+    install -Dpm644 'COPYING' -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+    install -Dpm644 'COPYING' "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.AFPL"
+    install -Dpm644 'COPYING' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  else
+    install -Dpm644 'LICENSE' -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  fi
+
+  install -d "${pkgdir}/usr/bin"
+  local _exe
+  for _exe in 'main/obj/pcl6' 'svg/obj/gsvg' 'language_switch/obj/pspcl6' 'xps/obj/gxps' 'bin/gpcl6' 'bin/gxps'; do
+    if [ -x "${_exe}" ]; then # pspcl6 and svg were dropped after 9.10
+      local _exeb="$(basename "${_exe}")"
+      install -Dpm755 "${_exe}" "${pkgdir}/usr/share/${pkgname}/${_exeb}"
       ln -sf "/usr/share/${pkgname}/${_exeb}" "${pkgdir}/usr/bin/"
+      if [ "${_exeb}" = 'gpcl6' ]; then
+        ln -sf "/usr/share/${pkgname}/${_exeb}" "${pkgdir}/usr/bin/pcl6" # for compatibility
+      fi
     fi
   done
   for _exe in 'tools/pcl2pdf' 'tools/pcl2pdfwr'; do
     ln -sf "/usr/share/${pkgname}/${_exe}" "${pkgdir}/usr/bin/"
   done
-  cp -pr 'tools' "${pkgdir}/usr/share/${pkgname}/"
-  cp -pr 'urwfonts' "${pkgdir}/usr/share/${pkgname}/"
-  for _doc in 'README.txt' doc/ghost* 'doc/who_owns_what.txt'; do
-    install -Dm644 "${_doc}" "${pkgdir}/usr/share/${pkgname}/doc/${_doc}"
-  done
+
+  if [ -d 'tools' ]; then
+    cp -pr 'tools' "${pkgdir}/usr/share/${pkgname}/"
+    cp -pr 'urwfonts' "${pkgdir}/usr/share/${pkgname}/"
+    #install -d "${pkgdir}/usr/share/${pkgname}/doc"
+    local _doc
+    for _doc in 'README.txt' doc/ghost* 'doc/who_owns_what.txt'; do
+      install -Dpm644 "${_doc}" -t "${pkgdir}/usr/share/${pkgname}/doc/"
+    done
+  else # as of 9.18
+    cp -pr {xps,pcl}/'tools' "${pkgdir}/usr/share/${pkgname}/"
+    cp -pr 'pcl/urwfonts' "${pkgdir}/usr/share/${pkgname}/"
+    local _doc
+    for _doc in 'doc/Readme.htm' doc/pclxps/ghost* 'doc/who_owns_what.txt'; do
+      install -Dpm644 "${_doc}" -t "${pkgdir}/usr/share/${pkgname}/doc/"
+    done
+  fi
+
   set +u
 }
 set +u