pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics
Module Name: pkgsrc
Committed By: markd
Date: Tue Nov 21 19:56:37 UTC 2023
Modified Files:
pkgsrc/graphics: Makefile
pkgsrc/graphics/py-cairo: Makefile PLIST buildlink3.mk
Added Files:
pkgsrc/graphics/py-cairo: Makefile.common
pkgsrc/graphics/py-cairo-shared: DESCR Makefile PLIST buildlink3.mk
pkgsrc/graphics/py-cairo-shared/files: py3cairo.pc
Log Message:
py-cairo{,-shared}: split non python version specific files
into a separate package (py-cairo-shared) and convert back to wheel.mk
To generate a diff of this commit:
cvs rdiff -u -r1.1030 -r1.1031 pkgsrc/graphics/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/graphics/py-cairo/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/py-cairo/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/py-cairo/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/py-cairo/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/py-cairo-shared/DESCR \
pkgsrc/graphics/py-cairo-shared/Makefile \
pkgsrc/graphics/py-cairo-shared/PLIST \
pkgsrc/graphics/py-cairo-shared/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/py-cairo-shared/files/py3cairo.pc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/Makefile
diff -u pkgsrc/graphics/Makefile:1.1030 pkgsrc/graphics/Makefile:1.1031
--- pkgsrc/graphics/Makefile:1.1030 Fri Nov 17 17:38:27 2023
+++ pkgsrc/graphics/Makefile Tue Nov 21 19:56:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1030 2023/11/17 17:38:27 jakllsch Exp $
+# $NetBSD: Makefile,v 1.1031 2023/11/21 19:56:36 markd Exp $
#
COMMENT= Graphics tools and libraries
@@ -497,6 +497,7 @@ SUBDIR+= py-blockdiag
SUBDIR+= py-blurhash
SUBDIR+= py-brewer2mpl
SUBDIR+= py-cairo
+SUBDIR+= py-cairo-shared
SUBDIR+= py-cairo118
SUBDIR+= py-cairocffi
SUBDIR+= py-chart
Index: pkgsrc/graphics/py-cairo/Makefile
diff -u pkgsrc/graphics/py-cairo/Makefile:1.83 pkgsrc/graphics/py-cairo/Makefile:1.84
--- pkgsrc/graphics/py-cairo/Makefile:1.83 Wed Nov 15 08:36:41 2023
+++ pkgsrc/graphics/py-cairo/Makefile Tue Nov 21 19:56:37 2023
@@ -1,30 +1,21 @@
-# $NetBSD: Makefile,v 1.83 2023/11/15 08:36:41 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2023/11/21 19:56:37 markd Exp $
-DISTNAME= pycairo-1.25.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 2
-CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_PYPI:=p/pycairo/}
+PKGREVISION= 3
-MAINTAINER= leuzi%trash.net@localhost
-HOMEPAGE= https://cairographics.org/pycairo/
COMMENT= Python bindings for cairo
-LICENSE= gnu-lgpl-v2.1 OR mpl-1.1
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+.include "Makefile.common"
+
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
USE_TOOLS+= pkg-config
PYTHON_VERSIONS_INCOMPATIBLE= 27
-PYTHON_SELF_CONFLICT= yes
-PY_PATCHPLIST= yes
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.13.1
.include "../../graphics/cairo/buildlink3.mk"
-#.include "../../lang/python/egg.mk"
-MESON_REQD+= 1.2.0
-.include "../../devel/meson/build.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/tool.mk"
+.include "../../graphics/py-cairo-shared/buildlink3.mk"
+.include "../../lang/python/wheel.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/py-cairo/PLIST
diff -u pkgsrc/graphics/py-cairo/PLIST:1.15 pkgsrc/graphics/py-cairo/PLIST:1.16
--- pkgsrc/graphics/py-cairo/PLIST:1.15 Wed Nov 15 08:36:41 2023
+++ pkgsrc/graphics/py-cairo/PLIST Tue Nov 21 19:56:37 2023
@@ -1,10 +1,15 @@
-@comment $NetBSD: PLIST,v 1.15 2023/11/15 08:36:41 wiz Exp $
-include/pycairo/py3cairo.h
-lib/pkgconfig/py3cairo.pc
+@comment $NetBSD: PLIST,v 1.16 2023/11/21 19:56:37 markd Exp $
${PYSITELIB}/cairo/__init__.py
${PYSITELIB}/cairo/__init__.pyc
${PYSITELIB}/cairo/__init__.pyi
+${PYSITELIB}/cairo/__init__.pyo
${PYSITELIB}/cairo/_cairo.so
${PYSITELIB}/cairo/include/py3cairo.h
${PYSITELIB}/cairo/py.typed
-${PYSITELIB}/pycairo-${PKGVERSION}.egg-info
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING-LGPL-2.1
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING-MPL-1.1
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
Index: pkgsrc/graphics/py-cairo/buildlink3.mk
diff -u pkgsrc/graphics/py-cairo/buildlink3.mk:1.42 pkgsrc/graphics/py-cairo/buildlink3.mk:1.43
--- pkgsrc/graphics/py-cairo/buildlink3.mk:1.42 Wed Nov 15 21:03:57 2023
+++ pkgsrc/graphics/py-cairo/buildlink3.mk Tue Nov 21 19:56:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.42 2023/11/15 21:03:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2023/11/21 19:56:37 markd Exp $
BUILDLINK_TREE+= py-cairo
@@ -13,6 +13,7 @@ BUILDLINK_PKGSRCDIR.py-cairo?= ../../gr
BUILDLINK_INCDIRS.py-cairo+= ${PYSITELIB}/cairo/include
.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/py-cairo-shared/buildlink3.mk"
.endif # PY_CAIRO_BUILDLINK3_MK
BUILDLINK_TREE+= -py-cairo
Added files:
Index: pkgsrc/graphics/py-cairo/Makefile.common
diff -u /dev/null pkgsrc/graphics/py-cairo/Makefile.common:1.1
--- /dev/null Tue Nov 21 19:56:37 2023
+++ pkgsrc/graphics/py-cairo/Makefile.common Tue Nov 21 19:56:37 2023
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.common,v 1.1 2023/11/21 19:56:37 markd Exp $
+#
+# used by graphics/py-cairo/Makefile
+# used by graphics/py-cairo-shared/Makefile
+
+PYCAIRO_VER= 1.25.1
+DISTNAME= pycairo-${PYCAIRO_VER}
+CATEGORIES= graphics python
+MASTER_SITES= ${MASTER_SITE_PYPI:=p/pycairo/}
+
+MAINTAINER= leuzi%trash.net@localhost
+HOMEPAGE= https://cairographics.org/pycairo/
+LICENSE= gnu-lgpl-v2.1 OR mpl-1.1
+
+DISTINFO_FILE= ${.CURDIR}/../../graphics/py-cairo/distinfo
+#PATCHDIR= ${.CURDIR}/../../graphics/py-cairo/patches
Index: pkgsrc/graphics/py-cairo-shared/DESCR
diff -u /dev/null pkgsrc/graphics/py-cairo-shared/DESCR:1.1
--- /dev/null Tue Nov 21 19:56:37 2023
+++ pkgsrc/graphics/py-cairo-shared/DESCR Tue Nov 21 19:56:37 2023
@@ -0,0 +1,2 @@
+The parts of a py-cairo installation that are not specific to a
+particular Python instance.
Index: pkgsrc/graphics/py-cairo-shared/Makefile
diff -u /dev/null pkgsrc/graphics/py-cairo-shared/Makefile:1.1
--- /dev/null Tue Nov 21 19:56:37 2023
+++ pkgsrc/graphics/py-cairo-shared/Makefile Tue Nov 21 19:56:37 2023
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2023/11/21 19:56:37 markd Exp $
+
+PKGNAME= py-cairo-shared-${PYCAIRO_VER}
+
+COMMENT= Non version specific parts of py-cairo
+
+.include "../../graphics/py-cairo/Makefile.common"
+
+INSTALLATION_DIRS= include/pycairo lib/pkgconfig
+
+do-build:
+ ${SED} -e "s/@PYCAIRO_VER@/${PYCAIRO_VER}/" -e "s:@PREFIX@:${PREFIX}:" \
+ ${FILESDIR}/py3cairo.pc > ${WRKSRC}/py3cairo.pc
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/cairo/pycairo.h ${DESTDIR}${PREFIX}/include/pycairo/py3cairo.h
+ ${INSTALL_DATA} ${WRKSRC}/py3cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/py-cairo-shared/PLIST
diff -u /dev/null pkgsrc/graphics/py-cairo-shared/PLIST:1.1
--- /dev/null Tue Nov 21 19:56:37 2023
+++ pkgsrc/graphics/py-cairo-shared/PLIST Tue Nov 21 19:56:37 2023
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2023/11/21 19:56:37 markd Exp $
+include/pycairo/py3cairo.h
+lib/pkgconfig/py3cairo.pc
Index: pkgsrc/graphics/py-cairo-shared/buildlink3.mk
diff -u /dev/null pkgsrc/graphics/py-cairo-shared/buildlink3.mk:1.1
--- /dev/null Tue Nov 21 19:56:37 2023
+++ pkgsrc/graphics/py-cairo-shared/buildlink3.mk Tue Nov 21 19:56:37 2023
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2023/11/21 19:56:37 markd Exp $
+
+BUILDLINK_TREE+= py-cairo-shared
+
+.if !defined(PY_CAIRO_SHARED_BUILDLINK3_MK)
+PY_CAIRO_SHARED_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.py-cairo-shared+= py-cairo-shared>=1.25.1
+BUILDLINK_PKGSRCDIR.py-cairo-shared?= ../../graphics/py-cairo-shared
+.endif # PY_CAIRO_SHARED_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -py-cairo-shared
Index: pkgsrc/graphics/py-cairo-shared/files/py3cairo.pc
diff -u /dev/null pkgsrc/graphics/py-cairo-shared/files/py3cairo.pc:1.1
--- /dev/null Tue Nov 21 19:56:37 2023
+++ pkgsrc/graphics/py-cairo-shared/files/py3cairo.pc Tue Nov 21 19:56:37 2023
@@ -0,0 +1,8 @@
+prefix=@PREFIX@
+includedir=${prefix}/include
+
+Name: py3cairo
+Description: Python 3 bindings for cairo
+Version: @PYCAIRO_VER@
+Requires: cairo
+Cflags: -I${includedir}/pycairo
Home |
Main Index |
Thread Index |
Old Index