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 Mar 20, 2023
1 parent 916a955 commit 8b1854d
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 28 deletions.
9 changes: 9 additions & 0 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -17792,3 +17792,12 @@ security/openssl-devel|security/openssl30|2023-03-14|3.0 is not devel, prevent c
net-p2p/openethereum||2023-03-15|Has expired: not maintained anymore
devel/pydio-packr||2023-03-15|Was only used for building www/pydio-cells before, not needed anymore
math/hs-penrose||2023-03-16|Perose Haskell app is deprecated upstrean, it was rewritten in TypeScript
multimedia/libquicktime-lame||2023-03-18|Abandoned upstream and fails to build with newer versions of FFmpeg, consider using multimedia/ffmpeg
multimedia/libquicktime||2023-03-18|Abandoned upstream and fails to build with newer versions of FFmpeg, consider using multimedia/ffmpeg
devel/p5-Net-ZooKeeper||2023-03-19|Has expired: Broken since 2020
devel/libhyve-remote||2023-03-19|Has expired: Broken since 2020
chinese/brise||2023-03-19|Has expired: Broken since 2020
cad/NASTRAN-95||2023-03-19|Has expired: Broken since 2020
lang/dlv||2023-03-19|Has expired: Broken since 2020
net/nfs-ganesha-kmod||2023-03-19|Has expired: Broken since 2020
graphics/py-open3d-python||2023-03-19|Has expired: Broken since 2020
12 changes: 9 additions & 3 deletions Mk/Uses/cabal.mk
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ IGNORE= CABAL_PROJECT: invalid value: ${CABAL_PROJECT}
BROKEN= ${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386
. endif

. if ${OSVERSION} >= 1301000 && ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*}
# Band-aids for a Clang bug that is shipped with FreeBSD 13.1
BUILD_DEPENDS+= clang15:devel/llvm15
BUILD_ARGS+= --ghc-options='-pgmc clang++15'
. endif

PKGNAMEPREFIX?= hs-

CABAL_EXECUTABLES?= ${PORTNAME}
Expand Down Expand Up @@ -350,11 +356,11 @@ do-install:

. if !defined(SKIP_CABAL_PLIST)
cabal-post-install-script:
. for exe in ${CABAL_EXECUTABLES}
. for exe in ${CABAL_EXECUTABLES}
${ECHO_CMD} 'bin/${exe}' >> ${TMPPLIST}
. if defined(CABAL_WRAPPER_SCRIPTS) && ${CABAL_WRAPPER_SCRIPTS:M${exe}}
. if defined(CABAL_WRAPPER_SCRIPTS) && ${CABAL_WRAPPER_SCRIPTS:M${exe}}
${ECHO_CMD} '${CABAL_LIBEXEC}/${exe}' >> ${TMPPLIST}
. endif
. endif
. endfor
. endif

Expand Down
4 changes: 3 additions & 1 deletion Mk/Uses/kde.mk
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ KDE_PLASMA_VERSION?= 5.27.3
KDE_PLASMA_BRANCH?= stable

# Current KDE frameworks.
KDE_FRAMEWORKS_VERSION?= 5.103.0
KDE_FRAMEWORKS_VERSION?= 5.104.0
KDE_FRAMEWORKS_BRANCH?= stable

# Current KDE applications.
Expand Down Expand Up @@ -189,6 +189,8 @@ IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #'
. endif #defined(_KDE_CATEGORY)

# ==============================================================================
# === SET UP LOCALE ENVIRONMENT =================================================
USE_LOCALE?= en_US.UTF-8

# === SET UP CMAKE ENVIRONMENT =================================================
# Help cmake to find files when testing ports with non-default PREFIX.
Expand Down
6 changes: 3 additions & 3 deletions Mk/Uses/python.mk
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
# default: <empty>
#
# PEP517_INSTALL_CMD - Command sequence for a PEP-517 install frontend that installs a wheel.
# default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --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}-${DISTVERSION}-*.whl
#
# PEP517_INSTALL_DEPEND - Port needed to execute ${PEP517_INSTALL_CMD}.
# default: ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}
Expand Down Expand Up @@ -680,7 +680,7 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
# PEP-517 support
PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build -n -w ${PEP517_BUILD_CONFIG_SETTING}
PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR}
PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --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}-${DISTVERSION}-*.whl
PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}

