pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cppzmq: fixed buildlink3.mk
Module Name: pkgsrc-wip
Committed By: Aleksej Lebedev <root%zta.lk@localhost>
Pushed By: zhtw
Date: Fri Apr 17 15:42:03 2020 +0200
Changeset: 4f257029660dc41279f55554ae9bfcaf3bde4dd7
Modified Files:
cppzmq/Makefile
cppzmq/buildlink3.mk
libopenshot/Makefile
Log Message:
cppzmq: fixed buildlink3.mk
libopenshot: allow for any version of python3,
drop the dependency on zeromq
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4f257029660dc41279f55554ae9bfcaf3bde4dd7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cppzmq/Makefile | 2 +-
cppzmq/buildlink3.mk | 19 ++-----------------
libopenshot/Makefile | 6 +++---
3 files changed, 6 insertions(+), 21 deletions(-)
diffs:
diff --git a/cppzmq/Makefile b/cppzmq/Makefile
index 59c6b2f41f..dddeb4f9fd 100644
--- a/cppzmq/Makefile
+++ b/cppzmq/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=zeromq/}
GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= root%zta.lk@localhost
-HOMEPAGE= https://www.zeromq.org
+HOMEPAGE= https://www.zeromq.org/
COMMENT= C++ binding for libzmq
LICENSE= mit
diff --git a/cppzmq/buildlink3.mk b/cppzmq/buildlink3.mk
index e4cb9772f6..08c4548e4d 100644
--- a/cppzmq/buildlink3.mk
+++ b/cppzmq/buildlink3.mk
@@ -1,14 +1,4 @@
# $NetBSD$
-# XXX
-# XXX This file was created automatically using createbuildlink-3.17.
-# XXX After this file has been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed. Please do not commit
-# XXX unverified buildlink3.mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX BUILDLINK_DEPMETHOD.cppzmq?= build
BUILDLINK_TREE+= cppzmq
@@ -17,14 +7,9 @@ CPPZMQ_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cppzmq+= cppzmq>=4.6.0
BUILDLINK_PKGSRCDIR.cppzmq?= ../../wip/cppzmq
+BUILDLINK_DEPMETHOD.cppzmq?= build
-# XXX
-# XXX Uncomment and keep only the buildlink3 lines below which are directly
-# XXX needed for dependencies to compile, link, and run. If this package
-# XXX provides a wrappered API or otherwise does not expose the APIs of the
-# XXX buildlink3 lines below to dependencies, remove them.
-# XXX
-#.include "../../net/zeromq/buildlink3.mk"
+.include "../../net/zeromq/buildlink3.mk"
.endif # CPPZMQ_BUILDLINK3_MK
BUILDLINK_TREE+= -cppzmq
diff --git a/libopenshot/Makefile b/libopenshot/Makefile
index 051b9f32b5..f9dde7dba3 100644
--- a/libopenshot/Makefile
+++ b/libopenshot/Makefile
@@ -14,10 +14,11 @@ WRKSRC= ${WRKDIR}/libopenshot-0.2.5
USE_CMAKE= yes
USE_LANGUAGES= c c++
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
DEPENDS+= swig4>=4.0.0:../../wip/swig4
.include "../../multimedia/ffmpeg4/buildlink3.mk"
-.include "../../net/zeromq/buildlink3.mk"
.include "../../wip/cppzmq/buildlink3.mk"
.include "../../wip/libopenshot-audio/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
@@ -25,7 +26,6 @@ DEPENDS+= swig4>=4.0.0:../../wip/swig4
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.include "../../devel/unittest-cpp/buildlink3.mk"
-#.include "../../lang/python/pyversion.mk"
-.include "../../lang/python37/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
.include "../../lang/ruby/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index