wok rev 21755

Up tinyproxy (1.10.0), again
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jun 19 18:44:13 2019 +0200 (2019-06-19)
parents 8b9f768b711e
children 56ab00f400e9
files tinyproxy/receipt tinyproxy/stuff/no-docs-and-tests.diff
line diff
     1.1 --- a/tinyproxy/receipt	Wed Jun 19 17:26:14 2019 +0200
     1.2 +++ b/tinyproxy/receipt	Wed Jun 19 18:44:13 2019 +0200
     1.3 @@ -6,36 +6,35 @@
     1.4  SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems."
     1.5  MAINTAINER="slaxemulator@gmail.com"
     1.6  LICENSE="GPL2"
     1.7 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.8 +TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.9  WEB_SITE="https://tinyproxy.github.io/"
    1.10  WGET_URL="https://github.com/tinyproxy/tinyproxy/archive/$VERSION.tar.gz"
    1.11  
    1.12 -BUILD_DEPENDS="wget"
    1.13 +BUILD_DEPENDS="wget automake"
    1.14  
    1.15  # Rules to configure and make the package.
    1.16  compile_rules()
    1.17  {
    1.18 -	patch -Np1 -i $stuff/no-docs-and-tests.diff
    1.19 +	sed -i '/docs/d;/tests$/d;s|m4macros \\|m4macros|' Makefile.*
    1.20 +	./autogen.sh
    1.21  	./configure \
    1.22  		--prefix=/usr \
    1.23  		--infodir=/usr/share/info \
    1.24  		--mandir=/usr/share/man \
    1.25 -		--sysconfdir=/etc/tinyproxy \
    1.26 +		--sysconfdir=/etc \
    1.27  		--localstatedir=/var \
    1.28  		$CONFIGURE_ARGS &&
    1.29  	make && make DESTDIR=$DESTDIR install
    1.30  	# Provide sane defaults
    1.31    	sed -i '/^#Listen/a\Listen 127.0.0.1' "$DESTDIR/etc/tinyproxy/tinyproxy.conf"
    1.32 -
    1.33  }
    1.34  
    1.35  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.36  genpkg_rules()
    1.37  {
    1.38  	mkdir -p $fs/usr/share $fs/etc/init.d
    1.39 -	cp -a $install/usr/sbin $fs/usr
    1.40 +	cp -a $install/usr/bin $fs/usr
    1.41  	cp -a $install/usr/share/tinyproxy $fs/usr/share
    1.42  	cp -a $install/etc/tinyproxy $fs/etc
    1.43  	cp -a $stuff/tinyproxy $fs/etc/init.d
    1.44  }
    1.45 -
     2.1 --- a/tinyproxy/stuff/no-docs-and-tests.diff	Wed Jun 19 17:26:14 2019 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,98 +0,0 @@
     2.4 -diff --git a/Makefile.am b/Makefile.am
     2.5 -index 7de41f2..9d1f99b 100644
     2.6 ---- a/Makefile.am
     2.7 -+++ b/Makefile.am
     2.8 -@@ -2,9 +2,7 @@ SUBDIRS = \
     2.9 - 	src \
    2.10 - 	data \
    2.11 - 	etc \
    2.12 --	docs \
    2.13 - 	m4macros \
    2.14 --	tests
    2.15 - 
    2.16 - # tools want this on a single line
    2.17 - ACLOCAL_AMFLAGS = -I m4macros
    2.18 -diff --git a/Makefile.in b/Makefile.in
    2.19 -index d0ec918..5be49d4 100644
    2.20 ---- a/Makefile.in
    2.21 -+++ b/Makefile.in
    2.22 -@@ -221,9 +221,7 @@ SUBDIRS = \
    2.23 - 	src \
    2.24 - 	data \
    2.25 - 	etc \
    2.26 --	docs \
    2.27 - 	m4macros \
    2.28 --	tests
    2.29 - 
    2.30 - 
    2.31 - # tools want this on a single line
    2.32 -diff --git a/configure b/configure
    2.33 -index 01d6883..facfadd 100755
    2.34 ---- a/configure
    2.35 -+++ b/configure
    2.36 -@@ -6810,65 +6810,8 @@
    2.37 - fi
    2.38 - 
    2.39 - 
    2.40 --
    2.41 --
    2.42 --
    2.43 --
    2.44 --
    2.45 --# Check for asciidoc
    2.46 --# Extract the first word of "a2x", so it can be a program name with args.
    2.47 --set dummy a2x; ac_word=$2
    2.48 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2.49 --$as_echo_n "checking for $ac_word... " >&6; }
    2.50 --if test "${ac_cv_path_A2X+set}" = set; then :
    2.51 --  $as_echo_n "(cached) " >&6
    2.52 --else
    2.53 --  case $A2X in
    2.54 --  [\\/]* | ?:[\\/]*)
    2.55 --  ac_cv_path_A2X="$A2X" # Let the user override the test with a path.
    2.56 --  ;;
    2.57 --  *)
    2.58 --  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2.59 --for as_dir in $PATH
    2.60 --do
    2.61 --  IFS=$as_save_IFS
    2.62 --  test -z "$as_dir" && as_dir=.
    2.63 --    for ac_exec_ext in '' $ac_executable_extensions; do
    2.64 --  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2.65 --    ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext"
    2.66 --    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2.67 --    break 2
    2.68 --  fi
    2.69 --done
    2.70 --  done
    2.71 --IFS=$as_save_IFS
    2.72 --
    2.73 --  test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no"
    2.74 --  ;;
    2.75 --esac
    2.76 --fi
    2.77 --A2X=$ac_cv_path_A2X
    2.78 --if test -n "$A2X"; then
    2.79 --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5
    2.80 --$as_echo "$A2X" >&6; }
    2.81 --else
    2.82 --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2.83 --$as_echo "no" >&6; }
    2.84 --fi
    2.85 --
    2.86 --
    2.87 -- if test "x$A2X" != "xno"; then
    2.88 --  HAVE_A2X_TRUE=
    2.89 --  HAVE_A2X_FALSE='#'
    2.90 --else
    2.91 -   HAVE_A2X_TRUE='#'
    2.92 -   HAVE_A2X_FALSE=
    2.93 --fi
    2.94 --
    2.95 --if test x"$A2X" = x"no"; then
    2.96 --  as_fn_error $? "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5
    2.97 --fi
    2.98 --
    2.99 - ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile docs/Makefile docs/man5/Makefile docs/man5/tinyproxy.conf.txt docs/man8/Makefile docs/man8/tinyproxy.txt m4macros/Makefile tests/Makefile tests/scripts/Makefile"
   2.100 - 
   2.101 -