# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1560962653 -7200
# Node ID 39c5255f1c90b14347274ba5f5cbb63ca53de817
# Parent  8b9f768b711e21f0266dca23a103fc3f58b75a84
Up tinyproxy (1.10.0), again

diff -r 8b9f768b711e -r 39c5255f1c90 tinyproxy/receipt
--- a/tinyproxy/receipt	Wed Jun 19 17:26:14 2019 +0200
+++ b/tinyproxy/receipt	Wed Jun 19 18:44:13 2019 +0200
@@ -6,36 +6,35 @@
 SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems."
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://tinyproxy.github.io/"
 WGET_URL="https://github.com/tinyproxy/tinyproxy/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="wget"
+BUILD_DEPENDS="wget automake"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -Np1 -i $stuff/no-docs-and-tests.diff
+	sed -i '/docs/d;/tests$/d;s|m4macros \\|m4macros|' Makefile.*
+	./autogen.sh
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		--sysconfdir=/etc/tinyproxy \
+		--sysconfdir=/etc \
 		--localstatedir=/var \
 		$CONFIGURE_ARGS &&
 	make && make DESTDIR=$DESTDIR install
 	# Provide sane defaults
   	sed -i '/^#Listen/a\Listen 127.0.0.1' "$DESTDIR/etc/tinyproxy/tinyproxy.conf"
-
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share $fs/etc/init.d
-	cp -a $install/usr/sbin $fs/usr
+	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/tinyproxy $fs/usr/share
 	cp -a $install/etc/tinyproxy $fs/etc
 	cp -a $stuff/tinyproxy $fs/etc/init.d
 }
-
diff -r 8b9f768b711e -r 39c5255f1c90 tinyproxy/stuff/no-docs-and-tests.diff
--- a/tinyproxy/stuff/no-docs-and-tests.diff	Wed Jun 19 17:26:14 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 7de41f2..9d1f99b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,7 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
--	tests
- 
- # tools want this on a single line
- ACLOCAL_AMFLAGS = -I m4macros
-diff --git a/Makefile.in b/Makefile.in
-index d0ec918..5be49d4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -221,9 +221,7 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
--	tests
- 
- 
- # tools want this on a single line
-diff --git a/configure b/configure
-index 01d6883..facfadd 100755
---- a/configure
-+++ b/configure
-@@ -6810,65 +6810,8 @@
- fi
- 
- 
--
--
--
--
--
--# Check for asciidoc
--# Extract the first word of "a2x", so it can be a program name with args.
--set dummy a2x; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_A2X+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $A2X in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_A2X="$A2X" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no"
--  ;;
--esac
--fi
--A2X=$ac_cv_path_A2X
--if test -n "$A2X"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5
--$as_echo "$A2X" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- if test "x$A2X" != "xno"; then
--  HAVE_A2X_TRUE=
--  HAVE_A2X_FALSE='#'
--else
-   HAVE_A2X_TRUE='#'
-   HAVE_A2X_FALSE=
--fi
--
--if test x"$A2X" = x"no"; then
--  as_fn_error $? "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5
--fi
--
- 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"
- 
-