Attachment #246755 for bug #275512

View | Details | Raw Unified | Return to bug 275512
Collapse All | Expand All




PORTNAME=	aria2
DISTVERSION=	1.37.0
PORTREVISION=	4
CATEGORIES=	www
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${DISTVERSION}/
		LOCAL/sunpoet

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	Yet another download tool

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

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 \

		--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
CARES_CONFIGURE_WITH=	libcares

EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
EXPAT_CONFIGURE_WITH=	libexpat

LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
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_USES=		gettext localbase
SQLITE_CONFIGURE_WITH=	sqlite3
SQLITE_USES=		sqlite
SQLITE_CONFIGURE_WITH=	sqlite3

SSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
SSH2_CONFIGURE_WITH=	libssh2

STATIC_CONFIGURE_ENABLE=static

post-install:

Lines 1-3 Link Here

(-)b/www/aria2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1632227480	1	TIMESTAMP = 1701638778
2	SHA256 (aria2-1.36.0.tar.xz) = 58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5	2	SHA256 (aria2-1.37.0.tar.xz) = 60a420ad7085eb616cb6e2bdf0a7206d68ff3d37fb5a956dc44242eb2f79b66b
3	SIZE (aria2-1.36.0.tar.xz) = 1619036	3	SIZE (aria2-1.37.0.tar.xz) = 1705256

Added Link Here

(-)b/www/aria2/files/patch-Makefile.am (+8 lines)
1	--- Makefile.am.orig 2023-12-03 20:37:01 UTC
2	+++ Makefile.am
3	@@ -1,4 +1,4 @@
4	-SUBDIRS = po lib deps src doc test
5	+SUBDIRS = po lib src doc test
6
7	ACLOCAL_AMFLAGS = -I m4 --install
8	RST2HTML = @RST2HTML@




--- 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:

Return to bug 275512

Lines 1-9 Link Here

(-)b/www/aria2/Makefile (-28 / +38 lines)
1	PORTNAME= aria2	1	PORTNAME= aria2
2	PORTVERSION= 1.36.0	2	DISTVERSION= 1.37.0
3	PORTREVISION= 4
4	CATEGORIES= www	3	CATEGORIES= www
5	MASTER_SITES= https://github.com/aria2/aria2/releases/download/release-${PORTVERSION}/ \	4	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${DISTVERSION}/
6	LOCAL/sunpoet
7		5
8	MAINTAINER= sunpoet@FreeBSD.org	6	MAINTAINER= sunpoet@FreeBSD.org
9	COMMENT= Yet another download tool	7	COMMENT= Yet another download tool
Lines 13-19 WWW= https://aria2.github.io/ \ Link Here
13	LICENSE= GPLv2	11	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
15		13
16	USES= compiler:c++11-lib cpe libtool pathfix pkgconfig ssl tar:xz	14	LIB_DEPENDS= libwslay_shared.so:www/wslay
		15
		16	USES= autoreconf compiler:c++11-lib cpe gettext-tools libtool pathfix pkgconfig ssl tar:xz
		17	CPE_VENDOR= aria2_project
		18	USE_LDCONFIG= yes
		19
		20	EXTRACT_AFTER_ARGS= --exclude deps
		21
		22	GNU_CONFIGURE= yes
		23	INSTALL_TARGET= install-strip
		24	PORTDOCS= *
		25	USE_CXXSTD= c++11
		26	USE_RC_SUBR= aria2
		27
		28	ARIA2_DISK_CACHE?= 32M
		29
		30	CONFIGURE_ENV= OPENSSL_CFLAGS=-I${OPENSSLINC} \
		31	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
		32	ac_cv_path_RST2HTML=no
17		33
18	CONFIGURE_ARGS= --disable-epoll \	34	CONFIGURE_ARGS= --disable-epoll \
19	--enable-bittorrent \	35	--enable-bittorrent \
Lines 31-76 CONFIGURE_ARGS= --disable-epoll \ Link Here
31	--without-libgcrypt \	47	--without-libgcrypt \
32	--without-libgmp \	48	--without-libgmp \
33	--without-libnettle	49	--without-libnettle
34	CONFIGURE_ENV= OPENSSL_CFLAGS=-I${OPENSSLINC} \
35	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
36	ac_cv_path_RST2HTML=no
37	GNU_CONFIGURE= yes
38	INSTALL_TARGET= install-strip
39	USE_CXXSTD= c++11
40	USE_LDCONFIG= yes
41	USE_RC_SUBR= aria2
42
43	PORTDOCS= *
44
45	ARIA2_DISK_CACHE?= 16M
46
47	CPE_VENDOR= aria2_project
48		50
49	OPTIONS_DEFINE= CARES DOCS LIBUV NLS SQLITE SSH2 STATIC	51	OPTIONS_DEFINE= CARES DOCS LIBUV NLS SQLITE SSH2 STATIC
50	OPTIONS_SINGLE= XML	52	OPTIONS_SINGLE= XML
51	OPTIONS_SINGLE_XML= EXPAT LIBXML2	53	OPTIONS_SINGLE_XML= EXPAT LIBXML2
52	OPTIONS_DEFAULT=LIBXML2 SQLITE STATIC	54	OPTIONS_DEFAULT=LIBXML2 SQLITE STATIC
53	OPTIONS_SUB= yes	55	OPTIONS_SUB= yes
		56
