Date: Thu, 3 Jul 2014 18:57:48 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360445 - head/net-p2p/tribler Message-ID: <201407031857.s63IvmCu018576@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Thu Jul 3 18:57:48 2014 New Revision: 360445 URL: http://svnweb.freebsd.org/changeset/ports/360445 QAT: https://qat.redports.org/buildarchive/r360445/ Log: - Add staging support - Convert to new LIB_DEPENDS format Modified: head/net-p2p/tribler/Makefile Modified: head/net-p2p/tribler/Makefile ============================================================================== --- head/net-p2p/tribler/Makefile Thu Jul 3 18:39:33 2014 (r360444) +++ head/net-p2p/tribler/Makefile Thu Jul 3 18:57:48 2014 (r360445) @@ -20,8 +20,8 @@ LICENSE= LGPL21 MIT LICENSE_COMB= multi EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 \ - vlc:${PORTSDIR}/multimedia/vlc +LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 \ + libvlc.so:${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 \ @@ -46,8 +46,6 @@ TRIBLER_DIR= ${PYTHONPREFIX_SITELIBDIR}/ APSW_DISTNAME= apsw-3.7.14.1-r1 APSW_DISTFILE= ${APSW_DISTNAME}.zip -NO_STAGE= yes - OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> @@ -82,13 +80,11 @@ post-build: @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/usr/share/tribler post-install: - (cd ${WRKDIR}/usr/bin \ - && ${INSTALL_SCRIPT} tribler ${PREFIX}/bin) + ${INSTALL_SCRIPT} ${WRKDIR}/usr/bin/tribler ${STAGEDIR}${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 + && ${INSTALL_PROGRAM} swift ${STAGEDIR}${PREFIX}/libexec) + @${MKDIR} ${STAGEDIR}${TRIBLER_DIR}/Tribler + @${LN} -sf ${PREFIX}/libexec/swift ${STAGEDIR}${TRIBLER_DIR} @(${TAR} -C ${WRKDIR}/usr/share/tribler/Tribler \ --exclude "Build" \ --exclude "LGPL-2.1.txt" \ @@ -97,22 +93,18 @@ post-install: --exclude "readme.txt" \ --exclude "*LICENSE*.txt" \ --exclude "*.orig" \ - -cf - . | ${TAR} -C ${TRIBLER_DIR}/Tribler -xf -) - @${FIND} ${TRIBLER_DIR}/Tribler -print0 | \ - ${XARGS} -0 ${CHOWN} ${SHAREOWN} - @${FIND} ${TRIBLER_DIR}/Tribler -type f -print0 | \ + -cf - . | ${TAR} -C ${STAGEDIR}${TRIBLER_DIR}/Tribler -xf -) + @${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type f -print0 | \ ${XARGS} -0 ${CHMOD} ${SHAREMODE} - @${FIND} ${TRIBLER_DIR}/Tribler -type d -print0 | \ + @${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \ ${XARGS} -0 ${CHMOD} a+rx - @${MKDIR} ${DESKTOPDIR} + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} (cd ${WRKDIR}/usr/share/applications \ - && ${INSTALL_DATA} tribler.desktop ${DESKTOPDIR}) + && ${INSTALL_DATA} tribler.desktop ${STAGEDIR}${DESKTOPDIR}) (cd ${WRKDIR}/usr/share/pixmaps \ - && ${INSTALL_DATA} tribler.xpm ${PREFIX}/share/pixmaps) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + && ${INSTALL_DATA} tribler.xpm ${STAGEDIR}${PREFIX}/share/pixmaps) + @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR}/usr/share/tribler/Tribler \ - && ${INSTALL_DATA} *LICENSE*.txt readme.txt ${DOCSDIR}) -.endif + && ${INSTALL_DATA} *LICENSE*.txt readme.txt ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407031857.s63IvmCu018576>