@@ -, +, @@ 
---
 net-p2p/libtorrent-rasterbar/Makefile              | 22 +++++++++++++++-------
 net-p2p/libtorrent-rasterbar/distinfo              |  8 +++-----
 .../files/patch-include_libtorrent_config.hpp      | 15 ---------------
 3 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp
--- b/net-p2p/libtorrent-rasterbar/Makefile	
+++ b/net-p2p/libtorrent-rasterbar/Makefile	
@@ -2,13 +2,10 @@ 
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-PORTVERSION=	1.1.4
-PORTREVISION=	3
+DISTVERSIONPREFIX=	${GH_PROJECT}-
+DISTVERSION=	1_1_5-41
+DISTVERSIONSUFFIX=	-g43d7f980d
 CATEGORIES?=	net-p2p ipv6
-MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
-
-PATCH_SITES=	https://github.com/arvidn/libtorrent/commit/
-PATCHFILES=	7eb3cf6bc6db.patch:-p1
 
 MAINTAINER=	rezny@FreeBSD.org
 COMMENT?=	C++ library implementing a BitTorrent client
@@ -21,7 +18,11 @@ LIB_DEPENDS+=	libboost_chrono.so:devel/boost-libs \
 
 BROKEN_powerpc64=	fails to build: client_test.cpp: undefined reference to std::__cxx11::basic_string
 
-USES+=		compiler:c++11-lib iconv:wchar_t libtool pathfix pkgconfig ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	arvidn
+GH_PROJECT=	libtorrent
+
+USES+=		autoreconf:build compiler:c++11-lib iconv:wchar_t libtool pathfix pkgconfig ssl
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -44,6 +45,7 @@ PORTDOCS=	${DOCFILES} docs/*
 PORTEXAMPLES=	*.cpp
 
 OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES LOGGING TEST
+OPTIONS_DEFAULT=LOGGING
 OPTIONS_SUB=	yes
 LOGGING_DESC=	Enable disk stat logging and logging to disk
 
@@ -63,6 +65,12 @@ CONFIGURE_ARGS+=	--disable-python-binding
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/include|${PREFIX}/include|' \
 		${WRKSRC}/Jamfile
+	@${REINPLACE_CMD} -e '/LIBTORRENT_VERSION/s/".*"/"${PORTVERSION}"/' \
+		-e '/LIBTORRENT_REVISION/s/".*"/"${GH_TAGNAME:C/.*-g//}"/' \
+		${WRKSRC}/include/libtorrent/version.hpp
+
+pre-configure:
+	@(cd ${WRKSRC} && ./autotool.sh)
 
 post-configure:
 	${FIND} ${WRKSRC} -name Makefile -o -name link_flags | \
--- b/net-p2p/libtorrent-rasterbar/distinfo	
+++ b/net-p2p/libtorrent-rasterbar/distinfo	
@@ -1,5 +1,3 @@ 
-TIMESTAMP = 1500241161
-SHA256 (libtorrent-rasterbar-1.1.4.tar.gz) = ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6
-SIZE (libtorrent-rasterbar-1.1.4.tar.gz) = 3917557
-SHA256 (7eb3cf6bc6db.patch) = d343654786f02112b0787d999f3c569bcb9bb31dfc2be52aa26007b5f5e3ca0b
-SIZE (7eb3cf6bc6db.patch) = 1180
+TIMESTAMP = 1514045210
+SHA256 (arvidn-libtorrent-libtorrent-1_1_5-41-g43d7f980d_GH0.tar.gz) = 0087e4c4ea0f8dc4940ddd48e51de3f813b8ab108eaf3ca1834cafccf0a12d04
+SIZE (arvidn-libtorrent-libtorrent-1_1_5-41-g43d7f980d_GH0.tar.gz) = 2891751
--- a/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp	
+++ /dev/null	
@@ -1,15 +0,0 @@ 
---- include/libtorrent/config.hpp.orig	2017-07-02 16:18:10 UTC
-+++ include/libtorrent/config.hpp
-@@ -195,12 +195,6 @@ POSSIBILITY OF SUCH DAMAGE.
- #define TORRENT_USE_EXECINFO 1
- #endif
- 
--#else // __APPLE__
--// FreeBSD has a reasonable iconv signature
--// unless we're on glibc
--#ifndef __GLIBC__
--# define TORRENT_ICONV_ARG(x) (x)
--#endif
- #endif // __APPLE__
- 
- #define TORRENT_HAVE_MMAP 1