Framework: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2021-03-03 16:56:37 +01:00
parent 2b63135132
commit 9527c3f289
6 changed files with 153 additions and 9 deletions

View File

@ -7,7 +7,7 @@ post-install: <<EOD
terminfodb=${terminfodir}/terminfo.db
if [ -e ${terminfodb}.default ] && which -s tic; then
cp ${terminfodb}.default ${terminfodb}
find -s ${terminfodir} -name "*.terminfo" -exec tic {} \;
find -s ${terminfodir} -name "*.terminfo" -exec tic -x {} \;
fi
EOD
post-deinstall: <<EOD
@ -15,7 +15,7 @@ post-deinstall: <<EOD
terminfodb=${terminfodir}/terminfo.db
if [ -e ${terminfodb}.default ] && which -s tic; then
cp ${terminfodb}.default ${terminfodb}
find -s ${terminfodir} -name "*.terminfo" -exec tic {} \;
find -s ${terminfodir} -name "*.terminfo" -exec tic -x {} \;
else
rm -f ${terminfodb}
fi

31
MOVED
View File

@ -16063,8 +16063,9 @@ audio/gstreamer-plugins-a52dec|audio/gstreamer1-plugins-a52dec|2021-02-04|Replac
audio/gstreamer-plugins-amrnb|audio/gstreamer1-plugins-amrnb|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-amrwbdec|audio/gstreamer1-plugins-amrwbdec|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-cdaudio||2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-cdparanioa|audio/gstreamer1-plugins-cdparanioa|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-cdparanoia|audio/gstreamer1-plugins-cdparanoia|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-faac|audio/gstreamer1-plugins-faac|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-faad|audio/gstreamer1-plugins-faad|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-flac|audio/gstreamer1-plugins-flac|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-flite|audio/gstreamer1-plugins-flite|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-fluendo-mp3||2021-02-04|Replaced by gstreamer1
@ -16091,20 +16092,20 @@ audio/gstreamer-plugins-taglib|audio/gstreamer1-plugins-taglib|2021-02-04|Replac
audio/gstreamer-plugins-twolame|audio/gstreamer1-plugins-twolame|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-vorbis|audio/gstreamer1-plugins-vorbis|2021-02-04|Replaced by gstreamer1
audio/gstreamer-plugins-wavpack|audio/gstreamer1-plugins-wavpack|2021-02-04|Replaced by gstreamer1
devel/gstreamer-plugins-gconf||2021-02-04|Replaced by gstreamer1
devel/gstreamer-plugins-gio||2021-02-04|Replaced by gstreamer1
devel/gstreamer-plugins-gnomevfs||2021-02-04|Replaced by gstreamer1
devel/gstreamer-plugins-sdl||2021-02-04|Replaced by gstreamer1
devel/gstreamer-plugins-soup|devel/gstreamer1-plugins-soup|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-aalib|graphics/gstreamer1-plugins-aalib|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-cairo|graphics/gstreamer1-plugins-cairo|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-gconf||2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-gdkpixbuf|graphics/gstreamer1-plugins-gdkpixbuf|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-gio||2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-gl|graphics/gstreamer1-plugins-gl|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-gnomevfs||2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-jpeg|graphics/gstreamer1-plugins-jpeg|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-libcaca|graphics/gstreamer1-plugins-libcaca|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-libpng|graphics/gstreamer1-plugins-png|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-libvisual|graphics/gstreamer1-plugins-libvisual|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-opencv|graphics/gstreamer1-plugins-opencv|2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-sdl||2021-02-04|Replaced by gstreamer1
graphics/gstreamer-plugins-soup|devel/gstreamer1-plugins-soup|2021-02-04|Replaced by gstreamer1
multimedia/gstreamer-ffmpeg|multimedia/gstreamer1-libav|2021-02-04|Replaced by gstreamer1
multimedia/gstreamer-plugins-all|multimedia/gstreamer1-plugins-all|2021-02-04|Replaced by gstreamer1
multimedia/gstreamer-plugins-annodex||2021-02-04|Replaced by gstreamer1
@ -16171,3 +16172,21 @@ audio/herrie||2021-02-17|Removed
sysutils/uefi-edk2-bhyve-devel|sysutils/uefi-edk2-bhyve|2021-02-17|Development version no longer necessary
graphics/py-graph-core|graphics/py-pygraph|2021-02-19|Is outdated and broken with python3, use graphics/py-pygraph instead
devel/allegro-devel|devel/allegro5|2021-02-20|Rename to better match upstream name
www/py-djangorestframework311||2021-02-26|Removed: Used as a transitional package for www/seahub, please use www/py-djangorestframework instead
editors/mg-static|editors/mg@static|2021-02-28|Flavored
devel/snorenotify||2021-02-28|Has expired: Unmaintained upstream
multimedia/kodi-addon-pvr-iptvsimple|multimedia/kodi-addon-pvr.iptvsimple|2021-03-01|Renamed to match upstream name
multimedia/kodi-addon-pvr-hts|multimedia/kodi-addon-pvr.hts|2021-03-01|Renamed to match upstream name
audio/beatslash-lv2||2021-03-01|Has expired: Unmaintained and doesn't build with the latest audio/lvtk version 2.x
multimedia/kodi-addon-vfs.libarchive-devel||2021-03-01|Has expired: Depends on deprecated multimedia/kodi-devel
multimedia/kodi-addon-peripheral.joystick-devel||2021-03-01|Has expired: Depends on deprecated multimedia/kodi-devel
multimedia/kodi-devel|multimedia/kodi|2021-03-01|Has expired: Deprecated. Please use multimedia/kodi instead.
multimedia/kodi-addon-inputstream.adaptive-devel||2021-03-01|Has expired: Depends on deprecated multimedia/kodi-devel
print/cloud-print-connector||2021-03-01|Has expired: Google Cloud Print has been shut down by Google as of December 31, 2020
dns/knot2|dns/knot3|2021-03-01|Has expired: Use knot3, it is functionally compatible with 2.9.x
print/cups-cloud-print||2021-03-01|Has expired: Google Cloud Print has been shut down by Google as of December 31, 2020
www/helma||2021-03-01|Has expired: Upstream is basically dead and recommends ringojs.org
multimedia/kodi-addon-peripheral-joystick|multimedia/kodi-addon-peripheral.joystick|2021-03-01|Renamed to match upstream name
sysutils/py-salt-2019|sysutils/py-salt|2021-03-02|Has expired: Deprecated. Please use sysutils/py-salt instead.
www/rubygem-gitlab-puma_worker_killer|www/rubygem-puma_worker_killer|2021-03-03|Obsolete, use www/rubygem-puma_worker_killer instead
www/rubygem-gitlab-puma|www/rubygem-puma|2021-03-03|Obsolete, use www/rubygem-puma instead

