From 9c66280ca3c72e6a4223a2f3c9ee72e97bfdd566 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 17 Feb 2020 08:47:41 +0100 Subject: [PATCH] Framework: partially sync with upstream Taken from: HardenedBSD --- MOVED | 25 ++++++++++++++++++++++++- Mk/Uses/mono.mk | 8 ++++++-- Mk/bsd.port.mk | 6 ++++-- Mk/bsd.sites.mk | 2 +- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/MOVED b/MOVED index d8d05bf5970..e4c3dadf782 100644 --- a/MOVED +++ b/MOVED @@ -11819,7 +11819,6 @@ graphics/qt4-opengl||2019-03-16|Has expired: Qt4 has been EOL since december 201 graphics/qt4-pixeltool||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/qt4-svg||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/qxv||2019-03-16|Has expired: Qt4 has been EOL since december 2015, qxv is unmaintained -graphics/seexpr||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/smillaenlarger||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/structuresynth||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/yagf||2019-03-16|Has expired: Qt4 has been EOL since december 2015 @@ -14256,3 +14255,27 @@ devel/go-godef||2020-02-14|Removed devel/racerd||2020-02-14|Has expired: Old, unmaintained, and fails to build with Rust 1.41.0 or newer; use rls from lang/rust instead www/plexwatchweb||2020-02-14|Removed multimedia/plexwatch||2020-02-14|Removed +textproc/rubygem-elasticsearch-model019|textproc/rubygem-elasticsearch-model|2020-02-14|Obsolete, use textproc/rubygem-elasticsearch-model instead +textproc/rubygem-elasticsearch-rails019|textproc/rubygem-elasticsearch-rails|2020-02-14|Obsolete, use textproc/rubygem-elasticsearch-rails instead +textproc/rubygem-elasticsearch503|textproc/rubygem-elasticsearch|2020-02-14|Obsolete, use textproc/rubygem-elasticsearch instead +textproc/rubygem-elasticsearch-api503|textproc/rubygem-elasticsearch-api|2020-02-14|Obsolete, use textproc/rubygem-elasticsearch-api instead +textproc/rubygem-elasticsearch-transport503|textproc/rubygem-elasticsearch-transport|2020-02-14|Obselete, use textproc/rubygem-elasticsearch-transport instead +textproc/rubygem-asciidoctor-plantuml009|textproc/rubygem-asciidoctor-plantuml|2020-02-14|Obsolete, use textproc/rubygem-asciidoctor-plantuml instead +archivers/rox-archive||2020-02-16|Has expired: Old, uses EOLed python27 +databases/ldb|databases/ldb14|2020-02-16|Has expired: Old version, uses EOLed python27 +databases/ldb12|databases/ldb14|2020-02-16|Has expired: Old version, uses EOLed python27 +databases/ldb13|databases/ldb14|2020-02-16|Has expired: Old version, uses EOLed python27 +databases/tdb1|databases/tdb|2020-02-16|Has expired: Old version, uses EOLed python27 +deskutils/rox-memo||2020-02-16|Has expired: Old, uses EOLed python27 +devel/py-roxlib||2020-02-16|Has expired: Old, uses EOLed python27 +devel/talloc1|devel/talloc|2020-02-16|Has expired: Old version, uses EOLed python27 +devel/tevent1|devel/tevent|2020-02-16|Has expired: Old version, uses EOLed python27 +editors/rox-edit||2020-02-16|Has expired: Old, uses EOLed python27 +graphics/ocre||2020-02-16|Has expired: unfetchable, author not reachable, seems discontinued +math/py-basemap||2020-02-16|Has expired: Deprecated upstream +multimedia/rox-videothumbnail||2020-02-16|Has expired: Old, uses EOLed python27 +security/morphis||2020-02-16|Has expired: Fails to build with recent versions of python, upstream git repository is gone +x11/rox-wallpaper||2020-02-16|Has expired: Old, uses EOLed python27 +x11-fm/rox-mime-editor||2020-02-16|Has expired: Old, uses EOLed python27 +x11-fm/rox-session||2020-02-16|Has expired: Old, uses EOLed python27 +graphics/py-PyX|graphics/py-pyx|2020-02-16|Use lowercase port name diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk index d1e56fd52ab..b16f655f16f 100644 --- a/Mk/Uses/mono.mk +++ b/Mk/Uses/mono.mk @@ -10,6 +10,8 @@ # # Arguments: # +# build Specifies that mono is only a build-time dependency. +# # nuget Specifies that the port uses nuget packages. # # EXTRACT_ONLY is conditionally overridden to exclude all @@ -71,8 +73,8 @@ .if !defined(_INCLUDE_USES_MONO_MK) _INCLUDE_USES_MONO_MK= yes -.if !empty(mono_ARGS:Nnuget) -IGNORE= USES=mono only supports an optional nuget argument +.if !empty(mono_ARGS:Nnuget:Nbuild) +IGNORE= USES=mono only supports optional arguments nuget and build .endif # Set the location of the .wapi directory so we write to a location we @@ -81,7 +83,9 @@ MONO_SHARED_DIR= ${WRKDIR} CONFIGURE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}" MAKE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}" TZ=UTC BUILD_DEPENDS+= mono:lang/mono +.if empty(mono_ARGS:Mbuild) RUN_DEPENDS+= mono:lang/mono +.endif # Set the location that webaps served by XSP should use. XSP_DOCROOT= ${PREFIX}/www/xsp diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4757c43839d..2eb7858de09 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -42,8 +42,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # OPSYS - Portability clause. This is the operating system the # makefile is being used on. Automatically set to # "FreeBSD," "NetBSD," or "OpenBSD" as appropriate. -# OSREL - The release version (numeric) of the operating system. -# OSVERSION - The value of __FreeBSD_version. +# OSREL - The release version of the operating system as a text +# string (e.g., "12.1"). +# OSVERSION - The operating system version as a comparable integer; +# the value of __FreeBSD_version (e.g., 1201000). # # This is the beginning of the list of all variables that need to be # defined in a port, listed in order that they should be included diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index e0dfe0db3de..4fc2f81e5a8 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -1041,7 +1041,7 @@ MASTER_SITE_SAVANNAH+= \ .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE) .for p in https http MASTER_SITE_SOURCEFORGE+= ${p}://downloads.sourceforge.net/project/%SUBDIR%/ -.for m in cytranet excellmedia freefr jaist kent nchc \ +.for m in excellmedia freefr jaist kent nchc \ netcologne netix superb-dca2 superb-sea2 ufpr vorboss MASTER_SITE_SOURCEFORGE+= ${p}://${m}.dl.sourceforge.net/project/%SUBDIR%/ .endfor