# nose support
Expand Down Expand Up @@ -901,7 +901,7 @@ do-install:
@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD}
@${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \
${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST}
${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${DISTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST}
@${REINPLACE_CMD} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../etc/|etc/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \
Expand Down
30 changes: 9 additions & 21 deletions Mk/bsd.sites.mk
Original file line number Diff line number Diff line change
Expand Up @@ -224,26 +224,14 @@ MASTER_SITE_GCC+= \

.if !defined(IGNORE_MASTER_SITE_GENTOO)
MASTER_SITE_GENTOO+= \
http://gentoo.mirrors.pair.com/%SUBDIR%/ \
http://mirrors.tds.net/pub/gentoo/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/www.ibiblio.org/gentoo/%SUBDIR%/ \
http://ftp.snt.utwente.nl/pub/os/linux/gentoo/%SUBDIR%/ \
http://trumpetti.atm.tut.fi/gentoo/%SUBDIR%/ \
https://ftp.uni-erlangen.de/pub/mirrors/gentoo/%SUBDIR%/ \
http://gentoo.inode.at/%SUBDIR%/ \
http://gentoo.gg3.net/%SUBDIR%/ \
http://mirrors.163.com/gentoo/%SUBDIR%/ \
ftp://ftp.gtlib.gatech.edu/pub/gentoo/%SUBDIR%/ \
ftp://ftp.ussg.iu.edu/pub/linux/gentoo/%SUBDIR%/ \
ftp://mirrors.tds.net/pub/gentoo/%SUBDIR%/ \
ftp://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/%SUBDIR%/ \
ftp://ftp.snt.utwente.nl/pub/os/linux/gentoo/%SUBDIR%/ \
ftp://trumpetti.atm.tut.fi/gentoo/%SUBDIR%/ \
ftp://ftp.tu-clausthal.de/pub/linux/gentoo/%SUBDIR%/ \
ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/gentoo/%SUBDIR%/ \
ftp://linux.rz.ruhr-uni-bochum.de/gentoo-mirror/%SUBDIR%/ \
ftp://ftp.uni-erlangen.de/pub/mirrors/gentoo/%SUBDIR%/ \
ftp://gentoo.inode.at/source/%SUBDIR%/
https://mirror.leaseweb.com/gentoo/%SUBDIR%/ \
https://mirror.rackspace.com/gentoo/%SUBDIR%/ \
https://mirror.init7.net/gentoo/%SUBDIR%/ \
https://mirrors.rit.edu/gentoo/%SUBDIR%/ \
http://ftp.iij.ad.jp/pub/linux/gentoo/%SUBDIR%/ \
http://ftp.belnet.be/pub/rsync.gentoo.org/gentoo/%SUBDIR%/ \
http://ftp.uni-hannover.de/gentoo/%SUBDIR%/ \
http://gentoo-mirror.flux.utah.edu/%SUBDIR%/
.endif

# Keep this before USE_GITHUB
Expand Down Expand Up @@ -787,7 +775,7 @@ FETCH_ARGS+= --user-agent=curl/7.68.0

.if !defined(IGNORE_MASTER_SITE_OSSP)
MASTER_SITE_OSSP+= \
ftp://ftp.ossp.org/pkg/%SUBDIR%/ \
http://ftp.ntua.gr/pub/utils/ossp/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/utils/ossp/%SUBDIR%/
.endif

Expand Down
17 changes: 17 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,23 @@ 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.

20230318:
AFFECTS: users of security/libressl
AUTHOR: [email protected]

The port has been updated to the latest stable version 3.6 of LibreSSL.
The shared library versions of the libraries have been bumped.

After upgrading, manually update all packages that depend on any of the
libraries provided by LibreSSL (libssl, libcrypto and libtls) since the
versions of these libraries have changed. Normally, you can obtain the
list of dependent software by running the following command:

# pkg info -r libressl

Then you should rebuild all ports depending on libressl to avoid dangling
shared library dependencies.

20230315:
AFFECTS: users of lang/ruby30
AUTHOR: [email protected]
Expand Down

0 comments on commit 8b1854d

Please sign in to comment.