46
Mk/Uses/kodi.mk Normal file
View File

@ -0,0 +1,46 @@
# $FreeBSD$
#
# Support Kodi Home Theater Addons
#
# Feature: kodi
# Usage: USES=kodi[:noautoplist]
# Valid args: noautoplist Don't generate the plist automatically
#
# MAINTAINER: decke@FreeBSD.org
.if !defined(_INCLUDE_USES_KODI_MK)
_INCLUDE_USES_KODI_MK= yes
_valid_ARGS= noautoplist
# Sanity check
.for arg in ${kodi_ARGS}
. if empty(_valid_ARGS:M${arg})
IGNORE= Incorrect 'USES+= kodi:${kodi_ARGS}' usage: argument [${arg}] is not recognized
. endif
.endfor
BUILD_DEPENDS+= ${LOCALBASE}/include/kodi/AddonBase.h:multimedia/kodi
LIB_DEPENDS+= libp8-platform.so:devel/p8-platform \
libkodiplatform.so:devel/kodi-platform
RUN_DEPENDS+= kodi:multimedia/kodi
PKGNAMEPREFIX?= kodi-addon-
KODI_ADDON?= ${PORTNAME}
PLIST_SUB+= DISTVERSION="${DISTVERSION}"
.if empty(kodi_ARGS:Mnoautoplist)
_USES_install+= 820:kodi-autoplist
kodi-autoplist:
@${FIND} -ds ${STAGEDIR}${PREFIX}/lib/kodi/addons/${KODI_ADDON} \( -type f -or -type l \) -print | ${SED} -E -e \
's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
@if [ -d ${STAGEDIR}${PREFIX}/share/kodi/addons/${KODI_ADDON} ]; then \
${FIND} -ds ${STAGEDIR}${PREFIX}/share/kodi/addons/${KODI_ADDON} -type f -print | ${SED} -E -e \
's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
fi
.endif
.endif # !defined(_INCLUDE_USES_KODI_MK)

