summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-03-26 23:07:13 +0000
committerjoerg <joerg@pkgsrc.org>2016-03-26 23:07:13 +0000
commit981a2c080002f04bc18293c6706dedabf856970a (patch)
tree5d119fdcd8ef91f28513d3964d4290046b52d68b /multimedia
parent3e33a04e29c4122cd2ca542775fdf5e700e1d105 (diff)
downloadpkgsrc-981a2c080002f04bc18293c6706dedabf856970a.tar.gz
Use external rake, the included version fails on NetBSD current.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mkvtoolnix/Makefile15
1 files changed, 6 insertions, 9 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index d24cada4abe..21cb9b39f5b 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2016/03/13 09:36:58 taca Exp $
+# $NetBSD: Makefile,v 1.78 2016/03/26 23:07:13 joerg Exp $
DISTNAME= mkvtoolnix-5.0.1
PKGREVISION= 27
@@ -27,7 +27,9 @@ LDFLAGS.SunOS+= -lintl
INSTALL_ENV+= SHELL=${SH:Q}
-.include "../../mk/bsd.prefs.mk"
+.include "../../lang/ruby/rubyversion.mk"
+
+BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-rake>=0.8.7:../../devel/ruby-rake
.if !empty(MAKE_JOBS)
DRAKE_ARGS= -j${MAKE_JOBS}
@@ -36,18 +38,13 @@ DRAKE_ARGS= # empty
.endif
do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ruby drake ${DRAKE_ARGS}
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/${RAKE_NAME} ${DRAKE_ARGS}
do-install:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ruby drake install
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${LOCALBASE}/bin/${RAKE_NAME} install
.include "options.mk"
-.if ${OPSYS} != "Darwin"
-.include "../../lang/ruby/buildlink3.mk"
-BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
-.endif
-
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/lzo/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"