[arch-commits] Commit in links/trunk (PKGBUILD)

[Christian Hesse via arch-commits]

    Date: Friday, May 11, 2018 @ 08:57:45
  Author: eworm
Revision: 323928

upgpkg: links 2.16-1

new upstream release

Modified:
  links/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-05-11 08:15:59 UTC (rev 323927)
+++ PKGBUILD    2018-05-11 08:57:45 UTC (rev 323928)
@@ -3,13 +3,13 @@
 # Contributor: Eric Bélanger <e...@archlinux.org>
 
 pkgname=links
-pkgver=2.15
+pkgver=2.16
 pkgrel=1
 pkgdesc="A text WWW browser, similar to Lynx"
 arch=('x86_64')
 url="http://links.twibright.com/";
 license=('GPL')
-depends=('bzip2' 'xz' 'gpm' 'libevent')
+depends=('bzip2' 'gpm' 'libevent' 'pcre' 'xz')
 makedepends=('libtiff' 'libpng' 'libxt' 'librsvg')
 optdepends=('libx11: for using xlinks'
            'libtiff: for using xlinks'
@@ -17,9 +17,15 @@
            'librsvg: for using xlinks')
 source=("http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2";
         'links.desktop')
-sha256sums=('1e2a1c4b439c14fbedd78fd98f443af2ab0c1566bebc491642411d74b7efe3ca'
+sha256sums=('82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f'
             '484571172aa19cf91c4ce9d9528a4ac52e9252d6e741897e7339880aa30dbc88')
 
+configure_options=(
+  --prefix=/usr
+  --mandir=/usr/share/man
+  --disable-javascript
+)
+
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure
@@ -28,13 +34,19 @@
 build() {
   cd ${pkgname}-${pkgver}
   (cd intl; ./gen-intl; ./synclang)
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --enable-graphics --with-x --with-fb
+  ./configure \
+    "${configure_options[@]}" \
+    --enable-graphics \
+    --with-x \
+    --with-fb
   make
   mv links xlinks
 
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --disable-graphics --without-x  --without-fb
+  ./configure \
+    "${configure_options[@]}" \
+    --disable-graphics \
+    --without-x \
+    --without-fb
   make
 }
 
@@ -42,13 +54,13 @@
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
+  install -D -m0755 xlinks "${pkgdir}/usr/bin/xlinks"
   ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
 
-  install -D -m644 "${srcdir}/links.desktop" 
"${pkgdir}/usr/share/applications/links.desktop"
+  install -D -m0644 "${srcdir}/links.desktop" 
"${pkgdir}/usr/share/applications/links.desktop"
   install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm 
"${pkgdir}/usr/share/pixmaps/"
+  install -m0644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm 
"${pkgdir}/usr/share/pixmaps/"
 
   install -d "${pkgdir}/usr/share/doc/links/calibration"
-  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
+  install -m0644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
 }