67
Mk/Uses/mpi.mk Normal file
View File

@ -0,0 +1,67 @@
# $FreeBSD$
#
# Handle dependencies on MPICH / OpenMPI
#
# Feature: mpi
# Usage: USES=mpi or USES=mpi:ARGS
# Valid ARGS: mpich (default) openmpi
# Note: mpich2 and openmpi3 are not handled
#
# Provides: MPI_LIBS MPI_CFLAGS MPICC MPICXX MPIF90 MPIFC MPI_HOME \
# MPIEXEC MPIRUN
# Sets: LIB_DEPENDS
# + CMAKE_ARGS if cmake is enabled to drive FindMPI.cmake
#
# Maintainer: thierry@FreeBSD.org
.if !defined(_INCLUDE_USES_MPI_MK)
_INCLUDE_USES_MPI_MK= yes
_valid_ARGS= mpich openmpi
_DEFAULT_MPI= mpich
.if empty(mpi_ARGS)
mpi_ARGS= ${_DEFAULT_MPI}
.endif
.if ! ${USES:Mpkgconfig}
USES+= pkgconfig
.endif
.if ${mpi_ARGS} == mpich
LIB_DEPENDS+= libmpich.so:net/mpich
MPI_HOME= ${LOCALBASE}
MPI_LIBS+= `pkgconf --libs mpich`
. if ${USES:Mfortran}
MPI_LIBS+= -lmpifort
MPIFC= ${MPI_HOME}/bin/mpif90
MPIF90= ${MPIFC}
. endif
MPI_CFLAGS+= `pkgconf --cflags mpich`
.elif ${mpi_ARGS} == openmpi
LIB_DEPENDS+= libmpi_cxx.so:net/openmpi
MPI_HOME= ${LOCALBASE}/mpi/openmpi
. if ${USES:Mfortran}
MPI_LIBS+= `pkgconf --libs ompi-fort`
MPIFC= ${MPI_HOME}/bin/mpif90
MPIF90= ${MPIFC}
. else
MPI_LIBS+= `pkgconf --libs ompi`
. endif
MPI_CFLAGS+= `pkgconf --cflags ompi`
.else
IGNORE= USES=mpi: invalid arguments: ${mpi_ARGS}
.endif
MPICC= ${MPI_HOME}/bin/mpicc
MPICXX= ${MPI_HOME}/bin/mpicxx
MPIEXEC= ${MPI_HOME}/bin/mpiexec
MPIRUN= ${MPI_HOME}/bin/mpirun
.if ${USES:Mcmake}
CMAKE_ARGS+= -DMPIEXEC_EXECUTABLE:FILEPATH="${MPIEXEC}" \
-DMPI_HOME:PATH="${MPI_HOME}"
.endif
.endif

View File

@ -4966,8 +4966,11 @@ D4P_ENV= PKGNAME="${PKGNAME}" \
PORTSDIR="${PORTSDIR}" \
MAKE="${MAKE}" \
D4PHEIGHT="${D4PHEIGHT}" \
D4PMINHEIGHT="${D4PMINHEIGHT}" \
D4PWIDTH="${D4PWIDTH}" \
D4PFULLSCREEN="${D4PFULLSCREEN}"
D4PFULLSCREEN="${D4PFULLSCREEN}" \
D4PALIGNCENTER="${D4PALIGNCENTER}" \
D4PASCIILINES="${D4PASCIILINES}"
.if exists(${PKGHELP})
D4P_ENV+= PKGHELP="${PKGHELP}"
.endif

View File

@ -5,6 +5,15 @@ 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.
20210302:
AFFECTS: users of editors/emacs-devel
AUTHOR: jrm@FreeBSD.org
If you get the error "Symbol's value as variable is void: minor-modes",
rebuild the offending Emacs packages. See
https://lists.gnu.org/archive/html/emacs-devel/2021-02/msg01164.html
for details.
20210220:
AFFECTS: users of math/py-mathics
AUTHOR: thierry@FreeBSD.org