opensourcemirror
/
opnsense-ports
mirror of https://github.com/opnsense/ports.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Framework: partially sync with upstream 

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2022-05-13 21:55:28 +02:00
parent a1ab235713
commit 2cd8b7d803
7 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MOVED
View File

@ -17148,3 +17148,4 @@ graphics/drm-devel-kmod||2022-05-01|Switched to a Linux version based naming sch
math/rkward-kde|math/rkward|2022-05-06|Switched to the name used by upstream
graphics/photoflow||2022-05-06|Unmaintainer upstream, has been broken for months, particularly this issue isn't answered: https://github.com/aferrero2707/PhotoFlow/issues/220
textproc/redisearch16||2022-05-09|Has expired. Use textproc/redisearch or textproc/redisearch20
devel/git-arc|devel/freebsd-git-devtools|2022-05-13|Renamed because more tools are now included

17
Mk/Uses/gem.mk
View File

@ -10,7 +10,7 @@
_INCLUDE_USES_GEM_MK= yes
_valid_ARGS= noautoplist
_valid_ARGS= noautoplist
# Sanity check
. for arg in ${gem_ARGS}
@ -19,22 +19,22 @@ IGNORE= Incorrect 'USES+= gem:${gem_ARGS}' usage: argument [${arg}] is not recog
. endif
. endfor
BUILD_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
RUN_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
PKGNAMEPREFIX?= rubygem-
EXTRACT_SUFX= .gem
EXTRACT_ONLY=
DIST_SUBDIR= rubygem
BUILD_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
EXTRACT_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
RUN_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
GEMS_BASE_DIR= lib/ruby/gems/${RUBY_VER}
GEMS_DIR= ${GEMS_BASE_DIR}/gems
DOC_DIR= ${GEMS_BASE_DIR}/doc
CACHE_DIR= ${GEMS_BASE_DIR}/cache
SPEC_DIR= ${GEMS_BASE_DIR}/specifications
DOC_DIR= ${GEMS_BASE_DIR}/doc
EXT_DIR= ${GEMS_BASE_DIR}/extensions
GEMS_DIR= ${GEMS_BASE_DIR}/gems
PLUGINS_DIR= ${GEMS_BASE_DIR}/plugins
SPEC_DIR= ${GEMS_BASE_DIR}/specifications
GEM_NAME?= ${DISTNAME}
GEM_LIB_DIR?= ${GEMS_DIR}/${GEM_NAME}
GEM_DOC_DIR?= ${DOC_DIR}/${GEM_NAME}
@ -48,14 +48,13 @@ GEM_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
PLIST_SUB+= PORTVERSION="${PORTVERSION}" \
REV="${RUBY_GEM}" \
GEMS_BASE_DIR="lib/ruby/gems/${RUBY_VER}" \
GEMS_BASE_DIR="${GEMS_BASE_DIR}" \
GEMS_DIR="${GEMS_DIR}" \
DOC_DIR="${DOC_DIR}" \
CACHE_DIR="${CACHE_DIR}" \
SPEC_DIR="${SPEC_DIR}" \
EXT_DIR="${EXT_DIR}" \
PLUGINS_DIR="${PLUGINS_DIR}" \
PORT="${PORTNAME}-${PORTVERSION}" \
GEM_NAME="${GEM_NAME}" \
GEM_LIB_DIR="${GEM_LIB_DIR}" \
GEM_DOC_DIR="${GEM_DOC_DIR}" \

29
Mk/Uses/go.mk
View File

