Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- Update to version 6.0.2 and Remove DEPRECATED

While I'm here:
- Make sure to link to libevent2 - build was failing when both versions
  of libevent libraries were installed
- Add dependency on multimedia/vlc to have videoplayer feature working

PR:		ports/172249
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Feature safe:	yes
  • Loading branch information...
commit 52e4b23bd1a94605795460d539e6b34957936237 1 parent 2a47ae7
pawel authored
80 net-p2p/tribler/Makefile
View
@@ -2,28 +2,29 @@
# $FreeBSD$
PORTNAME= tribler
-PORTVERSION= 5.5.24
-PORTREVISION= 1
+PORTVERSION= 6.0.2
CATEGORIES= net-p2p
#MASTER_SITES= http://dl.tribler.org/
MASTER_SITES= GENTOO/distfiles \
GOOGLE_CODE:apsw
-DISTFILES= ${PORTNAME}_${PORTVERSION}-1ubuntu1_all.deb \
+PROJECTHOST= apsw
+DISTFILES= ${PORTNAME}_${PORTVERSION}_all.deb \
${APSW_DISTFILE}:apsw
-EXTRACT_ONLY= ${PORTNAME}_${PORTVERSION}-1ubuntu1_all.deb
+EXTRACT_ONLY= ${PORTNAME}_${PORTVERSION}_all.deb
MAINTAINER= ports@FreeBSD.org
COMMENT= Streaming capable P2P network client based on BitTorrent
-DEPRECATED= No more public distfiles
-EXPIRATION_DATE= 2012-11-26
-
LICENSE= LGPL21 MIT
LICENSE_COMB= multi
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto
+LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 \
+ vlc:${PORTSDIR}/multimedia/vlc
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
+ ${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser
WRKSRC= ${WRKDIR}/${APSW_DISTNAME}
@@ -32,7 +33,6 @@ USE_WX= 2.8+
WX_COMPS= python
WX_UNICODE= yes
-PROJECTHOST= apsw
USE_SQLITE= 3
USE_PYDISTUTILS=yes
PYDISTUTILS_EGGINFO= ${APSW_DISTNAME:S/-r/_r/}-py${PYTHON_VER}.egg-info
@@ -40,11 +40,13 @@ PYDISTUTILS_EGGINFO= ${APSW_DISTNAME:S/-r/_r/}-py${PYTHON_VER}.egg-info
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-TRIBLER_DIR= ${PYTHONPREFIX_SITELIBDIR}/Tribler
+TRIBLER_DIR= ${PYTHONPREFIX_SITELIBDIR}/tribler
-APSW_DISTNAME= apsw-3.7.10-r1
+APSW_DISTNAME= apsw-3.7.14.1-r1
APSW_DISTFILE= ${APSW_DISTNAME}.zip
+.include <bsd.port.options.mk>
+
post-extract:
@(${GZCAT} ${WRKDIR}/data.tar.gz | ${TAR} -C ${WRKDIR} -xf -)
@(${UNZIP_CMD} -qo ${DISTDIR}/${APSW_DISTFILE} -d ${WRKDIR})
@@ -52,37 +54,61 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -i '' -e 's|/bin/netstat|netstat|' \
${WRKDIR}/usr/share/tribler/Tribler/Core/NATFirewall/guessip.py
+ @${REINPLACE_CMD} -i '' -e 's|^from Tribler.Main.Utility.Feeds ||' \
+ ${WRKDIR}/usr/share/tribler/Tribler/Main/Utility/Feeds/rssparser.py
@${REINPLACE_CMD} -e 's|%%OPSYS%%|${OPSYS}| ; \
s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}| ; \
s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' ${WRKDIR}/usr/bin/tribler
+ @${REINPLACE_CMD} -e 's|-O2|| ; \
+ s|CPPFLAGS|CXXFLAGS| ; \
+ s|-g -I$${LIBEVENT_HOME}/include|-I$${LOCALBASE}/include| ; \
+ s|-levent -lstdc++|-levent-2.0| ; \
+ s|g++|$${CXX}| ; \
+ s|$${LIBEVENT_HOME}/lib|$${LOCALBASE}/lib/event2|g' \
+ ${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine/Makefile
+ @${REINPLACE_CMD} 's|linux|freebsd|' \
+ ${WRKDIR}/usr/share/tribler/Tribler/vlc.py
post-build:
- ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/usr/share/tribler
- ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/usr/share/tribler
+ @(cd ${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine \
+ && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${ALL_TARGET})
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/usr/share/tribler
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/usr/share/tribler
post-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/usr/bin/tribler ${PREFIX}/bin
+ (cd ${WRKDIR}/usr/bin \
+ && ${INSTALL_SCRIPT} tribler ${PREFIX}/bin)
+ (cd ${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine \
+ && ${INSTALL_PROGRAM} swift ${PREFIX}/libexec)
@${MKDIR} ${TRIBLER_DIR}
+ @${LN} -sf ${PREFIX}/libexec/swift ${TRIBLER_DIR}
+ @${MKDIR} ${TRIBLER_DIR}/Tribler
@(${TAR} -C ${WRKDIR}/usr/share/tribler/Tribler \
--exclude "Build" \
--exclude "LGPL-2.1.txt" \
+ --exclude "SwiftEngine" \
+ --exclude "feedparset.*" \
--exclude "readme.txt" \
--exclude "*LICENSE*.txt" \
--exclude "*.orig" \
- -cf - . | ${TAR} -C ${TRIBLER_DIR} -xf -)
- @${FIND} ${TRIBLER_DIR} -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}
- @${FIND} ${TRIBLER_DIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
- @${FIND} ${TRIBLER_DIR} -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx
- @${MKDIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKDIR}/usr/share/applications/tribler.desktop \
- ${PREFIX}/share/applications
+ -cf - . | ${TAR} -C ${TRIBLER_DIR}/Tribler -xf -)
+ @${FIND} ${TRIBLER_DIR}/Tribler -print0 | \
+ ${XARGS} -0 ${CHOWN} ${SHAREOWN}
+ @${FIND} ${TRIBLER_DIR}/Tribler -type f -print0 | \
+ ${XARGS} -0 ${CHMOD} ${SHAREMODE}
+ @${FIND} ${TRIBLER_DIR}/Tribler -type d -print0 | \
+ ${XARGS} -0 ${CHMOD} a+rx
+ @${MKDIR} ${DESKTOPDIR}
+ (cd ${WRKDIR}/usr/share/applications \
+ && ${INSTALL_DATA} tribler.desktop ${DESKTOPDIR})
@${MKDIR} ${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKDIR}/usr/share/pixmaps/tribler.xpm \
- ${PREFIX}/share/pixmaps
-.if !defined(NOPORTDOCS)
+ (cd ${WRKDIR}/usr/share/pixmaps \
+ && ${INSTALL_DATA} tribler.xpm ${PREFIX}/share/pixmaps)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/usr/share/tribler/Tribler/*LICENSE*.txt ${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/usr/share/tribler/Tribler/readme.txt ${DOCSDIR}
+ (cd ${WRKDIR}/usr/share/tribler/Tribler \
+ && ${INSTALL_DATA} *LICENSE*.txt readme.txt ${DOCSDIR})
.endif
.include <bsd.port.mk>
8 net-p2p/tribler/distinfo
View
@@ -1,4 +1,4 @@
-SHA256 (tribler_5.5.24-1ubuntu1_all.deb) = 9dca105272f44d8dc742e4d89604f8b89ec177121fdc168dd63766028bc81e06
-SIZE (tribler_5.5.24-1ubuntu1_all.deb) = 2736504
-SHA256 (apsw-3.7.10-r1.zip) = 5a2be6baeb3dc58df53169979a5c27cea8a1db24ca9b174f8e18b81a46bd2406
-SIZE (apsw-3.7.10-r1.zip) = 619967
+SHA256 (tribler_6.0.2_all.deb) = 8a0a4e8b4b0564ec4c96302fded678d85aef62fdcf0ee0e109cf92ed2b7434b8
+SIZE (tribler_6.0.2_all.deb) = 5846598
+SHA256 (apsw-3.7.14.1-r1.zip) = 690277428925231057382150a6073c2bea8026d463b0b9bf25f2655ab802c6be
+SIZE (apsw-3.7.14.1-r1.zip) = 678959
14 net-p2p/tribler/files/patch-httpgw.cpp
View
@@ -0,0 +1,14 @@
+--- ../usr/share/tribler/Tribler/SwiftEngine/httpgw.cpp.orig 2012-10-12 14:17:32.000000000 +0900
++++ ../usr/share/tribler/Tribler/SwiftEngine/httpgw.cpp 2012-11-01 02:10:53.000000000 +0900
+@@ -11,6 +11,11 @@
+ #include <event2/bufferevent.h>
+ #include <sstream>
+
++#include <sys/param.h>
++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_vesion < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
++#define log2(x) (log(x) / log(2))
++#endif
++
+ using namespace swift;
+
+ #define HTTPGW_PROGRESS_STEP_BYTES (256*1024)
14 net-p2p/tribler/files/patch-pymdht_daemon.py
View
@@ -1,14 +0,0 @@
---- ../usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py.orig 2012-02-08 00:33:48.000000000 +0900
-+++ ../usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py 2012-02-24 18:44:52.000000000 +0900
-@@ -155,10 +155,10 @@
- raise SanitizeError, '? Channel must be a number'
-
- def handle(self):
-+ global stop_server
- while not stop_server:
- line = self.rfile.readline().strip().upper()
- if line == 'KILL':
-- global stop_server
- stop_server = True
- return
- if line == 'EXIT':
2  net-p2p/tribler/files/patch-tribler
View
@@ -6,7 +6,7 @@
+# Startup script for %%OPSYS%%
-_TRIBLERPATH="/usr/share/tribler"
-+_TRIBLERPATH="%%PYTHON_SITELIBDIR%%"
++_TRIBLERPATH="%%PYTHON_SITELIBDIR%%/tribler"
export PYTHONPATH="$PYTHONPATH":$_TRIBLERPATH
3,701 net-p2p/tribler/pkg-plist
View
1,822 additions, 1,879 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.