pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cppzmq, py-cbor2: removed; imported to base



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Sat Oct 8 15:23:14 2022 +0200
Changeset:	885b5ea8c22f68a831d23d05d3b63881e748ca8e

Modified Files:
	Makefile
	libopenshot/Makefile
	py-zlmdb/Makefile
Removed Files:
	cppzmq/DESCR
	cppzmq/Makefile
	cppzmq/PLIST
	cppzmq/buildlink3.mk
	cppzmq/distinfo
	py-cbor2/DESCR
	py-cbor2/Makefile
	py-cbor2/PLIST
	py-cbor2/distinfo

Log Message:
cppzmq, py-cbor2: removed; imported to base

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=885b5ea8c22f68a831d23d05d3b63881e748ca8e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile             |  2 --
 cppzmq/DESCR         |  1 -
 cppzmq/Makefile      | 20 --------------------
 cppzmq/PLIST         |  7 -------
 cppzmq/buildlink3.mk | 15 ---------------
 cppzmq/distinfo      |  5 -----
 libopenshot/Makefile |  2 +-
 py-cbor2/DESCR       |  1 -
 py-cbor2/Makefile    | 16 ----------------
 py-cbor2/PLIST       | 25 -------------------------
 py-cbor2/distinfo    |  5 -----
 py-zlmdb/Makefile    |  2 +-
 12 files changed, 2 insertions(+), 99 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index ca9fb13366..87bdcda885 100644
--- a/Makefile
+++ b/Makefile
@@ -541,7 +541,6 @@ SUBDIR+=	coxeter
 SUBDIR+=	cpdup
 SUBDIR+=	cpluff
 SUBDIR+=	cpm
-SUBDIR+=	cppzmq
 SUBDIR+=	cpqarrayd
 SUBDIR+=	cpuminer-multi
 SUBDIR+=	cqlsh
@@ -3538,7 +3537,6 @@ SUBDIR+=	py-catalogue
 SUBDIR+=	py-causalinfo
 SUBDIR+=	py-causality
 SUBDIR+=	py-cbc
-SUBDIR+=	py-cbor2
 SUBDIR+=	py-ccdproc
 SUBDIR+=	py-ccdproc2
 SUBDIR+=	py-cclib
diff --git a/cppzmq/DESCR b/cppzmq/DESCR
deleted file mode 100644
index 0350a49a4d..0000000000
--- a/cppzmq/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight and header-only C++ binding for libzmq.
diff --git a/cppzmq/Makefile b/cppzmq/Makefile
deleted file mode 100644
index 7e45fe3bdd..0000000000
--- a/cppzmq/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	cppzmq-4.7.1
-CATEGORIES=	net devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=zeromq/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	root%zta.lk@localhost
-HOMEPAGE=	https://www.zeromq.org/
-COMMENT=	C++ binding for libzmq
-LICENSE=	mit
-
-WRKSRC=		${WRKDIR}/cppzmq-${PKGVERSION}
-USE_CMAKE=	yes
-USE_LANGUAGES=	c c++
-
-CMAKE_ARGS+=	-DCPPZMQ_BUILD_TESTS=OFF
-
-.include "../../net/zeromq/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cppzmq/PLIST b/cppzmq/PLIST
deleted file mode 100644
index 06d9c4652d..0000000000
--- a/cppzmq/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD$
-include/zmq.hpp
-include/zmq_addon.hpp
-share/cmake/cppzmq/cppzmqConfig.cmake
-share/cmake/cppzmq/cppzmqConfigVersion.cmake
-share/cmake/cppzmq/cppzmqTargets.cmake
-share/cmake/cppzmq/libzmq-pkg-config/FindZeroMQ.cmake
diff --git a/cppzmq/buildlink3.mk b/cppzmq/buildlink3.mk
deleted file mode 100644
index 08c4548e4d..0000000000
--- a/cppzmq/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	cppzmq
-
-.if !defined(CPPZMQ_BUILDLINK3_MK)
-CPPZMQ_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cppzmq+=	cppzmq>=4.6.0
-BUILDLINK_PKGSRCDIR.cppzmq?=	../../wip/cppzmq
-BUILDLINK_DEPMETHOD.cppzmq?=	build
-
-.include "../../net/zeromq/buildlink3.mk"
-.endif	# CPPZMQ_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-cppzmq
diff --git a/cppzmq/distinfo b/cppzmq/distinfo
deleted file mode 100644
index 417b5decba..0000000000
--- a/cppzmq/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-RMD160 (cppzmq-4.7.1.tar.gz) = ff810bfadfe8533a3171d3ba4d0b327f63245aa2
-SHA512 (cppzmq-4.7.1.tar.gz) = b919db5d82997f718b6e2921f0bf3eb2a5dde227a9510aca3dc4f95479c6b5564f535c31b5ec441b7ee9f441bcbd6043f00f6f4a5ac3ff08e770853f41c217f9
-Size (cppzmq-4.7.1.tar.gz) = 46075 bytes
diff --git a/libopenshot/Makefile b/libopenshot/Makefile
index e42d153788..b07f02c140 100644
--- a/libopenshot/Makefile
+++ b/libopenshot/Makefile
@@ -21,7 +21,7 @@ PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../audio/alsa-lib/buildlink3.mk"
-.include "../../wip/cppzmq/buildlink3.mk"
+.include "../../net/cppzmq/buildlink3.mk"
 .include "../../wip/libopenshot-audio/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/py-cbor2/DESCR b/py-cbor2/DESCR
