diff --git a/net/cloud-init-devel/Makefile b/net/cloud-init-devel/Makefile index e62405de3c15..53a5c66572f8 100644 --- a/net/cloud-init-devel/Makefile +++ b/net/cloud-init-devel/Makefile @@ -1,79 +1,75 @@ PORTNAME= cloud-init DISTVERSION= 23.4-319 DISTVERSIONSUFFIX= -gec384da45 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -devel MAINTAINER= freebsd@igalic.co COMMENT= Init scripts for use on cloud images, development version WWW= https://cloud-init.io/ LICENSE= APACHE20 GPLv3 LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-Apache2.0 LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPLv3 -DEPRECATED= Depends on expired devel/py-boto -EXPIRATION_DATE=2025-03-31 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ sudo>0:security/sudo TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} \ bash:shells/bash USES= python shebangfix USE_GITHUB= yes GH_ACCOUNT= canonical USE_PYTHON= autoplist distutils PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd" SHEBANG_FILES= tools/hook-hotplug tools/read-dependencies tools/read-version \ tools/validate-yaml.py TEST_ENV= ${MAKE_ENV} \ PYTHON=${PYTHON_VERSION} TEST_TARGET= check # Conflicts CONFLICTS_INSTALL= cloud-init # Standard bsd.port.mk variables ETCDIR= ${PREFIX}/etc/cloud .include .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000 EXTRA_PATCHES= ${PATCHDIR}/extra-cloudinit_distros_freebsd.py .endif NO_ARCH= yes post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py ${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py ${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig post-install: ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample ${REINPLACE_CMD} -e 's|^.*\.cfg$$|@sample &.sample|' \ -e 's|${ETCDIR}/clean.d|@dir ${ETCDIR}/clean.d|' \ ${_PYTHONPKGLIST} .include diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile index e789b46ff407..94cb0bc75f09 100644 --- a/net/cloud-init/Makefile +++ b/net/cloud-init/Makefile @@ -1,69 +1,65 @@ PORTNAME= cloud-init DISTVERSION= 24.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= andrey@bsdnir.info COMMENT= Init scripts for use on cloud images WWW= https://cloud-init.io/ LICENSE= APACHE20 GPLv3 LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-Apache2.0 LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPLv3 -DEPRECATED= Depends on expired devel/py-boto -EXPIRATION_DATE=2025-03-31 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ sudo>0:security/sudo USES= python shebangfix USE_GITHUB= yes GH_ACCOUNT= canonical USE_PYTHON= autoplist distutils PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd" SHEBANG_FILES= tools/hook-hotplug tools/read-dependencies tools/read-version \ tools/validate-yaml.py # Conflicts CONFLICTS_INSTALL= cloud-init-devel # Standard bsd.port.mk variables ETCDIR= ${PREFIX}/etc/cloud .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 EXTRA_PATCHES= ${PATCHDIR}/extra-cloudinit_distros_freebsd.py .endif NO_ARCH= yes post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py ${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py ${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig post-install: ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample ${REINPLACE_CMD} -e 's|^.*\.cfg$$|@sample &.sample|' \ -e 's|${ETCDIR}/clean.d|@dir ${ETCDIR}/clean.d|' \ ${_PYTHONPKGLIST} .include