New diff based on the excellent recommendation from sthen@.
Comments?
OK?
Cheers.
Elias mariani@
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/net/qbittorrent/Makefile.inc,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.inc
--- Makefile.inc 2 Dec 2020 22:33:17 -0000 1.14
+++ Makefile.inc 25 May 2021 17:53:54 -0000
@@ -3,7 +3,7 @@
# qmake picks up gcrypt.h even though it's unused
DPB_PROPERTIES = nojunk
-VER = 4.3.1
+VER = 4.3.5
DISTNAME = qbittorrent-${VER}
DIST_SUBDIR = qbittorrent
@@ -22,4 +22,8 @@ MASTER_SITES ?= ${MASTER_SITE_SOURCEFORG
MODULES += x11/qt5
USE_GMAKE = Yes
-CONFIGURE_STYLE = gnu
+
+CONFIGURE_STYLE = autoreconf
+AUTORECONF = ${WRKSRC}/bootstrap.sh
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.16
Index: qbittorrent/distinfo
===================================================================
RCS file: /cvs/ports/net/qbittorrent/qbittorrent/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- qbittorrent/distinfo 2 Dec 2020 22:33:17 -0000 1.11
+++ qbittorrent/distinfo 25 May 2021 17:53:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (qbittorrent/qbittorrent-4.3.1.tar.gz) =
VQpJb1xzzVep1/Ct2uMGFgu7Qf1R8dBXYxVFViDmsPE=
-SIZE (qbittorrent/qbittorrent-4.3.1.tar.gz) = 7864145
+SHA256 (qbittorrent/qbittorrent-4.3.5.tar.gz) =
3CrtmhW9lwicWMu00PB6LEw0lghS++SGjXmXbi2wOrY=
+SIZE (qbittorrent/qbittorrent-4.3.5.tar.gz) = 8016819
Index: qbittorrent/patches/patch-configure
===================================================================
RCS file: qbittorrent/patches/patch-configure
diff -N qbittorrent/patches/patch-configure
--- qbittorrent/patches/patch-configure 6 Feb 2020 20:00:18 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2020/02/06 20:00:18 rsadowski Exp $
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -5478,12 +5478,12 @@ if test -n "$zlib_CFLAGS"; then
- pkg_cv_zlib_CFLAGS="$zlib_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.5.2\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.3\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.3") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.5.2" 2>/dev/null`
-+ pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -5495,12 +5495,12 @@ if test -n "$zlib_LIBS"; then
- pkg_cv_zlib_LIBS="$zlib_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.5.2\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.3\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.3") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.5.2" 2>/dev/null`
-+ pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -5521,14 +5521,14 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "zlib >= 1.2.5.2" 2>&1`
-+ zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "zlib >= 1.2.3" 2>&1`
- else
-- zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"zlib >= 1.2.5.2" 2>&1`
-+ zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"zlib >= 1.2.3" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$zlib_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (zlib >= 1.2.5.2) were not met:
-+ as_fn_error $? "Package requirements (zlib >= 1.2.3) were not met:
-
- $zlib_PKG_ERRORS
-
Index: qbittorrent/patches/patch-configure_ac
===================================================================
RCS file: qbittorrent/patches/patch-configure_ac
diff -N qbittorrent/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ qbittorrent/patches/patch-configure_ac 25 May 2021 17:53:54 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -185,12 +185,12 @@ PKG_CHECK_MODULES(libtorrent,
+ LIBS="$libtorrent_LIBS $LIBS"])
+
+ PKG_CHECK_MODULES(openssl,
+- [openssl >= 1.1.1],
++ [openssl >= 1.0.0],
+ [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
+ LIBS="$openssl_LIBS $LIBS"])
+
+ PKG_CHECK_MODULES(zlib,
+- [zlib >= 1.2.11],
++ [zlib >= 1.2.3],
+ [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
+ LIBS="$zlib_LIBS $LIBS"])
+
Index: qbittorrent-nox/distinfo
===================================================================
RCS file: /cvs/ports/net/qbittorrent/qbittorrent-nox/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- qbittorrent-nox/distinfo 2 Dec 2020 22:33:17 -0000 1.11
+++ qbittorrent-nox/distinfo 25 May 2021 17:53:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (qbittorrent/qbittorrent-4.3.1.tar.gz) =
VQpJb1xzzVep1/Ct2uMGFgu7Qf1R8dBXYxVFViDmsPE=
-SIZE (qbittorrent/qbittorrent-4.3.1.tar.gz) = 7864145
+SHA256 (qbittorrent/qbittorrent-4.3.5.tar.gz) =
3CrtmhW9lwicWMu00PB6LEw0lghS++SGjXmXbi2wOrY=
+SIZE (qbittorrent/qbittorrent-4.3.5.tar.gz) = 8016819
Index: qbittorrent-nox/patches/patch-configure
===================================================================
RCS file: qbittorrent-nox/patches/patch-configure
diff -N qbittorrent-nox/patches/patch-configure
--- qbittorrent-nox/patches/patch-configure 6 Feb 2020 20:00:18 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2020/02/06 20:00:18 rsadowski Exp $
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -5478,12 +5478,12 @@ if test -n "$zlib_CFLAGS"; then
- pkg_cv_zlib_CFLAGS="$zlib_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.5.2\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.3\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.3") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.5.2" 2>/dev/null`
-+ pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -5495,12 +5495,12 @@ if test -n "$zlib_LIBS"; then
- pkg_cv_zlib_LIBS="$zlib_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.5.2\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"zlib >= 1.2.3\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.3") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.5.2" 2>/dev/null`
-+ pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -5521,14 +5521,14 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "zlib >= 1.2.5.2" 2>&1`
-+ zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "zlib >= 1.2.3" 2>&1`
- else
-- zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"zlib >= 1.2.5.2" 2>&1`
-+ zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"zlib >= 1.2.3" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$zlib_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (zlib >= 1.2.5.2) were not met:
-+ as_fn_error $? "Package requirements (zlib >= 1.2.3) were not met:
-
- $zlib_PKG_ERRORS
-
Index: qbittorrent-nox/patches/patch-configure_ac
===================================================================
RCS file: qbittorrent-nox/patches/patch-configure_ac
diff -N qbittorrent-nox/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ qbittorrent-nox/patches/patch-configure_ac 25 May 2021 17:53:54 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -185,12 +185,12 @@ PKG_CHECK_MODULES(libtorrent,
+ LIBS="$libtorrent_LIBS $LIBS"])
+
+ PKG_CHECK_MODULES(openssl,
+- [openssl >= 1.1.1],
++ [openssl >= 1.0.0],
+ [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
+ LIBS="$openssl_LIBS $LIBS"])
+
+ PKG_CHECK_MODULES(zlib,
+- [zlib >= 1.2.11],
++ [zlib >= 1.2.3],
+ [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
+ LIBS="$zlib_LIBS $LIBS"])
+
