From d9eaabc6770315cf1d26474c0df646a42a6d1156 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Thu, 28 Feb 2019 18:45:20 -0300
Subject: [PATCH] qi: publish new version 1.0-rc58

---
 qi/Makefile                       |  9 +++++----
 qi/doc/qi.1                       |  2 +-
 recipes/tools/qi/recipe           | 17 ++++++++++++++---
 sources/SOURCELIST.txt            |  2 +-
 sources/qi-1.0-rc57.tar.lz.sha256 |  1 -
 sources/qi-1.0-rc58.tar.lz.sha256 |  1 +
 6 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 sources/qi-1.0-rc57.tar.lz.sha256
 create mode 100644 sources/qi-1.0-rc58.tar.lz.sha256

diff --git a/qi/Makefile b/qi/Makefile
index e9793486..ea4a6b14 100644
--- a/qi/Makefile
+++ b/qi/Makefile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 project		= qi
-version		= 1.0-rc57
+version		= 1.0-rc58
 
 ## DO NOT MAKE CHANGES HERE.
 #
@@ -40,7 +40,7 @@ MAKEINFO	= makeinfo
 INSTALL         = install
 INSTALL_PROGRAM = ${INSTALL} -p -m 755
 INSTALL_DATA    = ${INSTALL} -p -m 644
-INSTALL_DIR     = ${INSTALL} -d -m 755
+INSTALL_DIR     = mkdir -p -m 755
 HELP2MAN_OPTS   = --version-option=-V
 
 .PHONY: all \
@@ -112,7 +112,7 @@ doc/$(project).html : doc/$(project).texi
 
 dist : doc
 	ln -sf . $(DISTNAME)
-	tar -Hustar -cvf $(DISTNAME).tar \
+	tarlz --solid -9 -cvf $(DISTNAME).tar.lz \
 	  $(DISTNAME)/AUTHORS \
 	  $(DISTNAME)/COPYING \
 	  $(DISTNAME)/CREDITS \
@@ -132,7 +132,6 @@ dist : doc
 	  $(DISTNAME)/etc/$(project)rc.in \
 	  $(DISTNAME)/src/qi.in
 	rm -f $(DISTNAME)
-	lzip -v -9 $(DISTNAME).tar
 	sha256sum $(DISTNAME).tar.lz > $(DISTNAME).tar.lz.sha256
 
 distclean : clean
@@ -159,6 +158,8 @@ install : all install-info install-man
 	@echo "*** Installing config file on $(DESTDIR)${sysconfdir} ..."
 	$(INSTALL_DATA) etc/$(project)rc "$(DESTDIR)${sysconfdir}/$(project)rc"
 
+	@echo "Done."
+
 install-info :
 
 	@echo "*** Checking required directory ..."
diff --git a/qi/doc/qi.1 b/qi/doc/qi.1
index 5f610b23..10b849dc 100644
--- a/qi/doc/qi.1
+++ b/qi/doc/qi.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH QI "1" "February 2019" "qi 1.0-rc57" "User Commands"
+.TH QI "1" "February 2019" "qi 1.0-rc58" "User Commands"
 .SH NAME
 qi \- package manager
 .SH SYNOPSIS
diff --git a/recipes/tools/qi/recipe b/recipes/tools/qi/recipe
index 382ee97f..41bbcec5 100644
--- a/recipes/tools/qi/recipe
+++ b/recipes/tools/qi/recipe
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 program=qi
-version=1.0-rc57
+version=1.0-rc58
 arch=noarch
 release=1
 
@@ -66,7 +66,18 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
-    ./configure $configure_args --packagedir=/usr/pkg --targetdir=/
+    ./configure \
+     --prefix=/usr \
+     --libexecdir=/usr/libexec \
+     --bindir=/usr/bin \
+     --sbindir=/usr/sbin \
+     --sysconfdir=/etc \
+     --localstatedir=/var \
+     --infodir=/usr/share/info \
+     --mandir=/usr/share/man \
+     --docdir=/usr/share/doc \
+     --packagedir=/usr/pkg \
+     --targetdir=/
 
     make -j${jobs} DESTDIR="$destdir" install
 
@@ -75,7 +86,7 @@ build()
     # Copy the config file used in the temporary system
     if test -r /tools/etc/qirc
     then
-        cp -p /tools/etc/qirc "${destdir}/etc/qirc"
+        cp -p /tools/etc/qirc "${destdir}/etc/"
         cp -p /tools/etc/qirc "${destdir}/etc/qirc.bak"
         chmod 644 "${destdir}"/etc/qirc*
     fi
diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt
index 9d52e802..3bb9e58f 100644
--- a/sources/SOURCELIST.txt
+++ b/sources/SOURCELIST.txt
@@ -209,7 +209,7 @@ http://rsync.dragora.org/current/sources/net-tools-code-0eebece8c964e3cfa8a018f4
 http://rsync.dragora.org/current/sources/perp-2.07.tar.gz
 http://rsync.dragora.org/current/sources/squashfs-tools-master.zip
 http://rsync.dragora.org/current/sources/xf86-video-intel-e5ff8e1.tar.lz
-http://rsync.dragora.org/v3/sources/qi-1.0-rc57.tar.lz
+http://rsync.dragora.org/v3/sources/qi-1.0-rc58.tar.lz
 http://savannah.c3sl.ufpr.br/libpipeline/libpipeline-1.5.0.tar.gz
 http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-2.44_01.tar.gz
 http://sethwklein.net/iana-etc-2.30.tar.bz2
diff --git a/sources/qi-1.0-rc57.tar.lz.sha256 b/sources/qi-1.0-rc57.tar.lz.sha256
deleted file mode 100644
index a15c9b4c..00000000
--- a/sources/qi-1.0-rc57.tar.lz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-6de738b02d43bb14c80ffb88a2155036b76a3c8050cbfbf59c3413fc99155e67  qi-1.0-rc57.tar.lz
diff --git a/sources/qi-1.0-rc58.tar.lz.sha256 b/sources/qi-1.0-rc58.tar.lz.sha256
new file mode 100644
index 00000000..e87499ac
--- /dev/null
+++ b/sources/qi-1.0-rc58.tar.lz.sha256
@@ -0,0 +1 @@
+6cc5f29d5a624392a14f37839ac10424ac1b4ae31190bcf811e315411fd74926  qi-1.0-rc58.tar.lz
-- 
2.11.4.GIT