diff --git a/CHANGES b/CHANGES index 5c5b6235ad8..d12f8b6d67c 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,23 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20220911: +AUTHOR: zirias@FreeBSD.org + + kde.mk, qt.mk and pyqt.mk now use a colon for component suffixes + + Suffixes for build, run and test (for pyqt) dependencies used an underscore + previously. This was not in line with most other USES, using a colon for + that purpose. + + So if you previously had for example + + USE_QT= buildtools_build + + replace it with + + USE_QT= buildtools:build + 20220907: AUTHOR: se@FreeBSD.org diff --git a/GIDs b/GIDs index 4e3ef856f3a..743b8d57e5e 100644 --- a/GIDs +++ b/GIDs @@ -251,7 +251,7 @@ jicofo:*:307:jitsi jvb:*:308:jitsi wazuh:*:309: cardano:*:310: -# free: 311 +_arti:*:311: _sphinx:*:312: _fastdfs:*:313: # free: 314 diff --git a/MOVED b/MOVED index 88caeef9c1b..697b4083d0c 100644 --- a/MOVED +++ b/MOVED @@ -4393,7 +4393,6 @@ audio/cheesetracker||2013-07-26|Has expired: Depends on Qt 3.x audio/cynthiune||2013-07-26|Has expired: Depends on Qt 3.x audio/ermixer||2013-07-26|Has expired: Depends on Qt 3.x audio/k3bmonkeyaudioplugin||2013-07-26|Has expired: Depends on Qt 3.x -audio/kid3||2013-07-26|Has expired: Depends on Qt 3.x audio/kirocker||2013-07-26|Has expired: Depends on Qt 3.x audio/kmp||2013-07-26|Has expired: Depends on Qt 3.x audio/lplayer||2013-07-26|Has expired: Depends on Qt 3.x @@ -11248,7 +11247,7 @@ audio/libkcompactdisc-kde4||2018-12-31|Has expired: KDE4 is EOL upstream audio/kmix-kde4||2018-12-31|Has expired: KDE4 is EOL upstream audio/audex||2018-12-31|Has expired: Qt4 has been EOL since december 2015 audio/kio-audiocd-kde4||2018-12-31|Has expired: KDE4 is EOL upstream -audio/kid3-kde4||2018-12-31|Has expired: Qt4 and KDE4 EOL upstream. Use audio/kid3-qt5 or audio/kid3-kf5 instead +audio/kid3-kde4||2018-12-31|Has expired: Qt4 and KDE4 EOL upstream. Use audio/kid3@qt5 or audio/kid3@kf5 instead audio/libkcddb-kde4||2018-12-31|Has expired: KDE4 is EOL upstream audio/kstreamripper||2018-12-31|Has expired: Qt4 has been EOL since december 2015 audio/juk-kde4||2018-12-31|Has expired: KDE4 is EOL upstream @@ -11338,7 +11337,7 @@ sysutils/kfloppy-kde4||2018-12-31|Has expired: KDE4 is EOL upstream sysutils/kcm-polkit-kde||2018-12-31|Has expired: Qt4 has been EOL since december 2015 hungarian/kde4-l10n||2018-12-31|Has expired: KDE4 is EOL upstream java/netbeans-devel|java/netbeans|2018-12-31|Development port was removed now that this version is stable -audio/kid3-qt4|audio/kid3-qt5|2018-12-31|Has expired: KDE4 is EOL upstream +audio/kid3-qt4|audio/kid3@qt5|2018-12-31|Has expired: Qt4 is EOL upstream textproc/uim-kde4||2018-12-31|Has expired: Qt4 has been EOL since december 2015 misc/kde4-xdg-env||2018-12-31|Removed, KDE4-related x11-themes/wallpapers-freebsd-kde4|x11-themes/wallpapers-freebsd-kde|2018-12-31|Renamed, the port is not KDE4 specific @@ -17553,3 +17552,12 @@ www/mediawiki136||2022-09-04|Has expired: Upstream no longer maintained games/sopwith|games/sdl-sopwith|2022-09-04|Moved to match upstream name graphics/drm-fbsd13-kmod|graphics/drm-510-kmod|2022-09-07|Obsolete, use graphics/drm-510-kmod graphics/drm-54-kmod|graphics/drm-510-kmod|2022-09-07|Obsolete, use graphics/drm-510-kmod +archivers/ppmd-7z|archivers/7-zip|2022-09-11|ppmd-7z was a mis-named p7zip project that is unmaintained and has numerous vulnerabilities, users should use 7-zip instead +science/R-cran-AMORE||2022-09-12|Has expired: Upstream no longer maintained +www/moodle310|www/moodle311|2022-09-12|Has expired: Upstream no longer maintained, upgrade to next LTS +security/s2n|security/s2n-tls|2022-09-13|Moved to match upstream name +audio/kid3-kf5|audio/kid3@kf5|2022-09-13|Merged into flavorized version +audio/kid3-qt5|audio/kid3@qt5|2022-09-13|Merged into flavorized version +audio/phaserotate-lv2|audio/x42-plugins-lv2|2022-09-13|phaserotate-lv2 LV2 plugin is included in the x42-plugins-lv2 plugin collection +graphics/darktable40|graphics/darktable|2022-09-22|Obsolete. Use graphics/darktable, which is the same version +java/bootstrap-openjdk6|java/bootstrap-openjdk8|2022-09-25|Was only used to bootstrap the now deleted java/openjdk7 port diff --git a/Makefile b/Makefile index 1f146f9ddb4..3c0249a21b7 100644 --- a/Makefile +++ b/Makefile @@ -72,6 +72,7 @@ INDEX_COMPRESSION_FORMAT?= xz ${INDEX_COMPRESSION_FORMAT} != bz2 && ${INDEX_COMPRESSION_FORMAT} != zst .error "Invalid compression format: ${INDEX_COMPRESSION_FORMAT}, expecting xz, bz2 or zst" .endif +WWW= https://www.sqlite.org/ fetchindex: ${INDEXDIR}/${INDEXFILE}.${INDEX_COMPRESSION_FORMAT} @if bsdcat < ${INDEXDIR}/${INDEXFILE}.${INDEX_COMPRESSION_FORMAT} > ${INDEXDIR}/${INDEXFILE}.tmp ; then \ diff --git a/Mk/Scripts/create-manifest.sh b/Mk/Scripts/create-manifest.sh index 252fcead910..2f68f0e9d43 100644 --- a/Mk/Scripts/create-manifest.sh +++ b/Mk/Scripts/create-manifest.sh @@ -52,7 +52,7 @@ licenselogic: ${dp_LICENSE_COMB:-single} EOT # Then, the optional bits -[ -z "${dp_WWW}" ] || echo "www: ${dp_WWW}" +[ -z "${dp_WWW}" ] || echo "www: \"${dp_WWW%% *}\"" [ -z "${dp_LICENSE}" ] || echo "licenses: [ ${dp_LICENSE} ]" [ -z "${dp_USERS}" ] || echo "users: [ ${dp_USERS} ]" [ -z "${dp_GROUPS}" ] || echo "groups: [ ${dp_GROUPS} ]" @@ -89,7 +89,9 @@ fi cp ${dp_DESCR} ${dp_METADIR}/+DESC if [ -n "${dp_WWW}" ] && ! grep -q '^WWW: ' ${dp_DESCR}; then echo >> ${dp_METADIR}/+DESC - echo "WWW: ${dp_WWW}" >> ${dp_METADIR}/+DESC + for www in ${dp_WWW}; do + echo "WWW: ${www}" >> ${dp_METADIR}/+DESC + done fi # Concatenate all the scripts diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 09724cedbcd..b15a4ee4fea 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -69,9 +69,9 @@ IGNORE= USES=cabal: invalid arguments: ${arg} IGNORE= CABAL_PROJECT: invalid value: ${CABAL_PROJECT} . endif -. if ${ARCH} == i386 && defined(USE_CABAL) && ${USE_CABAL:Mbasement-0.0.14} +. if ${ARCH} == i386 && defined(USE_CABAL) && ${USE_CABAL:Mbasement-0.0.1[4-5]} # Upstream issue: https://github.com/haskell-foundation/foundation/issues/565 -BROKEN= basement-0.0.14 package doesn't compile on i386 +BROKEN= ${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386 . endif PKGNAMEPREFIX?= hs- diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index e8191c82294..d668873e1f2 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -8,6 +8,8 @@ # c++11-lang: The port needs a compiler understanding C++11 # c++14-lang: The port needs a compiler understanding C++14 # c++17-lang: The port needs a compiler understanding C++17 +# c++20-lang: The port needs a compiler understanding C++20 +# c++2b-lang: The port needs a compiler understanding C++2b # gcc-c++11-lib:The port needs g++ compiler with a C++11 library # c++11-lib: The port needs a compiler understanding C++11 and with a C++11 ready standard library # c11: The port needs a compiler understanding C11 @@ -33,7 +35,8 @@ _INCLUDE_USES_COMPILER_MK= yes compiler_ARGS= env . endif -VALID_ARGS= c++11-lib c++11-lang c++14-lang c++17-lang c11 features env nestedfct c++0x gcc-c++11-lib +VALID_ARGS= c++11-lib c++11-lang c++14-lang c++17-lang c++20-lang \ + c++2b-lang c11 features env nestedfct c++0x gcc-c++11-lib _CC_hash:= ${CC:hash} _CXX_hash:= ${CXX:hash} @@ -50,6 +53,10 @@ _COMPILER_ARGS+= features c++11-lang _COMPILER_ARGS+= features c++14-lang . elif ${compiler_ARGS} == c++17-lang _COMPILER_ARGS+= features c++17-lang +. elif ${compiler_ARGS} == c++20-lang +_COMPILER_ARGS+= features c++20-lang +. elif ${compiler_ARGS} == c++2b-lang +_COMPILER_ARGS+= features c++2b-lang . elif ${compiler_ARGS} == c11 _COMPILER_ARGS+= features c11 . elif ${compiler_ARGS} == features @@ -129,7 +136,8 @@ COMPILER_FEATURES= libstdc++ . endif CSTD= c89 c99 c11 gnu89 gnu99 gnu11 -CXXSTD= c++98 c++0x c++11 c++14 c++17 gnu++98 gnu++11 gnu++14 gnu++17 +CXXSTD= c++98 c++0x c++11 c++14 c++17 c++20 c++2b \ + gnu++98 gnu++11 gnu++14 gnu++17 gnu++20 gnu++2b . for std in ${CSTD} ${CXXSTD} _LANG=c @@ -159,25 +167,41 @@ CHOSEN_COMPILER_TYPE= gcc . endif . endif -. if (${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \ +. if (${_COMPILER_ARGS:Mc++2b-lang} && !${COMPILER_FEATURES:Mc++2b}) || \ +(${_COMPILER_ARGS:Mc++20-lang} && !${COMPILER_FEATURES:Mc++20}) || \ +(${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \ (${_COMPILER_ARGS:Mc++14-lang} && !${COMPILER_FEATURES:Mc++14}) || \ (${_COMPILER_ARGS:Mc++11-lang} && !${COMPILER_FEATURES:Mc++11}) || \ (${_COMPILER_ARGS:Mc++0x} && !${COMPILER_FEATURES:Mc++0x}) || \ (${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11}) +. if ${_COMPILER_ARGS:Mc++2b-lang} +_LLVM_MINVER= 14 +. elif ${_COMPILER_ARGS:Mc++20-lang} +_LLVM_MINVER= 11 +. else +_LLVM_MINVER= 0 +. endif . if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc -. elif ${COMPILER_TYPE} == gcc -. if ${ALT_COMPILER_TYPE} == clang +. elif ${COMPILER_TYPE} == gcc || \ + (${COMPILER_VERSION:C/[0-9]$//}<${_LLVM_MINVER}) +. if ${ALT_COMPILER_TYPE} == clang && \ + (${ALT_COMPILER_VERSION:C/[0-9]$//}>=${_LLVM_MINVER}) CPP= clang-cpp CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang . else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang10:devel/llvm10 -CPP= ${LOCALBASE}/bin/clang-cpp10 -CC= ${LOCALBASE}/bin/clang10 -CXX= ${LOCALBASE}/bin/clang++10 +. if ${LLVM_DEFAULT:C/^[789]0$/0/}<${_LLVM_MINVER} +_LLVM_REQ= ${_LLVM_MINVER} +. else +_LLVM_REQ= ${LLVM_DEFAULT} +. endif +BUILD_DEPENDS+= clang${_LLVM_REQ}:devel/llvm${_LLVM_REQ} +CPP= ${LOCALBASE}/bin/clang-cpp${_LLVM_REQ} +CC= ${LOCALBASE}/bin/clang${_LLVM_REQ} +CXX= ${LOCALBASE}/bin/clang++${_LLVM_REQ} CHOSEN_COMPILER_TYPE= clang . endif . endif diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index 83cfd57871c..9ecf69f0ddb 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -34,15 +34,15 @@ # This will prevent flavors. # # Variables, which can be read by ports: -# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-28.1) +# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-28.2) # EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR}) # EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs) -# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/28.1) +# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/28.2) # EMACS_MAJOR_VER: Emacs major version (e.g. 28) # EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors # EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp) -# EMACS_VER: Emacs version (e.g. 28.1) -# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.1/site-lisp) +# EMACS_VER: Emacs version (e.g. 28.2) +# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.2/site-lisp) #------------------------------------------------------------------------------- # # MAINTAINER: emacs@FreeBSD.org @@ -108,7 +108,7 @@ EMACS_FLAVOR= full EMACS_VER= 29.0.50 EMACS_PORTDIR= editors/emacs-devel . else -EMACS_VER= 28.1 +EMACS_VER= 28.2 EMACS_PORTDIR= editors/emacs . endif diff --git a/Mk/Uses/grantlee.mk b/Mk/Uses/grantlee.mk index 20c66ee090a..f050981966f 100644 --- a/Mk/Uses/grantlee.mk +++ b/Mk/Uses/grantlee.mk @@ -31,7 +31,7 @@ _INCLUDE_USES_GRANTLEE_MK= YES GRANTLEE_SUPPORTED= 5 -GRANTLEE5_VER= 5.2.0 +GRANTLEE5_VER= 5.3.0 GRANTLEE5_LIB_DEPEND= libGrantlee_Templates.so:devel/grantlee5 diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index ee4064704c4..035a854a784 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -9,8 +9,8 @@ # # USE_KDE List of KF5/Plasma5 components (other ports) that this # port depends on. -# * foo_build Add a build-time dependency (BUILD_DEPENDS) -# * foo_run Add a run-time dependency (RUN_DEPENDS) +# * foo:build Add a build-time dependency (BUILD_DEPENDS) +# * foo:run Add a run-time dependency (RUN_DEPENDS) # * foo (default) Add both dependencies on component , or # a LIB_DEPENDS if applicable. # @@ -25,7 +25,7 @@ # # option DOCS If the port is part of kde-applications (see CATEGORIES, # above) and has an option defined for DOCS then a dependency -# for doctools_build is added. The option itself doesn't +# for doctools:build is added. The option itself doesn't # have to do anything -- the dependency is always there. # # KDE_INVENT If the port does not have a regular release, and should @@ -79,7 +79,7 @@ KDE_PLASMA_VERSION?= 5.24.6 KDE_PLASMA_BRANCH?= stable # Current KDE frameworks. -KDE_FRAMEWORKS_VERSION?= 5.97.0 +KDE_FRAMEWORKS_VERSION?= 5.98.0 KDE_FRAMEWORKS_BRANCH?= stable # Current KDE applications. @@ -159,7 +159,7 @@ _KDE_OPTIONS= bogus ${OPTIONS_DEFINE} . if ${_KDE_OPTIONS:MDOCS} DOCSDIR= ${PREFIX}/share/doc PORTDOCS?= HTML/* -USE_KDE+= doctools_build +USE_KDE+= doctools:build . endif # Further pass along a SHLIB_VER PLIST_SUB PLIST_SUB+= KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_SHLIB_VER} \ @@ -173,6 +173,7 @@ DIST_SUBDIR?= KDE/plasma/${KDE_PLASMA_VERSION} . elif ${_KDE_CATEGORY:Mkde-frameworks} PORTVERSION?= ${KDE_FRAMEWORKS_VERSION} PKGNAMEPREFIX?= kf5- +WWW?= https://api.kde.org/frameworks/${PORTNAME}/html/index.html # This is a slight duplication of _USE_FRAMEWORKS_PORTING -- it maybe would be # better to rely on ${_USE_FRAMEWORKS_PORTING:S/^/k/g} _PORTINGAIDS= kjs kjsembed kdelibs4support kdesignerplugin kdewebkit khtml kmediaplayer kross kxmlrpcclient @@ -869,18 +870,18 @@ kde-${comp}_PATH= ${kde-${comp}${_KDE_VERSION}_LIB} _USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL} # Iterate through components deprived of suffix. -. for component in ${USE_KDE:O:u:C/_.+//} +. for component in ${USE_KDE:O:u:C/:.+//} # Check that the component is valid. . if ${_USE_KDE_ALL:M${component}} != "" # Skip meta-components (currently none). . if defined(kde-${component}_PORT) && (defined(kde-${component}_PATH) || defined(kde-${component}_LIB)) # Check if a dependency type is explicitly requested. -. if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" +. if ${USE_KDE:M${component}\:*} != "" && ${USE_KDE:M${component}} == "" kde-${component}_TYPE= # empty -. if ${USE_KDE:M${component}_build} != "" +. if ${USE_KDE:M${component}\:build} != "" kde-${component}_TYPE+= build . endif -. if ${USE_KDE:M${component}_run} != "" +. if ${USE_KDE:M${component}\:run} != "" kde-${component}_TYPE+= run . endif . endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index 1a8a28f5008..b0f84749c28 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -63,6 +63,7 @@ _linux_c7_dosfstools= linux-c7-dosfstools>0:sysutils/linux-c7-dosfstools _linux_${linux_ARGS}_dri= linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri _linux_${linux_ARGS}_elfutils-libelf= linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-elfutils-libelf _linux_c7_elfutils-libs= linux-c7-elfutils-libs>0:devel/linux-c7-elfutils-libs +_linux_c7_expat-devel= linux-c7-expat-devel>0:textproc/linux-c7-expat-devel _linux_${linux_ARGS}_expat= linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat _linux_c7_flac= linux-c7-flac-libs>0:audio/linux-c7-flac _linux_${linux_ARGS}_fontconfig= linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig @@ -112,6 +113,7 @@ _linux_c7_numactl-libs= linux-c7-numactl-libs>0:sysutils/linux-c7-numactl-libs _linux_${linux_ARGS}_openal-soft= linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft _linux_${linux_ARGS}_openldap= linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap _linux_c7_openmotif= linux-c7-motif>0:x11-toolkits/linux-c7-openmotif +_linux_c7_openssl-devel= linux-c7-openssl-devel>0:security/linux-c7-openssl-devel _linux_c7_openssl= ${_linux_c7_base} _linux_c7_p11-kit= linux-c7-p11-kit>0:security/linux-c7-p11-kit _linux_${linux_ARGS}_pango= linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango @@ -136,6 +138,7 @@ _linux_${linux_ARGS}_userspace-rcu= linux-${linux_ARGS}-userspace-rcu>0:sysutils _linux_c7_wayland= linux-c7-wayland>0:graphics/linux-c7-wayland _linux_c7_xcb-util= linux-c7-xcb-util>0:x11/linux-c7-xcb-util _linux_c7_xorglibs= linux-c7-xorg-libs>=7.7_7:x11/linux-c7-xorg-libs +_linux_c7_zlib-devel= linux-c7-zlib-devel>0:devel/linux-c7-zlib-devel USE_LINUX?= base . for i in ${USE_LINUX} diff --git a/Mk/Uses/metaport.mk b/Mk/Uses/metaport.mk index 8f961cccf7f..d051cebfb1b 100644 --- a/Mk/Uses/metaport.mk +++ b/Mk/Uses/metaport.mk @@ -9,6 +9,7 @@ _INCLUDE_USES_METAPORT_MK= yes LICENSE= NA +LICENSE_COMB= single LICENSE_NAME= Non applicable LICENSE_TEXT= No licenses are applicable to metaports LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk index e9188f309c5..0496dded11b 100644 --- a/Mk/Uses/pear.mk +++ b/Mk/Uses/pear.mk @@ -22,7 +22,7 @@ IGNORE= Incorrect 'USES+= pear:${pear_ARGS}' usage: argument [${arg}] is not rec . endif . endfor -_pear_IGNORE_WITH_PHP= 82 +_pear_IGNORE_WITH_PHP= IGNORE_WITH_PHP?= ${_pear_IGNORE_WITH_PHP} php_ARGS+= flavors .include "${USESDIR}/php.mk" @@ -40,6 +40,8 @@ MASTER_SITES?= http://pear.php.net/get/ EXTRACT_SUFX?= .tgz DIST_SUBDIR?= PEAR +WWW?= https://pear.php.net/package/${PORTNAME}/ + . if empty(php_ARGS:Mphpize) NO_BUILD= yes . endif diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 2b7972fa7e0..09c2ecbe118 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -184,7 +184,7 @@ PHP_VER= ${FLAVOR:S/^php//} # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. . if ${PHP_VER} == 82 -PHP_EXT_DIR= 20210903 +PHP_EXT_DIR= 20220829 PHP_EXT_INC= hash json openssl pcre random spl . elif ${PHP_VER} == 81 PHP_EXT_DIR= 20210902 diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index a421a438056..33ce894a4f0 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -11,10 +11,10 @@ # targets are then set assuming a certain tarball and # port layout. # USE_PYQT - List of PyQt components to depend on -# * foo_build only build depend -# * foo_run only run depend -# * foo_test only test depend -# * foo both (default) +# * foo:build only build depend +# * foo:run only run depend +# * foo:test only test depend +# * foo build and run depend (default) # PYQT_SIPDIR - where sip files will be installed to # PYQT_APIDIR - where api files will be installed to # PYQT_DOCDIR - where doc files will be installed to @@ -199,7 +199,7 @@ _USE_PYQT_ALL+= ${_USE_SIP_ALL} \ ${_USE_QSCINTILLA} \ ${_USE_PYQTBUILDER} . for comp in ${_USE_PYQT_ALL:O:u} -_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test +_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}:build py-${comp}:run py-${comp}:test py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_TEST_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} @@ -211,9 +211,9 @@ py-${comp}_test_TEST_DEPENDS?= ${py-${comp}_TEST_DEPENDS} _USE_PYQT= ${USE_PYQT:O:u} . for comp in ${_USE_PYQT} . if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}} -BUILD_DEPENDS+= ${py-${comp}_BUILD_DEPENDS} -RUN_DEPENDS+= ${py-${comp}_RUN_DEPENDS} -TEST_DEPENDS+= ${py-${comp}_TEST_DEPENDS} +BUILD_DEPENDS+= ${py-${comp:S/:/_/}_BUILD_DEPENDS} +RUN_DEPENDS+= ${py-${comp:S/:/_/}_RUN_DEPENDS} +TEST_DEPENDS+= ${py-${comp:S/:/_/}_TEST_DEPENDS} . else IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #' . endif diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index 48304c74249..e6fc0758026 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -110,7 +110,7 @@ QMAKE_SOURCE_PATH?= # empty # Add qmake to USE_QT -- unless it's qmake itself . if !${PORTNAME} == qmake && ${_QT_VER:M5} -USE_QT+= qmake_build +USE_QT+= qmake:build . endif . if empty(qmake_ARGS:Mno_env) diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index c60b4c98a61..c22a001c8c8 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -1,8 +1,8 @@ # There are three Qt related USES files with different access to Qt. # - qmake: The port requires Qt's qmake to build -- creates the configure target # - auto includes qt.mk -# - qt-dist: The port is a port for an part of Qt5 -# - auto inclues qt.mk +# - qt-dist: The port is a port for a part of Qt +# - auto includes qt.mk # - qt.mk - Dependency handling. USE_QT=foo bar # # diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 98c60ae1e2f..e71f3e62c0b 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -1,18 +1,18 @@ # There are three Qt related USES files with different access to Qt. # - qmake: The port requires Qt's qmake to build -- creates the configure target # - auto includes qt.mk -# - qt-dist: The port is a port for a part of Qt5 +# - qt-dist: The port is a port for a part of Qt # - auto includes qt.mk and qmake.mk # - qt.mk - Dependency handling. USE_QT=foo bar # # Usage: # USES=qt:[,no_env] # -# Versions: 5 +# Versions: 5, 6 # # Port variables: -# USE_QT - List of Qt modules to depend on, with optional '_build' -# and '_run' suffixes. Define it empty to include this file +# USE_QT - List of Qt modules to depend on, with optional ':build' +# and ':run' suffixes. Define it empty to include this file # without depending on Qt ports. # # MAINTAINER: kde@FreeBSD.org @@ -23,7 +23,7 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 QT5_VERSION?= 5.15.5 -QT6_VERSION?= 6.3.1 +QT6_VERSION?= 6.3.2 # We accept the Qt version to be passed by either or all of the three mk files. . if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS) @@ -399,18 +399,18 @@ _USE_QT_ALL= ${_USE_QT_COMMON} \ ${_USE_QT${_QT_VER}_ONLY} _USE_QT= ${USE_QT} # Iterate through components deprived of suffix. -. for component in ${_USE_QT:O:u:C/_(build|run)$//} +. for component in ${_USE_QT:O:u:C/:(build|run)$//} # Check that the component is valid. . if ${_USE_QT_ALL:M${component}} != "" # Skip meta-components (currently none). . if defined(qt-${component}_PORT) && (defined(qt-${component}_PATH) || defined(qt-${component}_LIB)) # Check if a dependency type is explicitly requested. -. if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == "" +. if ${_USE_QT:M${component}\:*} != "" && ${_USE_QT:M${component}} == "" qt-${component}_TYPE= # empty -. if ${_USE_QT:M${component}_build} != "" +. if ${_USE_QT:M${component}\:build} != "" qt-${component}_TYPE+= build . endif -. if ${_USE_QT:M${component}_run} != "" +. if ${_USE_QT:M${component}\:run} != "" qt-${component}_TYPE+= run . endif . endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == "" diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk index 036d83720f5..83f22574842 100644 --- a/Mk/bsd.ccache.mk +++ b/Mk/bsd.ccache.mk @@ -11,6 +11,7 @@ # default. # # Port use (users should not modify these): +# - CCACHE_ENABLED - tells the port if ccache is enabled. # - CCACHE_BIN - path to the ccache binary. Intended to be prefixed before CC. # - CCACHE_WRAPPER_PATH - path to directory containing compiler symlinks back # to ccache. For example, gcc5 -> ccache. Intended @@ -42,11 +43,18 @@ _CCACHEMKINCLUDED= yes NO_CCACHE= t . endif +. if defined(WITH_CCACHE_BUILD) +CCACHE_ENABLED= yes +. else +CCACHE_ENABLED= no +. endif + # HOME is always set to ${WRKDIR} now. Try to use /root/.ccache as default. . if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) . if defined(USER) && ${USER} == root CCACHE_DIR= /root/.ccache . else +CCACHE_ENABLED= no NO_CCACHE= yes WARNING+= WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR. . endif diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 047310846c1..5581ae2494c 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -66,10 +66,7 @@ CPE_VENDOR?=mozilla USE_GL= gl USE_GNOME= cairo gdkpixbuf2 gtk30 USE_PERL5= build -USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrender xt -. if ${MOZILLA_VER:R:R} >= 96 -USE_XORG+= xrandr xtst -. endif +USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xt xtst HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes LDFLAGS+= -Wl,--as-needed @@ -164,10 +161,7 @@ pixman_LIB_DEPENDS= libpixman-1.so:x11/pixman pixman_MOZ_OPTIONS= --enable-system-pixman png_LIB_DEPENDS= libpng.so:graphics/png -png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} -. if ${MOZILLA_VER:R:R} >= 97 png_MOZ_OPTIONS= --with-system-png -. endif sqlite_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 sqlite_MOZ_OPTIONS= --enable-system-sqlite @@ -271,18 +265,9 @@ MOZ_OPTIONS+= --disable-pulseaudio . if ${PORT_OPTIONS:MSNDIO} BUILD_DEPENDS+= ${LOCALBASE}/include/sndio.h:audio/sndio -. if ${MOZILLA_VER:R:R} < 100 -post-patch-SNDIO-on: - @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ - -e '/DISABLE_LIBSNDIO_DLOPEN/d' \ - ${MOZSRC}/media/libcubeb/src/moz.build -. else MOZ_OPTIONS+= --enable-sndio -. endif . else -. if ${MOZILLA_VER:R:R} >= 100 MOZ_OPTIONS+= --disable-sndio -. endif . endif . if ${PORT_OPTIONS:MDEBUG} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e4389d7fc88..c582ca50bb3 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3567,6 +3567,8 @@ create-users-groups: . endif . endif +_WWW= ${WWW:[1]} + . if !defined(DISABLE_SECURITY_CHECK) . if !target(security-check) security-check: ${TMPPLIST} @@ -4287,7 +4289,7 @@ create-manifest: dp_PORT_OPTIONS='${PORT_OPTIONS}' \ dp_PREFIX='${PREFIX}' \ dp_USERS='${USERS:u:S/$/,/}' \ - dp_WWW='${_WWW}' \ + dp_WWW='${WWW}' \ ${PKG_NOTES_ENV} \ ${SH} ${SCRIPTSDIR}/create-manifest.sh @@ -4351,7 +4353,6 @@ _FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C _LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} _BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} _RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} -_WWW=${WWW:U${MASTER_SITES:[1]}} . if exists(${DESCR}) _DESCR=${DESCR} . else diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 47a0eb78fea..ca2fe89f768 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -133,7 +133,7 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} # Ruby 2.7 # RUBY_DISTVERSION= 2.7.6 -RUBY_PORTREVISION= 2 +RUBY_PORTREVISION= 3 RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.0 @@ -141,22 +141,22 @@ RUBY_PORTEPOCH= 1 # Ruby 3.0 # RUBY_DISTVERSION= 3.0.4 -RUBY_PORTREVISION= 2 +RUBY_PORTREVISION= 3 RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.1 # # Ruby 3.1 # RUBY_DISTVERSION= 3.1.2 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.2 # # Ruby 3.2 # -RUBY_DISTVERSION= 3.2.0-preview1 -RUBY_PORTREVISION= 2 +RUBY_DISTVERSION= 3.2.0-preview2 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 # When adding a version, please keep the comment in diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index f5029b7fcac..ec15d0a70df 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -248,23 +248,13 @@ MASTER_SITE_FRUGALWARE+= \ .if !defined(IGNORE_MASTER_SITE_GCC) MASTER_SITE_GCC+= \ https://mirrors.kernel.org/sourceware/gcc/%SUBDIR%/ \ - http://gcc.parentingamerica.com/%SUBDIR%/ \ - http://gcc.cybermirror.org/%SUBDIR%/ \ - http://gcc-uk.internet.bs/%SUBDIR%/ \ - http://www.netgull.com/gcc/%SUBDIR%/ \ - http://robotlab.itk.ppke.hu/gcc/%SUBDIR%/ \ - http://gcc.fyxm.net/%SUBDIR%/ \ https://ftp-stud.hs-esslingen.de/pub/Mirrors/sourceware.org/gcc/%SUBDIR%/ \ - ftp://ftp.funet.fi/pub/mirrors/sourceware.org/pub/gcc/%SUBDIR%/ \ - ftp://gcc.gnu.org/pub/gcc/%SUBDIR%/ \ - ftp://ftp.lip6.fr/pub/gcc/%SUBDIR%/ \ - ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/%SUBDIR%/ \ - ftp://ftp.uvsq.fr/pub/gcc/%SUBDIR%/ \ - ftp://ftp.gwdg.de/pub/misc/gcc/%SUBDIR%/ \ - ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/%SUBDIR%/ \ - ftp://ftp.nluug.nl/mirror/languages/gcc/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/%SUBDIR%/ \ - ftp://ftp.ntua.gr/pub/gnu/gcc/%SUBDIR%/ + https://ftp.funet.fi/pub/mirrors/sourceware.org/pub/gcc/%SUBDIR%/ \ + https://ftp.mpi-inf.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/%SUBDIR%/ \ + https://mirrorservice.org/sites/sourceware.org/pub/gcc/%SUBDIR%/ \ + http://mirror.koddos.net/gcc/%SUBDIR%/ \ + http://ftp.ntua.gr/pub/gnu/gcc/%SUBDIR%/ \ + http://gcc.gnu.org/pub/gcc/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_GENTOO) @@ -459,6 +449,7 @@ git-clone-${_group}: ${_GITHUB_CLONE_DIR} . endif convert-to-gh-tuple: @${ECHO_MSG} ${GH_ACCOUNT}:${GH_PROJECT}:${GH_TAGNAME} ${_GH_TUPLE_OUT:S/\/$//} +WWW?= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ . endif # defined(USE_GITHUB) .endif # !defined(IGNORE_MASTER_SITE_GITHUB) @@ -589,6 +580,7 @@ git-clone-${_group}: ${_GITLAB_CLONE_DIR} @${ECHO_MSG} "Cloned the ${_group} GitLab repository into ${_GITLAB_CLONE_DIR}/${GL_PROJECT_${_group}}" | ${FMT_80} . endfor . endif +WWW?= https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/ . endif # defined(USE_GITLAB) .endif # !defined(IGNORE_MASTER_SITE_GITLAB) @@ -759,10 +751,7 @@ MASTER_SITE_MOZILLA_ADDONS+= \ MASTER_SITE_MYSQL+= \ ftp://ftp.fi.muni.cz/pub/mysql/Downloads/%SUBDIR%/ \ ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/%SUBDIR%/ \ - http://mirrors.ntua.gr/MySQL/Downloads/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/databases/mysql/Downloads/%SUBDIR%/ \ - ftp://mirror.switch.ch/mirror/mysql/Downloads/%SUBDIR%/ \ - http://mysql.mirrors.pair.com/Downloads/%SUBDIR%/ \ https://dev.mysql.com/get/Downloads/%SUBDIR%/ .endif @@ -937,16 +926,18 @@ MASTER_SITE_SAMBA+= \ https://ftp.samba.org/pub/%SUBDIR%/ .endif -# List: https://download.savannah.gnu.org/mirmon/ +# List: https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html .if !defined(IGNORE_MASTER_SITE_SAVANNAH) MASTER_SITE_SAVANNAH+= \ https://download.savannah.gnu.org/releases/%SUBDIR%/ \ - https://download-mirror.savannah.gnu.org/releases/%SUBDIR%/ \ + https://nongnu.uib.no/%SUBDIR%/ \ + https://mirror.kumi.systems/nongnu/%SUBDIR%/ \ + https://mirrors.up.pt/pub/nongnu/%SUBDIR%/ \ http://nongnu.askapache.com/%SUBDIR%/ \ - http://mirror.lihnidos.org/GNU/savannah/%SUBDIR%/ \ - http://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/ \ - ftp://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/ \ - http://gnu.mirrors.pair.com/savannah/savannah/%SUBDIR%/ + http://mirror.netcologne.de/savannah/%SUBDIR%/ \ + http://mirror.csclub.uwaterloo.ca/nongnu/%SUBDIR%/ \ + http://mirror.easyname.at/nongnu/%SUBDIR%/ \ + https://download-mirror.savannah.gnu.org/releases/%SUBDIR%/ .endif # List: https://sourceforge.net/p/forge/documentation/Mirrors/ diff --git a/UIDs b/UIDs index 1e52a1072fe..1fa5eb54fad 100644 --- a/UIDs +++ b/UIDs @@ -256,7 +256,7 @@ jicofo:*:307:307::0:0:Jitsi Conference Focus Owner:/nonexistent:/usr/sbin/nologi jvb:*:308:308::0:0:Jitsi VideoBridge Owner:/nonexistent:/usr/sbin/nologin wazuh:*:309:309::0:0:Wazuh Owner:/var/ossec:/usr/sbin/nologin cardano:*:310:310::0:0:Cardano Node Daemon:/nonexistent:/usr/sbin/nologin -# free: 311 +_arti:*:311:311::0:0:Arti Daemon:/nonexistent:/usr/sbin/nologin _sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin _fastdfs:*:313:313::0:0:FastDFS Owner:/nonexistent:/usr/sbin/nologin # free: 314 diff --git a/UPDATING b/UPDATING index 639895fd020..92127b5de62 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,76 @@ 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. +20220925: + AFFECTS: users of security/libressl + AUTHOR: brnrd@FreeBSD.org + + The port has been updated to the latest stable version 3.5 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. + +20220919: + AFFECTS: users of sysutils/schilyutils + AUTHOR: fuz@fuz.su + + Schilyutils has been split up into two ports. If you want the bosh shell, + the new port is shells/bosh, which can be installed with: + + # pkg install bosh + or + # portmaster -o shells/bosh + +20220918: + AFFECTS: users of mail/roundcube + AUTHOR: brnrd@FreeBSD.org + + Roundcube has been upgraded to 1.6.0 and introduces breaking changes to + configuration options of remote services (imap, smtp, ldap, sieve). Check + https://roundcube.net/news/2022/07/28/roundcube-1.6.0-released for details. + + Version 1.6 no longer includes the Classic and Larry skins, which are now + available as separate mail/roundcube-classic and mail/roundcube-larry ports. + +20220910: + AFFECTS: users of devel/cmake + AUTHOR: diizzy@FreeBSD.org + + CMake has been converted to a meta-port and new CMake packages created causes + conflicts with old binary packages prior to this change. + + If CMake was installed using binary packages via pkg it needs to be + uninstalled using pkg delete before installing CMake and related packages + after this change. + + pkg delete cmake + pkg install cmake-core + + If you're using portmaster you also need to delete the old CMake package + before upgrading. + +20220909: + AFFECTS: users of emulators/qemu + AUTHOR: bofh@FreeBSD.org + + emulators/qemu has been updated to 7.1.0. Previous 7.0.X branch has + been repocopied to emulators/qemu70. If someone wants to stick with 7.0.X + branch please use one of the following command: + + # pkg install qemu70/qemu70-nox11(based on flavor used) + or + # portmaster -o emulators/qemu70 emulators/qemu + or + # portupgrade -o emulators/qemu70 emulators/qemu + 20220903: AFFECTS: users of editors/vim AUTHOR: adamw@FreeBSD.org