Attachment 246755 Details for Bug 275512 – Patch for aria2

[patch] Patch for aria2

aria2-1370.patch (text/plain), 4.94 KB, created by Daniel Engberg on 2023-12-03 21:33:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-12-03 21:33:15 UTC

Size: 4.94 KB

patch

obsolete

>diff --git a/www/aria2/Makefile b/www/aria2/Makefile
>index 47cf4e1ca461..c79cdcbdea16 100644
>--- a/www/aria2/Makefile
>+++ b/www/aria2/Makefile
>@@ -1,9 +1,7 @@
> PORTNAME=	aria2
>-PORTVERSION=	1.36.0
>-PORTREVISION=	4
>+DISTVERSION=	1.37.0
> CATEGORIES=	www
>-MASTER_SITES=	https://github.com/aria2/aria2/releases/download/release-${PORTVERSION}/ \
>-		LOCAL/sunpoet
>+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${DISTVERSION}/
> 
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	Yet another download tool
>@@ -13,7 +11,25 @@ WWW=		https://aria2.github.io/ \
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		compiler:c++11-lib cpe libtool pathfix pkgconfig ssl tar:xz
>+LIB_DEPENDS=	libwslay_shared.so:www/wslay
>+
>+USES=		autoreconf compiler:c++11-lib cpe gettext-tools libtool pathfix pkgconfig ssl tar:xz
>+CPE_VENDOR=	aria2_project
>+USE_LDCONFIG=	yes
>+
>+EXTRACT_AFTER_ARGS=	--exclude deps
>+
>+GNU_CONFIGURE=	yes
>+INSTALL_TARGET=	install-strip
>+PORTDOCS=	*
>+USE_CXXSTD=	c++11
>+USE_RC_SUBR=	aria2
>+
>+ARIA2_DISK_CACHE?=	32M
>+
>+CONFIGURE_ENV=	OPENSSL_CFLAGS=-I${OPENSSLINC} \
>+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
>+		ac_cv_path_RST2HTML=no
> 
> CONFIGURE_ARGS=	--disable-epoll \
> 		--enable-bittorrent \
>@@ -31,46 +47,40 @@ CONFIGURE_ARGS=	--disable-epoll \
> 		--without-libgcrypt \
> 		--without-libgmp \
> 		--without-libnettle
>-CONFIGURE_ENV=	OPENSSL_CFLAGS=-I${OPENSSLINC} \
>-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
>-		ac_cv_path_RST2HTML=no
>-GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install-strip
>-USE_CXXSTD=	c++11
>-USE_LDCONFIG=	yes
>-USE_RC_SUBR=	aria2
>-
>-PORTDOCS=	*
>-
>-ARIA2_DISK_CACHE?=	16M
>-
>-CPE_VENDOR=	aria2_project
> 
> OPTIONS_DEFINE=	CARES DOCS LIBUV NLS SQLITE SSH2 STATIC
> OPTIONS_SINGLE=	XML
> OPTIONS_SINGLE_XML=	EXPAT LIBXML2
> OPTIONS_DEFAULT=LIBXML2 SQLITE STATIC
> OPTIONS_SUB=	yes
>+
> LIBUV_DESC=	Event polling via libuv
> SSH2_DESC=	SSH2 protocol support
> 
>-CARES_CONFIGURE_WITH=	libcares
> CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
>-EXPAT_CONFIGURE_WITH=	libexpat
>+CARES_CONFIGURE_WITH=	libcares
>+
> EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
>-LIBUV_CONFIGURE_WITH=	libuv
>+EXPAT_CONFIGURE_WITH=	libexpat
>+
> LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
>-LIBXML2_CONFIGURE_WITH=	libxml2
>-LIBXML2_USE=		GNOME=libxml2
>+LIBUV_CONFIGURE_WITH=	libuv
>+
> LIBXML2_USES=		gnome
>+LIBXML2_USE=		GNOME=libxml2
>+LIBXML2_CONFIGURE_WITH=	libxml2
>+
>+NLS_USES=		gettext localbase
>+NLS_LDFLAGS=		-lintl
> NLS_CONFIGURE_OFF=	--disable-nls --without-libintl-prefix
> NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
>-NLS_LDFLAGS=		-lintl
>-NLS_USES=		gettext localbase
>-SQLITE_CONFIGURE_WITH=	sqlite3
>+
> SQLITE_USES=		sqlite
>-SSH2_CONFIGURE_WITH=	libssh2
>+SQLITE_CONFIGURE_WITH=	sqlite3
>+
> SSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
>+SSH2_CONFIGURE_WITH=	libssh2
>+
> STATIC_CONFIGURE_ENABLE=static
> 
> post-install:
>diff --git a/www/aria2/distinfo b/www/aria2/distinfo
>index 75acc245dfc7..38d6baad153a 100644
>--- a/www/aria2/distinfo
>+++ b/www/aria2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1632227480
>-SHA256 (aria2-1.36.0.tar.xz) = 58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5
>-SIZE (aria2-1.36.0.tar.xz) = 1619036
>+TIMESTAMP = 1701638778
>+SHA256 (aria2-1.37.0.tar.xz) = 60a420ad7085eb616cb6e2bdf0a7206d68ff3d37fb5a956dc44242eb2f79b66b
>+SIZE (aria2-1.37.0.tar.xz) = 1705256
>diff --git a/www/aria2/files/patch-Makefile.am b/www/aria2/files/patch-Makefile.am
>new file mode 100644
>index 000000000000..be75d1315323
>--- /dev/null
>+++ b/www/aria2/files/patch-Makefile.am
>@@ -0,0 +1,8 @@
>+--- Makefile.am.orig	2023-12-03 20:37:01 UTC
>++++ Makefile.am
>+@@ -1,4 +1,4 @@
>+-SUBDIRS =  po lib deps src doc test
>++SUBDIRS =  po lib src doc test
>+ 
>+ ACLOCAL_AMFLAGS = -I m4 --install
>+ RST2HTML = @RST2HTML@
>diff --git a/www/aria2/files/patch-configure.ac b/www/aria2/files/patch-configure.ac
>new file mode 100644
>index 000000000000..c3c63288b46c
>--- /dev/null
>+++ b/www/aria2/files/patch-configure.ac
>@@ -0,0 +1,29 @@
>+--- configure.ac.orig	2023-12-03 20:27:29 UTC
>++++ configure.ac
>+@@ -1000,13 +1000,13 @@ if test "x$enable_websocket" = "xyes"; then
>+ fi
>+ 
>+ if test "x$enable_websocket" = "xyes"; then
>+-  AC_CONFIG_SUBDIRS([deps/wslay])
>++# AC_CONFIG_SUBDIRS([deps/wslay])
>+   enable_websocket=yes
>+   AC_DEFINE([ENABLE_WEBSOCKET], [1],
>+             [Define 1 if WebSocket support is enabled.])
>+   # $(top_srcdir) for `make distcheck`
>+-  WSLAY_CFLAGS="-I\$(top_builddir)/deps/wslay/lib/includes -I\$(top_srcdir)/deps/wslay/lib/includes"
>+-  WSLAY_LIBS="\$(top_builddir)/deps/wslay/lib/libwslay.la"
>++  WSLAY_CFLAGS="-I\$(includedir)/wslay"
>++  WSLAY_LIBS="-lwslay_shared"
>+   AC_SUBST([WSLAY_CFLAGS])
>+   AC_SUBST([WSLAY_LIBS])
>+ fi
>+@@ -1070,8 +1070,7 @@ AC_CONFIG_FILES([Makefile
>+                 doc/manual-src/ru/Makefile
>+                 doc/manual-src/ru/conf.py
>+                 doc/manual-src/pt/Makefile
>+-                doc/manual-src/pt/conf.py
>+-                deps/Makefile])
>++                doc/manual-src/pt/conf.py])
>+ AC_OUTPUT
>+ 
>+ AC_MSG_NOTICE([summary of build options:

Actions: View | Diff

Attachments on bug 275512: 246755