From 35227a77cd5ffe3f1064ce8ab2f22c2b2275f57e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 2 Sep 2019 09:10:41 +0200 Subject: [PATCH] Framework: partially sync with upstream Taken from: HardenedBSD --- LEGAL | 1 - MOVED | 19 +++++++++++++++++++ Mk/Scripts/qa.sh | 3 --- Mk/Uses/emacs.mk | 2 +- Mk/Uses/pure.mk | 39 --------------------------------------- Mk/bsd.options.desc.mk | 1 + Templates/config.site | 2 -- 7 files changed, 21 insertions(+), 46 deletions(-) delete mode 100644 Mk/Uses/pure.mk diff --git a/LEGAL b/LEGAL index 255d63c5bdb..6fdb42d77ea 100644 --- a/LEGAL +++ b/LEGAL @@ -60,7 +60,6 @@ defcon* games/linux-defcon Redistribution is limited, see license djbdns* dns/djbdns No license -- see http://cr.yp.to/softwarelaw.html djbfft-* math/djbfft No license -- see http://cr.yp.to/softwarelaw.html dlv lang/dlv Not sure if we can redistribute it -dmd-* lang/dmd1 No redistribution of non validated binaries dn*.tgz emulators/darcnes Commercial use is restricted doom3-linux-* games/linux-doom3 Redistribution is limited, see license; Requested by id Software doom3-linux-* games/linux-doom3-demo Redistribution is limited, see license; Requested by id Software diff --git a/MOVED b/MOVED index 40510ea09f3..53ab045dc08 100644 --- a/MOVED +++ b/MOVED @@ -12888,3 +12888,22 @@ security/rubygem-devise-two-factor30-rails5|security/rubygem-devise-two-factor-r textproc/rubygem-asciidoctor-plantuml008|textproc/rubygem-asciidoctor-plantuml|2019-08-30|No longer needed after gitlab-ce 12.1 update (r510253) www/rubygem-responders2-rails5|www/rubygem-responders-rails5|2019-08-30|No longer needed after gitlab-ce 12.1 update (r510253) graphics/kipiplugins|graphics/kipi-plugins|2019-08-30|Renamed upstream +devel/rubygem-rails-i18n|devel/rubygem-rails-i18n-rails5|2019-08-31|Has expired: Use devel/rubygem-rails-i18n-rails5 instead +textproc/rubygem-gitlab-linguist|textproc/rubygem-github-linguist|2019-08-31|Has expired: Use textproc/rubygem-github-linguist instead +textproc/rubygem-html-pipeline1|textproc/rubygem-html-pipeline|2019-08-31|Has expired: Use textproc/rubygem-html-pipeline instead +devel/pure-stldict||2019-09-01|Has expired: Depends on expiring devel/llvm35 +lang/dmd1||2019-09-01|Has expired: No longer supported upstream +lang/gprolog||2019-09-01|Has expired: Abandonware upstream (more than five years), fails in various ways with remotely recent compilers +math/pure-mpfr||2019-09-01|Has expired: Depends on expiring devel/llvm35 +math/pure-rational||2019-09-01|Has expired: Depends on expiring devel/llvm35 +net/pure-sockets||2019-09-01|Has expired: Depends on expiring devel/llvm35 +textproc/pure-csv||2019-09-01|Has expired: Depends on expiring devel/llvm35 +textproc/pure-xml||2019-09-01|Has expired: Depends on expiring devel/llvm35 +x11-toolkits/pure-tk||2019-09-01|Has expired: Depends on expiring devel/llvm35 +databases/pure-sql3||2019-09-01|Has expired: Depends on expiring devel/llvm35 +devel/pure-readline||2019-09-01|Has expired: Depends on expiring devel/llvm35 +devel/pure-stllib||2019-09-01|Has expired: Depends on expiring devel/llvm35 +x11-toolkits/pure-gtk||2019-09-01|Has expired: Depends on expiring devel/llvm35 +lang/pure||2019-09-01|Has expired: Depends on expiring devel/llvm35 +devel/pure-ffi||2019-09-01|Has expired: Depends on expiring devel/llvm35 +devel/llvm35||2019-09-01|Has expired: Obsolete and unmaintained diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 4186db94f01..de3b57740fb 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -613,9 +613,6 @@ proxydeps_suggest_uses() { # openal elif [ ${pkg} = "audio/openal" -o ${pkg} = "audio/openal-soft" -o ${pkg} = "audio/freealut" ]; then warn "you need USES+=openal" - # pure - elif [ ${pkg} = "lang/pure" ]; then - warn "you need USES+=pure" # readline elif [ ${pkg} = "devel/readline" ]; then warn "you need USES+=readline" diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index c16db36ab45..04bb981a8b3 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -106,7 +106,7 @@ EMACS_FLAVOR= full EMACS_VER= 27.0.50 EMACS_PORTDIR= editors/emacs-devel .else -EMACS_VER= 26.2 +EMACS_VER= 26.3 EMACS_PORTDIR= editors/emacs .endif diff --git a/Mk/Uses/pure.mk b/Mk/Uses/pure.mk deleted file mode 100644 index a3d6a5fb0d4..00000000000 --- a/Mk/Uses/pure.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Created by: Rusmir Dusko -# $FreeBSD$ -# -# Provide support for Pure Programming Language based projects -# -# Feature: pure -# Usage: USES=pure or USES=pure:ARGS -# Valid ARGS: ffi -# ARGS description: -# ffi makes the port depends on pure-ffi at runtime -# -# MAINTAINER= ports@FreeBSD.org - -.if !defined(_INCLUDE_USES_PURE_MK) -_INCLUDE_USES_PURE_MK= yes - -_valid_ARGS= ffi - -# Sanity check -.for arg in ${pure_ARGS} -. if empty(_valid_ARGS:M${arg}) -IGNORE= Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${arg}] is not recognized -. endif -.endfor - -LIB_DEPENDS+= libpure.so:lang/pure -.include "${USESDIR}/gmake.mk" - -.if ${pure_ARGS:Mffi} -RUN_DEPENDS+= ${LOCALBASE}/lib/pure/ffi.pure:devel/pure-ffi -.endif - -MAKE_ARGS+= prefix=${PREFIX} mandir=${PREFIX}/man \ - CC=${CC} CFLAGS="${CFLAGS}" \ - CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \ - CPPFLAGS+=-I${LOCALBASE}/include \ - LDFLAGS+=-L${LOCALBASE}/lib - -.endif #!defined(_INCLUDE_USES_PURE_MK) diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk index 1b01fe9ad34..e61e35fe1df 100644 --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -22,6 +22,7 @@ AALIB_DESC?= AAlib graphics library support ACOUSTID_DESC?= AcoustID audio fingerprinting support ALAC_DESC?= Apple Lossless audio format support ALSA_DESC?= ALSA audio architecture support +ALTIVEC_DESC?= Use Altivec optimized routines AMR_DESC?= AMR 3GPP speech codec support (opencore) AMR_NB_DESC?= AMR Narrow Band audio support (opencore) AMR_WB_DESC?= AMR Wide Band audio support (opencore) diff --git a/Templates/config.site b/Templates/config.site index c26c9717830..fa7089df017 100644 --- a/Templates/config.site +++ b/Templates/config.site @@ -681,7 +681,6 @@ : ${ac_cv_have_decl_getpagesize=yes} : ${ac_cv_have_decl_getrlimit=yes} : ${ac_cv_have_decl_getrusage=yes} -: ${ac_cv_have_decl_gets=yes} : ${ac_cv_have_decl_getsubopt=yes} : ${ac_cv_have_decl_gettimeofday=yes} : ${ac_cv_have_decl_getusershell=yes} @@ -953,7 +952,6 @@ : ${gl_cv_have_raw_decl_getlogin=yes} : ${gl_cv_have_raw_decl_getlogin_r=yes} : ${gl_cv_have_raw_decl_getpagesize=yes} -: ${gl_cv_have_raw_decl_gets=yes} : ${gl_cv_have_raw_decl_getsubopt=yes} : ${gl_cv_have_raw_decl_gettimeofday=yes} : ${gl_cv_have_raw_decl_getusershell=yes}