update packages

lisp/pdf-tools/build/server/autobuild

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 ##
 ## Installs package dependencies and builds the application.
@@ -64,16 +64,7 @@ which()
     if [ -z "$1" ]; then
         return 1
     fi
-    IFS=:
-    for dir in $PATH; do
-        if [ -x "$dir/$1" ]; then
-            printf "%s" "$dir/$1"
-            unset IFS
-            return 0
-        fi
-    done
-    unset IFS
-    return 1
+    command -v "$1"
 }
 
 # Quote $@ for the shell.
@@ -167,9 +158,7 @@ have_packages_installed()
         which make || return 1
         which gcc || which cc || return 1
         which g++ || which c++ || return 1
-        cc $(pkg-config --cflags poppler) -o /dev/null -E - 2>/dev/null <<EOF
-        #include <PDFDocEncoding.h>
-EOF
+        c++ $(pkg-config --cflags poppler) -o /dev/null -E install_test.cpp 2>/dev/null
         [ $? -eq 0 ] || return 1
         return 0
     } >/dev/null 2>&1
@@ -260,7 +249,7 @@ os_openbsd() {
     fi
     PKGCMD=pkg_add
     PKGARGS="-uU"
-    PACKAGES="autoconf-2.69p2 automake-1.15.1 poppler poppler-utils png"
+    PACKAGES="autoconf%2.69 automake%1.15 poppler poppler-utils png"
     export AUTOCONF_VERSION=2.69
     export AUTOMAKE_VERSION=1.15
     if whereis clang++ ;then
@@ -317,7 +306,7 @@ os_debian() {
               make
               pkg-config"
     PKGCMD=apt-get
-    PKGARGS=install
+    PKGARGS="install -y"
     return 0
 }
 
@@ -409,7 +398,7 @@ os_gentoo() {
     PKGCMD=emerge
     PKGARGS=--noreplace
     PACKAGES="app-text/poppler
-              dev-util/pkgconfig
+              dev-util/pkgconf
               media-libs/libpng
               sys-devel/autoconf
               sys-devel/automake
@@ -419,6 +408,29 @@ os_gentoo() {
     return 0
 }
 
+# Void
+os_void() {
+    if [ -f "/etc/os-release" ]; then
+        . /etc/os-release
+        if [ "$NAME" != "void" ]; then
+          return 1
+        fi
+    else
+      return 1
+    fi
+    PACKAGES="autoconf
+              automake
+              libpng-devel
+              poppler-devel
+              poppler-glib-devel
+              zlib-devel
+              make
+              pkgconf"
+    PKGCMD=xbps-install
+    PKGARGS="-Sy"
+    return 0
+}
+
 # By Parameter --os
 os_argument() {
     [ -z "$OS" ] && return 1
@@ -433,6 +445,7 @@ os_argument() {
         gentoo)  os_gentoo  "$@";;
         msys2)   os_msys2   "$@";;
         nixos)   os_nixos   "$@";;
+        void)    os_void    "$@";;
         *)       echo "Invalid --os argument: $OS"
                  exit 1
     esac || {
@@ -458,6 +471,7 @@ os_debian   "$@" || \
 os_gentoo   "$@" || \
 os_msys2    "$@" || \
 os_nixos    "$@" || \
+os_void     "$@" || \
 {
     OS_IS_HANDLED=
     if [ -z "$DRY_RUN" ]; then
@@ -490,10 +504,6 @@ if [ -n "$PKGCMD" ];then
     echo
 fi
 
-echo "---------------------------"
-echo " Configuring and compiling "
-echo "---------------------------"
-
 # Try to be in the correct directory.
 if which dirname >/dev/null 2>&1; then
     cd "$(dirname "$0")" || {
@@ -502,6 +512,10 @@ if which dirname >/dev/null 2>&1; then
     }
 fi
 
+echo "---------------------------"
+echo " Configuring and compiling "
+echo "---------------------------"
+
 # Create the configure script.
 if ! [ -f ./configure ]; then
     assert_program autoreconf
@@ -515,8 +529,8 @@ if [ -n "$INSTALL_DIR" ]; then
     prefix=--bindir=$INSTALL_DIR
 fi
 
-echo "./configure -q $prefix && make -s"
-eval "./configure -q $(quote "$prefix") && make -s || exit_fail"
+echo "./configure -q $prefix && make clean && make -s"
+eval "./configure -q $(quote "$prefix") && make clean && make -s || exit_fail"
 echo
 if [ -n "$INSTALL_DIR" ]; then
     echo "---------------------------"