@ -128,6 +128,8 @@ GO_ENV+= GOPATH="${GO_GOPATH}" \
. if defined(GO_MODULE)
GO_MODNAME= ${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\1/}
. if empty(DISTFILES:Mgo.mod\:*) && empty(DISTFILES:Mgo.mod)
# Unless already setup for download by other means,
# arrange to pull go.mod and distribution archive from GOPROXY.
GO_MODVERSION= ${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\2/:M@*:S/^@//:S/^$/${DISTVERSIONFULL}/}
GO_MODFILE= ${GO_MODVERSION}.mod
GO_DISTFILE= ${GO_MODVERSION}.zip
@ -162,26 +164,37 @@ _USES_POST+= go
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK)
_INCLUDE_USES_GO_POST_MK= yes
. if !target(post-fetch) && ${go_ARGS:Mmodules} && defined(GO_MODULE)
post-fetch:
. if ${go_ARGS:Mmodules} && defined(GO_MODULE)
_USES_fetch+= 200:go-pre-fetch 800:go-post-fetch
# Check that pkg can be installed or is already available,
# otherwise it will be impossible to install go and fetch dependencies.
go-pre-fetch:
. if defined(CLEAN_FETCH_ENV) && !exists(${PKG_BIN})
@${ECHO_MSG} "===> CLEAN_FETCH_ENV is defined, cannot download Go modules (pkg and go are required)"; \
exit 1
. endif
# Download all required build dependencies to GOMODCACHE.
go-post-fetch:
@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
@(cd ${DISTDIR}/${DIST_SUBDIR}; \
[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
. endif
. if !target(post-extract)
. if empty(go_ARGS)
post-extract:
_USES_extract+= 800:go-post-extract
. if empty(go_ARGS)
# Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module.
go-post-extract:
@${MKDIR} ${GO_WRKSRC:H}
@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
. elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
post-extract:
. elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
# Module-aware build mode. Although not strictly necessary (all build dependencies should be
# already in MODCACHE), vendor them so we can patch them if needed.
go-post-extract:
@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
. endif
. endif
. if !target(do-build) && empty(go_ARGS:Mno_targets)

12
Mk/Uses/gstreamer.mk
View File

@ -48,13 +48,13 @@ _GST1_PLUGINS_devel= soup
_GST1_PLUGINS_ftp= curl
_GST1_PLUGINS_graphics= aalib cairo gdkpixbuf gl jpeg kms libcaca libvisual \
opencv openexr openjpeg png qt rsvg vulkan webp zbar
_GST1_PLUGINS_multimedia= aom assrender bad dash dts dv dvd dvdread \
_GST1_PLUGINS_multimedia= aom assrender bad dash dts dv dvdread \
editing-services gnonlin good hls kate libav libde265 \
mpeg2dec mpeg2enc mplex mm openh264 resindvd rtmp \
smoothstreaming theora ttml ugly v4l2 vpx x264 x265
_GST1_PLUGINS_net= libmms srtp
_GST1_PLUGINS_security= dtls
_GST1_PLUGINS_sysutils= cdio hal
_GST1_PLUGINS_sysutils= cdio
_GST1_PLUGINS_www= neon
_GST1_PLUGINS_x11= x ximagesrc
_GST1_PLUGINS_x11-toolkits= gtk gtk4 pango
@ -134,9 +134,6 @@ gst-gme_IMPL= bad
gst-gsm_PORT= audio/gstreamer${_GST_VER}-plugins-gsm
gst-gsm_IMPL= bad
gst-hal_PORT= sysutils/gstreamer${_GST_VER}-plugins-hal
gst-hal_IMPL= good
gst-jack_PORT= audio/gstreamer${_GST_VER}-plugins-jack
gst-jack_IMPL= good
@ -178,6 +175,7 @@ gst-sidplay_IMPL= ugly
gst-sndio_PORT= audio/gstreamer${_GST_VER}-plugins-sndio
gst-sndio_IMPL= #
gst-sndio_VERSION= 1.8.0
gst-sndfile_PORT= audio/gstreamer${_GST_VER}-plugins-sndfile
gst-sndfile_IMPL= bad
@ -295,11 +293,9 @@ gst-dts_IMPL= bad
gst-dv_PORT= multimedia/gstreamer${_GST_VER}-plugins-dv
gst-dv_IMPL= good
gst-dvd_PORT= multimedia/gstreamer${_GST_VER}-plugins-dvd
gst-dvd_IMPL= ugly
gst-gnonlin_PORT= multimedia/gstreamer${_GST_VER}-plugins-gnonlin
gst-gnonlin_IMPL= good
gst-gnonlin_VERSION= 1.4.0
gst-hls_PORT= multimedia/gstreamer${_GST_VER}-plugins-hls
gst-hls_IMPL= bad

6
Mk/Uses/kde.mk
View File

@ -83,10 +83,10 @@ KDE_FRAMEWORKS_VERSION?= 5.93.0
KDE_FRAMEWORKS_BRANCH?= stable
# Current KDE applications.
KDE_APPLICATIONS_VERSION?= 22.04.0
KDE_APPLICATIONS_SHLIB_VER?= 5.20.0
KDE_APPLICATIONS_VERSION?= 22.04.1
KDE_APPLICATIONS_SHLIB_VER?= 5.20.1
# G as in KDE Gear, and as in "don't make the variable name longer than required"
KDE_APPLICATIONS_SHLIB_G_VER?= 22.04.0
KDE_APPLICATIONS_SHLIB_G_VER?= 22.04.1
KDE_APPLICATIONS_BRANCH?= stable
# Extended KDE universe applications.

4
Mk/Uses/pear.mk
View File

@ -114,6 +114,10 @@ pear-pre-install:
@${ECHO_MSG} ""
@${FALSE}
. endif
(if [ -f ${WRKSRC}/package.xml ] \
&& [ ! -f ${WRKDIR}/package.xml ] ; then \
${CP} -p ${WRKSRC}/package.xml ${WRKDIR} ; \
fi)
DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \
| ( while read r; do \

13
UPDATING
View File

@ -5,6 +5,19 @@ 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.
20220513:
AFFECTS: devel/nexus2-oss
AUTHOR: michael.osipov@siemens.com
Nexus 2.15.x introduces incompatible configuration changes. You
must review changes in ETCDIR/wrapper.conf and ETCDIR/jetty*.xml
with updated samples as well as NEXUS_WORKDIR/conf/logback-nexus.xml
with its origin from
DATADIR/nexus/WEB-INF/lib/nexus-core-VERSION.jar!/META-INF/log/logback-nexus.xml,
grant write access to files in ETCDIR since Nexus itself might
update files in place otherwise your instance will not properly
work after the update.
20220510
AFFECTS: sysutils/zrepl
AUTHOR: monwarez@gmail.com