Framework: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-03-12 07:58:22 +01:00
parent 29c316142c
commit 42cb611cde
7 changed files with 33 additions and 19 deletions

16
MOVED
View File

@ -2969,7 +2969,6 @@ x11/wmmsg||2011-12-28|Has expired: No more public distfiles
x11-toolkits/libgtkeditor||2011-12-28|Has expired: No longer supported upstream, not depended upon anymore
misc/demoniac||2011-12-28|Has expired: No more upstream, no more public distfiles
databases/clip||2011-12-28|Has expired: No upstream development for a long time
x11-toolkits/gtkextra||2011-12-28|Has expired: no longer supported upstream, no more depend on
www/xpi-mousegestures||2011-12-28|Has expired: Development has been ceased and not compatible with Firefox > 2
www/xpi-mozex||2011-12-28|Has expired: Development has been ceased and not compatible with Firefox > 3
sysutils/duplicity05||2012-01-01|Has expired: This version is out of date, and the 0.6.x branch is considered stable
@ -9031,7 +9030,6 @@ net/py-pysimplesoap|net/py-soap2py|2017-03-13|Rename to match upstream naming
games/trigger-data|games/trigger-rally|2017-03-15|Merged into games/trigger-rally
devel/py-setuptools27|devel/py27-setuptools|2017-03-16|Renamed to better match other python ports
devel/py-setuptools33|devel/py33-setuptools|2017-03-16|Renamed to better match other python ports
devel/py-setuptools34|devel/py34-setuptools|2017-03-16|Renamed to better match other python ports
devel/py-setuptools35|devel/py35-setuptools|2017-03-16|Renamed to better match other python ports
devel/py-setuptools36|devel/py36-setuptools|2017-03-16|Renamed to better match other python ports
devel/rubygem-devise-rails4|devel/rubygem-devise|2017-03-16|Has expired: Please use devel/rubygem-devise instead
@ -9582,8 +9580,6 @@ databases/py3-apsw|databases/py-apsw@py36|2017-11-30|Moved to a flavored, generi
databases/py3-bsddb3|databases/py-bsddb3@py36|2017-11-30|Moved to a flavored, generic, version
databases/py3-mysqlclient|databases/py-mysqlclient@py36|2017-11-30|Moved to a flavored, generic, version
databases/py3-psycopg2|databases/py-psycopg2@py36|2017-11-30|Moved to a flavored, generic, version
databases/py34-gdbm|databases/py-gdbm@py34|2017-11-30|Moved to a flavored, generic, version
databases/py34-sqlite3|databases/py-sqlite3@py34|2017-11-30|Moved to a flavored, generic, version
databases/py35-gdbm|databases/py-gdbm@py35|2017-11-30|Moved to a flavored, generic, version
databases/py35-sqlite3|databases/py-sqlite3@py35|2017-11-30|Moved to a flavored, generic, version
databases/py36-gdbm|databases/py-gdbm@py36|2017-11-30|Moved to a flavored, generic, version
@ -9664,7 +9660,6 @@ devel/py3-voluptuous|devel/py-voluptuous@py36|2017-11-30|Moved to a flavored, ge
devel/py3-wcwidth|devel/py-wcwidth@py36|2017-11-30|Moved to a flavored, generic, version
devel/py3-xdg|devel/py-xdg@py36|2017-11-30|Moved to a flavored, generic, version
devel/py3-yaml|devel/py-yaml@py36|2017-11-30|Moved to a flavored, generic, version
devel/py34-setuptools|devel/py-setuptools@py34|2017-11-30|Moved to a flavored, generic, version
devel/py35-setuptools|devel/py-setuptools@py35|2017-11-30|Moved to a flavored, generic, version
devel/py36-setuptools|devel/py-setuptools@py36|2017-11-30|Moved to a flavored, generic, version
dns/py3-dnspython|dns/py-dnspython@py36|2017-11-30|Moved to a flavored, generic, version
@ -9716,7 +9711,6 @@ textproc/py3-texttable|textproc/py-texttable@py36|2017-11-30|Moved to a flavored
www/py3-cssutils|www/py-cssutils@py36|2017-11-30|Moved to a flavored, generic, version
www/py3-httplib2|www/py-httplib2@py36|2017-11-30|Moved to a flavored, generic, version
www/py3-requests|www/py-requests@py36|2017-11-30|Moved to a flavored, generic, version
x11-toolkits/py34-tkinter|x11-toolkits/py-tkinter@py34|2017-11-30|Moved to a flavored, generic, version
x11-toolkits/py35-tkinter|x11-toolkits/py-tkinter@py35|2017-11-30|Moved to a flavored, generic, version
x11-toolkits/py36-tkinter|x11-toolkits/py-tkinter@py36|2017-11-30|Moved to a flavored, generic, version
security/py-rekall_gui||2017-11-30|Has expired: PoC that is no longer supported
@ -9991,10 +9985,8 @@ devel/alf||2018-03-02|Has expired: Abandonware, unused in the ports tree
net/remmina-plugin-gnome|net/remmina-plugin-secret|2018-03-04|Renamed upstream
databases/php71-memcache|databases/php-memcache@php71|2018-03-08|Merge into a flavorized version
databases/php72-memcache|databases/php-memcache@php72|2018-03-08|Merge into a flavorized version
ftp/php56-fastdfs|ftp/php-fastdfs@php56|2018-03-08|Merge into flavorized version
ftp/php71-fastdfs|ftp/php-fastdfs@php71|2018-03-08|Merge into flavorized version
ftp/php72-fastdfs|ftp/php-fastdfs@php72|2018-03-08|Merge into flavorized version
www/unit-php56|www/unit-php@php56|2018-03-08|Merge into flavorized version
www/unit-php71|www/unit-php@php71|2018-03-08|Merge into flavorized version
www/unit-php72|www/unit-php@php72|2018-03-08|Merge into flavorized version
databases/php70-memcached|databases/php-memcached|2018-03-08|Move to flavorized version
@ -10197,7 +10189,6 @@ comms/java-commapi-freebsd||2018-06-07|Has expired: Depends on BROKEN and expiri
comms/soundmodem||2018-06-07|Has expired: Broken for more than 6 months
comms/jsdr||2018-06-07|Has expired: Broken for more than 6 months
comms/java-commapi||2018-06-07|Has expired: Broken for more than 6 months
converters/pdf2djvu||2018-06-07|Has expired: Broken for more than 6 months
databases/rdb||2018-06-07|Has expired: Broken for more than 6 months
databases/animenfo-client||2018-06-07|Has expired: Broken for more than 6 months
databases/ruby-mysql||2018-06-07|Has expired: Broken for more than 6 months
@ -10249,7 +10240,6 @@ math/digitizer|graphics/engauge-digitizer|2018-06-20|The previously deleted port
multimedia/qt5-phonon4|multimedia/phonon@qt5|2018-06-21|Moved to a flavored version
multimedia/qt5-phonon4-designerplugin|multimedia/phonon-designerplugin@qt5|2018-06-21|Moved to a flavored version
multimedia/qt5-phonon4-gstreamer|multimedia/phonon-gstreamer@qt5|2018-06-21|Moved to a flavored version
multimedia/qt5-phonon4-vlc|multimedia/phonon-vlc@qt5|2018-06-21|Moved to a flavored version
net/libproxy-gnome|net/libproxy-gnome2|2018-06-22|Renamed to make slave names consistent
www/npapi-vlc||2018-06-22|Removed, depends on expired www/libxul
www/libxul||2018-06-22|Has expired: NPAPI are no longer supported
@ -11579,7 +11569,6 @@ net-mgmt/icinga||2019-02-04|Removed, depends on expired net-mgmt/icinga-core
net-mgmt/icli||2019-02-04|Removed, depends on expired net-mgmt/icinga-core
net-mgmt/icinga-classicweb||2019-02-04|Has expired: Upstream EOLed Icinga 1.x from 2018-12-31
net-mgmt/pnp-icinga||2019-02-04|Removed, depends on expired net-mgmt/icinga-classicweb
sysutils/atf-allwinner|devel/atf-sun50i_a64|2019-02-05|Respect the ARM TF-A platform name
sysutils/yum||2019-02-07|Has expired: Abandoned upstream, does not work with python3
sysutils/createrepo||2019-02-07|Has expired: Abandoned upstream, does not work with python3
www/wml||2019-02-08|Removing to be properly added back with svn copy
@ -11678,4 +11667,7 @@ textproc/elixir-ex_doc||2019-03-06|Has expired: Broken for more than 6 months
x11/altyo||2019-03-06|Has expired: Broken for more than 6 months
x11/pantheon-terminal||2019-03-06|Has expired: Broken for more than 6 months
x11-wm/e-module-everything-websearch||2019-03-06|Has expired: Broken for more than 6 months
net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-02-15|Renamed upstream
net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-03-06|Renamed upstream
math/mumps-edf|math/mumps|2019-03-10|Use mumps-edf as MUMPS 5
textproc/soprano||2019-03-11|Has expired: Qt4 has been EOL since december 2015
x11-fonts/mkfontdir|x11-fonts/mkfontscale|2019-03-11|Merged into one package

View File

@ -54,8 +54,7 @@ IGNORE= USES=fonts - invalid ARGS (${fonts_ARGS})
RUN_DEPENDS+= fc-cache:x11-fonts/fontconfig
.endif
.if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir)
RUN_DEPENDS+= mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale
RUN_DEPENDS+= mkfontscale:x11-fonts/mkfontscale
.endif
FONTNAME?= ${PORTNAME}

View File

@ -22,12 +22,12 @@ _GECKO_VERSION= ${gecko_ARGS:M[0-9][0-9]*}
.if ${gecko_ARGS:Mfirefox}
_GECKO_DEFAULT_VERSION= 60
_GECKO_VERSIONS= 60 65
_GECKO_VERSIONS= 60 66
_GECKO_TYPE= firefox
# Dependence lines for different Firefox versions
60_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
65_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
66_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!= ${PKG_QUERY} %v firefox firefox-esr

View File

@ -140,9 +140,12 @@ _QT_MK_POST_INCLUDED= qt.mk
_USE_QT_ALL= assistant dbus declarative designer doc gui help \
imageformats l10n linguist linguisttools multimedia \
network opengl pixeltool qdbusviewer qmake script \
scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
scripttools sql sql-mysql sql-odbc sql-pgsql \
sql-sqlite2 sql-sqlite3 svg testlib webkit \
xml xmlpatterns
.if ${ARCH} == amd64 || ${ARCH} == i386
_USE_QT_ALL+= sql-ibase
.endif
_USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
codecs-kr codecs-tw corelib demo graphicssystems-opengl \

View File

@ -111,7 +111,7 @@ MOZ_EXPORT+= PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}"
.endif
.if ${MOZILLA_VER:R:R} >= 63
BUILD_DEPENDS+= rust-cbindgen>=0.6.2:devel/rust-cbindgen \
BUILD_DEPENDS+= rust-cbindgen>=0.6.8:devel/rust-cbindgen \
node:www/node
.endif

View File

@ -69,7 +69,7 @@ CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts
CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/share/fonts
. if !defined(NOFONT)
USES+= fonts
BUILD_DEPENDS+= mkfontdir:x11-fonts/mkfontdir \
BUILD_DEPENDS+= mkfontscale>=0:x11-fonts/mkfontscale \
bdftopcf:x11-fonts/bdftopcf
PLIST_FILES+= "@comment ${FONTSDIR}/fonts.dir" \
"@comment ${FONTSDIR}/fonts.scale"

View File

@ -5,6 +5,26 @@ 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.
20190311:
AFFECTS: users of x11/xorg, x11-fonts/mkfontscale, x11-fonts/mkfontdir
AUTHOR: zeising@FreeBSD.org
The x11-fonts/mkfontdir port has been removed and the functionality
has been merged into x11-fonts/mkfontscale. This might cause issues
with upgrading. If you get conflicts between mkfontscale and mkfontdir
please remove mkfontdir before upgrading.
To do this, simply run the following:
pkg delete -f mkfontdir
20190311:
AFFECTS: users of www/igal2
AUTHOR: rodrigo@freebsd.org
www/igal2 2.2-1 is now built with graphics/ImageMagick6-nox11
and don't install the ImageMagik X11 dependencies anymore.
A build option allows you to restore the previous behaviour.
20190303:
AFFECTS: users of x11-fonts/noto*
AUTHOR: sunpoet@FreeBSD.org