diff options
| author | marino <marino@FreeBSD.org> | 2014-11-05 20:37:25 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-11-05 20:37:25 +0800 |
| commit | 831c1c99fc325d229ba07b949ac6df37a9ff618f (patch) | |
| tree | aae9b6a71ca797a3c5c8bfed616c2d9944d02918 /net-p2p/tribler/Makefile | |
| parent | b24908434be6fe62538ac64d0122c1c393ead8ee (diff) | |
| download | freebsd-ports-gnome-831c1c99fc325d229ba07b949ac6df37a9ff618f.tar.gz freebsd-ports-gnome-831c1c99fc325d229ba07b949ac6df37a9ff618f.tar.zst freebsd-ports-gnome-831c1c99fc325d229ba07b949ac6df37a9ff618f.zip | |
net-p2p/tribler: Fix extract for DF and unmask installation commands
On the last update, the logic for the post-extract command was changed,
which broke the target on DF. This version works on all platforms.
While here, rework the do-install target so that the commands aren't
suppressed. Also simplify it.
Diffstat (limited to 'net-p2p/tribler/Makefile')
| -rw-r--r-- | net-p2p/tribler/Makefile | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile index cdd3d8164cda..6a12e3920258 100644 --- a/net-p2p/tribler/Makefile +++ b/net-p2p/tribler/Makefile @@ -57,8 +57,7 @@ VLC_RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \ TRIBLER_DIR= ${PYTHONPREFIX_SITELIBDIR}/tribler post-extract: - @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} data.tar.gz \ - ${EXTRACT_AFTER_ARGS}) + @${TAR} -C ${WRKDIR} -xf ${WRKDIR}/data.tar.gz post-patch: @${REINPLACE_CMD} -e \ @@ -82,13 +81,13 @@ post-patch: ${WRKDIR}/usr/share/tribler/Tribler/vlc.py do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} swift \ - ${STAGEDIR}${PREFIX}/libexec) - (cd ${WRKDIR}/usr/bin && ${INSTALL_SCRIPT} tribler \ - ${STAGEDIR}${PREFIX}/bin) - @${MKDIR} ${STAGEDIR}${TRIBLER_DIR}/Tribler - @${LN} -sf ${PREFIX}/libexec/swift ${STAGEDIR}${TRIBLER_DIR} - @(${TAR} -C ${WRKDIR}/usr/share/tribler/Tribler \ + @${MKDIR} ${STAGEDIR}${TRIBLER_DIR}/Tribler \ + ${STAGEDIR}${DESKTOPDIR} \ + ${STAGEDIR}${DOCSDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/swift ${STAGEDIR}${PREFIX}/libexec + ${INSTALL_SCRIPT} ${WRKDIR}/usr/bin/tribler ${STAGEDIR}${PREFIX}/bin + ${LN} -sf ${PREFIX}/libexec/swift ${STAGEDIR}${TRIBLER_DIR} + (${TAR} -C ${WRKDIR}/usr/share/tribler/Tribler \ --exclude "Build" \ --exclude "LGPL-2.1.txt" \ --exclude "SwiftEngine" \ @@ -96,22 +95,20 @@ do-install: --exclude "*LICENSE*.txt" \ --exclude "*.orig" \ -cf - . | ${TAR} -C ${STAGEDIR}${TRIBLER_DIR}/Tribler -xf -) - @${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type f -print0 | \ + ${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type f -print0 | \ ${XARGS} -0 ${CHMOD} ${SHAREMODE} - @${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \ + ${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \ ${XARGS} -0 ${CHMOD} a+rx - @${MKDIR} ${STAGEDIR}${DESKTOPDIR} (cd ${WRKDIR}/usr/share/applications && ${INSTALL_DATA} \ tribler.desktop ${STAGEDIR}${DESKTOPDIR}) (cd ${WRKDIR}/usr/share/pixmaps && ${INSTALL_DATA} \ tribler.xpm ${STAGEDIR}${PREFIX}/share/pixmaps) - @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR}/usr/share/tribler/Tribler && ${INSTALL_DATA} \ *LICENSE*.txt readme.txt ${STAGEDIR}${DOCSDIR}) - @(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \ + (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \ -d ${PYTHONPREFIX_SITELIBDIR} \ -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) - @(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O -m compileall \ + (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O -m compileall \ -d ${PYTHONPREFIX_SITELIBDIR} \ -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) |