Skip to content

Commit

Permalink
Framework: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed Feb 27, 2023
1 parent dac3e2e commit 2432e5c
Showing 5 changed files with 22 additions and 4 deletions.
2 changes: 1 addition & 1 deletion GIDs
Original file line number Diff line number Diff line change
@@ -267,7 +267,7 @@ hedgedoc:*:317:
# free: 324
dkfilter:*:325:
smfs:*:326:
# free: 327
_reticulum:*:327:
# free: 328
# free: 329
orthanc:*:330:
1 change: 1 addition & 0 deletions MOVED
Original file line number Diff line number Diff line change
@@ -17768,3 +17768,4 @@ devel/yaml-cpp03|devel/yaml-cpp|2023-02-21|Used by blender-lts28 which is EOL'd
sysutils/uutils|sysutils/rust-coreutils|2023-02-22|Request by upstream
print/harfbuzz-hb-view|print/harfbuzz-cairo|2023-02-23|Match feature and library name
sysutils/screenfetch-nox11|sysutils/screenfetch@nox11|2023-02-23|Converted to flavor
editors/r7-office|editors/linux-r7-office|2023-02-25|Follow the naming scheme of Linux ports
11 changes: 9 additions & 2 deletions Mk/Uses/python.mk
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@
# default: ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR}
#
# PEP517_INSTALL_CMD - Command sequence for a PEP-517 install frontend that installs a wheel.
# default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
# default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
#
# PEP517_INSTALL_DEPEND - Port needed to execute ${PEP517_INSTALL_CMD}.
# default: ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}
@@ -661,7 +661,7 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
# PEP-517 support
PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build -n -w
PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR}
PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}

# nose support
@@ -871,7 +871,14 @@ do-install:
@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD}
@${SED} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../etc/|etc/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../include/|include/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../lib/|lib/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../libdata/|libdata/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../libexec/|libexec/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../sbin/|sbin/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../share/|share/|' \
-e 's|\,.*$$||' \
${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST}
. endif
2 changes: 1 addition & 1 deletion UIDs
Original file line number Diff line number Diff line change
@@ -272,7 +272,7 @@ icingadirector:*:318:183::0:0:icingadirector user:/nonexistent:/usr/sbin/nologin
# free: 324
dkfilter:*:325:325::0:0:DK Filter Owner:/nonexistent:/usr/sbin/nologin
smfs:*:326:326::0:0:SMFSAV Owner:/nonexistent:/usr/sbin/nologin
# free: 327
_reticulum:*:327:327::0:0:Reticulum Daemon:/nonexistent:/usr/sbin/nologin
# free: 328
# free: 329
orthanc:*:330:330::0:0:Orthanc Daemon:/nonexistent:/usr/sbin/nologin
10 changes: 10 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
@@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20230227:
AFFECTS: users of mail/py-spf-engine
AUTHOR: [email protected]

Default configuration file path of pyspf-milter has changed. Since
it looks for ${PREFIX}/etc/etc/pyspf-milter/pyspf-milter.conf now,
you should edit the file if you run pyspf-milter. Alternatively you
can specify other configuration file path by setting
pyspf_milter_conffile variable in /etc/rc.conf.

20230222:
AFFECTS: users of net-mgmt/netbox
AUTHOR: [email protected]

0 comments on commit 2432e5c

Please sign in to comment.