deleted file mode 100644
index 35308938f1..0000000000
--- a/py-cbor2/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Pure Python CBOR (de)serializer with extensive tag support
diff --git a/py-cbor2/Makefile b/py-cbor2/Makefile
deleted file mode 100644
index 53770e35cd..0000000000
--- a/py-cbor2/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	cbor2-5.2.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_PYPI:=c/cbor2/}
-
-MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	https://pypi.org/project/cbor2
-COMMENT=	Pure Python CBOR (de)serializer with extensive tag support
-LICENSE=	mit
-
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=1.7.0:../../devel/py-setuptools_scm
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-cbor2/PLIST b/py-cbor2/PLIST
deleted file mode 100644
index 0d3afdcf6d..0000000000
--- a/py-cbor2/PLIST
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/_cbor2.so
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/cbor2/__init__.py
-${PYSITELIB}/cbor2/__init__.pyc
-${PYSITELIB}/cbor2/__init__.pyo
-${PYSITELIB}/cbor2/compat.py
-${PYSITELIB}/cbor2/compat.pyc
-${PYSITELIB}/cbor2/compat.pyo
-${PYSITELIB}/cbor2/decoder.py
-${PYSITELIB}/cbor2/decoder.pyc
-${PYSITELIB}/cbor2/decoder.pyo
-${PYSITELIB}/cbor2/encoder.py
-${PYSITELIB}/cbor2/encoder.pyc
-${PYSITELIB}/cbor2/encoder.pyo
-${PYSITELIB}/cbor2/tool.py
-${PYSITELIB}/cbor2/tool.pyc
-${PYSITELIB}/cbor2/tool.pyo
-${PYSITELIB}/cbor2/types.py
-${PYSITELIB}/cbor2/types.pyc
-${PYSITELIB}/cbor2/types.pyo
diff --git a/py-cbor2/distinfo b/py-cbor2/distinfo
deleted file mode 100644
index 51d8f3a21f..0000000000
--- a/py-cbor2/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-RMD160 (cbor2-5.2.0.tar.gz) = 3085abd98292c515ffb75e5ec246ba56f3f29f40
-SHA512 (cbor2-5.2.0.tar.gz) = 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
-Size (cbor2-5.2.0.tar.gz) = 81467 bytes
diff --git a/py-zlmdb/Makefile b/py-zlmdb/Makefile
index e245fb7856..d22a2acac1 100644
--- a/py-zlmdb/Makefile
+++ b/py-zlmdb/Makefile
@@ -13,7 +13,7 @@ LICENSE=	mit
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
-DEPENDS+=	${PYPKGPREFIX}-cbor2>=5.1.0:../../wip/py-cbor2
+DEPENDS+=	${PYPKGPREFIX}-cbor2>=5.1.0:../../devel/py-cbor2
 DEPENDS+=	${PYPKGPREFIX}-click>=7.0:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-txaio>=20.3.1:../../devel/py-txaio
 DEPENDS+=	${PYPKGPREFIX}-numpy>=1.15.4:../../math/py-numpy


Home | Main Index | Thread Index | Old Index