54	LIBUV_DESC= Event polling via libuv	57	LIBUV_DESC= Event polling via libuv
55	SSH2_DESC= SSH2 protocol support	58	SSH2_DESC= SSH2 protocol support
56		59
57	CARES_CONFIGURE_WITH= libcares
58	CARES_LIB_DEPENDS= libcares.so:dns/c-ares	60	CARES_LIB_DEPENDS= libcares.so:dns/c-ares
59	EXPAT_CONFIGURE_WITH= libexpat	61	CARES_CONFIGURE_WITH= libcares
		62
60	EXPAT_LIB_DEPENDS= libexpat.so:textproc/expat2	63	EXPAT_LIB_DEPENDS= libexpat.so:textproc/expat2
61	LIBUV_CONFIGURE_WITH= libuv	64	EXPAT_CONFIGURE_WITH= libexpat
		65
62	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv	66	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv
63	LIBXML2_CONFIGURE_WITH= libxml2	67	LIBUV_CONFIGURE_WITH= libuv
64	LIBXML2_USE= GNOME=libxml2	68
65	LIBXML2_USES= gnome	69	LIBXML2_USES= gnome
		70	LIBXML2_USE= GNOME=libxml2
		71	LIBXML2_CONFIGURE_WITH= libxml2
		72
		73	NLS_USES= gettext localbase
		74	NLS_LDFLAGS= -lintl
66	NLS_CONFIGURE_OFF= --disable-nls --without-libintl-prefix	75	NLS_CONFIGURE_OFF= --disable-nls --without-libintl-prefix
67	NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE}	76	NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE}
68	NLS_LDFLAGS= -lintl	77
69	NLS_USES= gettext localbase
70	SQLITE_CONFIGURE_WITH= sqlite3
71	SQLITE_USES= sqlite	78	SQLITE_USES= sqlite
72	SSH2_CONFIGURE_WITH= libssh2	79	SQLITE_CONFIGURE_WITH= sqlite3
		80
73	SSH2_LIB_DEPENDS= libssh2.so:security/libssh2	81	SSH2_LIB_DEPENDS= libssh2.so:security/libssh2
		82	SSH2_CONFIGURE_WITH= libssh2
		83
74	STATIC_CONFIGURE_ENABLE=static	84	STATIC_CONFIGURE_ENABLE=static
75		85
76	post-install:	86	post-install:

Added Link Here

(-)b/www/aria2/files/patch-configure.ac (+29 lines)
1	--- configure.ac.orig 2023-12-03 20:27:29 UTC
2	+++ configure.ac
3	@@ -1000,13 +1000,13 @@ if test "x$enable_websocket" = "xyes"; then
4	fi
5
6	if test "x$enable_websocket" = "xyes"; then
7	- AC_CONFIG_SUBDIRS([deps/wslay])
8	+# AC_CONFIG_SUBDIRS([deps/wslay])
9	enable_websocket=yes
10	AC_DEFINE([ENABLE_WEBSOCKET], [1],
11	[Define 1 if WebSocket support is enabled.])
12	# $(top_srcdir) for `make distcheck`
13	- WSLAY_CFLAGS="-I\$(top_builddir)/deps/wslay/lib/includes -I\$(top_srcdir)/deps/wslay/lib/includes"
14	- WSLAY_LIBS="\$(top_builddir)/deps/wslay/lib/libwslay.la"
15	+ WSLAY_CFLAGS="-I\$(includedir)/wslay"
16	+ WSLAY_LIBS="-lwslay_shared"
17	AC_SUBST([WSLAY_CFLAGS])
18	AC_SUBST([WSLAY_LIBS])
19	fi
20	@@ -1070,8 +1070,7 @@ AC_CONFIG_FILES([Makefile
21	doc/manual-src/ru/Makefile
22	doc/manual-src/ru/conf.py
23	doc/manual-src/pt/Makefile
24	- doc/manual-src/pt/conf.py
25	- deps/Makefile])
26	+ doc/manual-src/pt/conf.py])
27	AC_OUTPUT
28
29	AC_MSG_NOTICE([summary of build options: