Skip to content

Commit

Permalink
Framework: partially sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed Aug 30, 2021
1 parent d54f643 commit 8ac3567
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 15 deletions.
2 changes: 1 addition & 1 deletion GIDs
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ sftpgo:*:292:
biboumi:*:293:
krill:*:294:
jottad:*:295:
# free: 296
writefreely:*:296:
# free: 297
# free: 298
owncast:*:299:
Expand Down
10 changes: 6 additions & 4 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -6030,7 +6030,6 @@ devel/bugzilla40|devel/bugzilla44|2014-06-21|Has expired
devel/bugzilla42|devel/bugzilla44|2014-06-21|Has expired
sysutils/sysupdate||2014-06-21|Removed, no longer needed/relevant with FreeBSD in SVN
www/phpbb-devel|www/phpbb3|2014-06-22|Has expired: Use www/phpbb3 instead
math/polymake||2014-06-22|Has expired: Does not build with any supported version of Perl
www/phpsysinfo-dev|www/phpsysinfo|2014-06-22|Has expired: Use www/phpsysinfo instead
print/pkg-texinfo|print/texinfo-minimal|2014-06-24|Has been renamed
sysutils/pc-sysinstall|sysutils/pcbsd-utils|2014-06-24|Removed: pc-sysinstall is included in sysutils/pcbsd-utils
Expand Down Expand Up @@ -14474,7 +14473,6 @@ sysutils/DTraceToolkit|sysutils/dtrace-toolkit|2020-04-26|Renamed to match the p
devel/k8048|devel/pickle|2020-04-28|Project renamed
net-mgmt/bgpq|net-mgmt/bgpq3|2020-04-30|Has expired: Use net-mgmt/bgpq3 or net-mgmt/bgpq4
net/boringtun||2020-04-30|Has expired: Status of the project and motivation is unclear
dns/dnsperf||2020-04-30|Removed, depends on expired dns/bind914, not compatible with dns/bind916
dns/bind914|dns/bind916|2020-04-30|Has expired: End of life, please migrate to a newer version of BIND9
net/py-pcap|net/py-pypcap|2020-05-01|Has expired: Broken with python3 please consider using net/py-pypcap
x11-drivers/xf86-video-tseng||2020-05-01|Has expired: broken
Expand Down Expand Up @@ -14680,7 +14678,6 @@ misc/yaunc||2020-05-05|Has expired: Broken for more than 6 months
multimedia/clipgrab||2020-05-05|Has expired: Broken for more than 6 months
multimedia/libsmacker||2020-05-05|Has expired: Broken for more than 6 months
multimedia/lxdvdrip||2020-05-05|Has expired: Broken for more than 6 months
multimedia/mjpg-streamer||2020-05-05|Has expired: Broken for more than 6 months
multimedia/vcdpad||2020-05-05|Has expired: Broken for more than 6 months
net/erlang-xmlrpc||2020-05-05|Has expired: Broken for more than 6 months
net/etrace||2020-05-05|Has expired: Broken for more than 6 months
Expand Down Expand Up @@ -15471,7 +15468,6 @@ mail/nohtml||2020-09-19|Has expired: Uses deprecated version of python
mail/offlineimap||2020-09-19|Has expired: Uses deprecated version of python
mail/openemm2015||2020-09-19|Has expired: Uses deprecated version of python
math/blitz++||2020-09-19|Has expired: Uses deprecated version of python
math/openfst||2020-09-19|Has expired: Uses deprecated version of python
math/py-fpconst||2020-09-19|Has expired: Uses deprecated version of python
misc/hb||2020-09-19|Has expired: Uses deprecated version of python
misc/mtail||2020-09-19|Has expired: Uses deprecated version of python
Expand Down Expand Up @@ -16469,3 +16465,9 @@ multimedia/py-mlt|multimedia/py-mlt6|2021-07-30|Moved to a versioned directory t
net/openldap24-sasl-client|net/openldap24-client|2021-08-01|SASL is always enabled for OpenLDAP
textproc/py-python-language-server|textproc/py-python-lsp-server|2021-08-01|Has expired: Upstream forked and replaced by py-python-lsp-server
games/ponscripter-sekai|games/ponscripter-07th-mod|2021-08-13|Switch to active fork
sysutils/graid5||2021-08-21|Has expired: Module contains subtile errors and is obsolete by ZFS raidz. Consider migrating to ZFS.
x11-wm/gcompmgr||2021-08-21|Has expired: Abandonware since 2005, using discontinued libraries
irc/lostirc||2021-08-21|Has expired: Abandonware since 2005, dependens on discontinued libraries
math/normaliz|math/libnormaliz|2021-08-21|Remove duplicate
devel/rubygem-paperclip||2021-08-28|Has expired: Use ActiveStorage or a fork kt-paperclip
textproc/rubygem-rich||2021-08-28|Has expired: Depends on expired devel/rubygem-paperclip
2 changes: 1 addition & 1 deletion Mk/Uses/cargo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}:_cargo_${_index}

CARGO_BUILDDEP?= yes
.if ${CARGO_BUILDDEP:tl} == "yes"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.53.0:lang/${RUST_DEFAULT}
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.54.0:lang/${RUST_DEFAULT}
.endif

# Location of cargo binary (default to lang/rust's Cargo binary)
Expand Down
10 changes: 8 additions & 2 deletions Mk/Uses/lazarus.mk
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ FLAVOR= ${FLAVORS:[1]}

LAZARUS_PKGNAMESUFFIX= -${FLAVOR}

.if !defined(WANT_LAZARUS_DEVEL)
LAZARUS_DEVELSUFFIX= #
.else
LAZARUS_DEVELSUFFIX= -devel
.endif

.if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
BUILD_DEPENDS+= ${MKINSTDIR}/gtk2.fpm:x11-toolkits/fpc-gtk2
LIB_DEPENDS+= libglib-2.0.so:devel/glib20 \
Expand All @@ -102,13 +108,13 @@ LIB_DEPENDS+= libglib-2.0.so:devel/glib20 \
libpango-1.0.so:x11-toolkits/pango \
libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
LCL_PLATFORM= gtk2
BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus
BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus${LAZARUS_DEVELSUFFIX}
.endif

.if ${lazarus_ARGS:Mqt5} || ${FLAVOR} == qt5
LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas
LCL_PLATFORM= qt5
BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5
BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5${LAZARUS_DEVELSUFFIX}
.endif

LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild
Expand Down
10 changes: 7 additions & 3 deletions Mk/bsd.default-versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ GHOSTSCRIPT_DEFAULT?= agpl
IMAGEMAGICK_DEFAULT?= 7
# Possible values: 7, 8, 11, 12, 13, 14, 15, 16
JAVA_DEFAULT?= 8
# Possible values: 2.0.12
LAZARUS_DEFAULT?= 2.0.12
# Possible values: 2.0.12, 2.3.0
.if !defined(WANT_LAZARUS_DEVEL)
LAZARUS_DEFAULT?= 2.0.12
.else
LAZARUS_DEFAULT?= 2.3.0
.endif
# Possible values: rust, legacy
.if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le:Npowerpc)
LIBRSVG2_DEFAULT?= rust
Expand All @@ -70,7 +74,7 @@ LIBRSVG2_DEFAULT?= legacy
.endif
# Possible values: c7
LINUX_DEFAULT?= c7
# Possible values: 70, 80, 90, 10, 11, 12, -devel (to be used when non-base compiler is required)
# Possible values: 70, 80, 90, 10, 11, 12, 13, -devel (to be used when non-base compiler is required)
# Please give notice to the Graphics Team ([email protected]) in advance before
# bumping the LLVM version.
.if ${ARCH} == powerpc
Expand Down
2 changes: 1 addition & 1 deletion Mk/bsd.gecko.mk
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ BUNDLE_LIBS= yes

BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
rust-cbindgen>=0.19.0:devel/rust-cbindgen \
${RUST_DEFAULT}>=1.53.0:lang/${RUST_DEFAULT} \
${RUST_DEFAULT}>=1.54.0:lang/${RUST_DEFAULT} \
node:www/node
LIB_DEPENDS+= libdrm.so:graphics/libdrm
.if ${MOZILLA_VER:R:R} >= 85
Expand Down
4 changes: 4 additions & 0 deletions Mk/bsd.gstreamer.mk
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ _GSTREAMER_PLUGINS+= \
dvdread \
editing-services \
gtk \
gtk4 \
hls \
kate \
kms \
Expand Down Expand Up @@ -476,6 +477,9 @@ ximagesrc_IMPL= good
gtk_DEPENDS= x11-toolkits/gstreamer-plugins-gtk
gtk_IMPL= bad

gtk4_DEPENDS= x11-toolkits/gstreamer-plugins-gtk4
gtk4_IMPL= good

pango_DEPENDS= x11-toolkits/gstreamer-plugins-pango
pango_IMPL= #

Expand Down
13 changes: 11 additions & 2 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -997,10 +997,16 @@ FreeBSD_MAINTAINER= [email protected]
# DISABLE_SIZE - Do not check the size of a distfile even if the SIZE field
# has been specified in distinfo. This is useful
# when using an alternate FETCH_CMD.
#
# PKG_CREATE_VERBOSE - If set, pass the -v option to pkg create which
# PKG_CREATE_VERBOSE
# - If set, pass the -v option to pkg create which
# ensures periodic output during packaging and
# will help prevent timeouts by build monitors
# PKG_COMPRESSION_FORMAT
# - the compression format used when creating a package, see
# pkg-create(8) for valid formats
# PKG_COMPRESSION_LEVEL
# - the compression level to use when creating a package, see
# pkg-create(8) for valid values
#
# End of the list of all variables that need to be defined in a port.
# Most port authors should not need to understand anything after this point.
Expand Down Expand Up @@ -3483,6 +3489,9 @@ _EXTRA_PACKAGE_TARGET_DEP+= ${WRKDIR_PKGFILE}

.if !target(do-package)
PKG_CREATE_ARGS+= -f ${PKG_COMPRESSION_FORMAT}
.if defined(PKG_COMPRESSION_LEVEL)
PKG_CREATE_ARGS+= -l ${PKG_COMPRESSION_LEVEL}
.endif
PKG_CREATE_ARGS+= -r ${STAGEDIR}
. if defined(PKG_CREATE_VERBOSE)
PKG_CREATE_ARGS+= -v
Expand Down
12 changes: 12 additions & 0 deletions Templates/BSD.local.dist
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@
..
applications
..
bash-completion
completions
..
..
dict
..
doc
Expand All @@ -282,6 +286,10 @@
..
examples
..
fish
vendor_completions.d
..
..
info
..
java
Expand Down Expand Up @@ -974,6 +982,10 @@
..
xml
..
zsh
site-functions
..
..
..
tests
..
Expand Down
2 changes: 1 addition & 1 deletion UIDs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ sftpgo:*:292:292::0:0:SFTPGo user:/nonexistent:/usr/sbin/nologin
biboumi:*:293:293::0:0:biboumi:/nonexistent:/usr/sbin/nologin
krill:*:294:294::0:0:krill Pseudo User:/nonexistent:/usr/sbin/nologin
jottad:*:295:295::0:0:Jotta Cloud Daemon:/nonexisten:/usr/sbin/nologin
# free: 296
writefreely:*:296:296::0:0:WriteFreely daemon:/var/db/writefreely:/usr/sbin/nologin
# free: 297
# free: 298
owncast:*:299:299::0:0:& daemon:/nonexistent:/usr/sbin/nologin
Expand Down
20 changes: 20 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -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.

20210823:
AFFECTS: users of mail/mu
AUTHOR: [email protected]

mail/mu now uses XDG Base Directory Specification for the default
locations for various files. The mu database now lives under
~/.cache/mu rather than ~/.mu by default. After upgrading,
move the contents under ~/.mu to ~/.cache/mu.

20210823:
AFFECTS: users of mail/postfixadmin
AUTHOR: [email protected]

The 3.2->3.3 upgrade requires generating a new setup password hash.
The normal post-upgrade visit to setup.php will walk you through the
steps.

For more information, see the "Version 3.3" section of the change log:
https://github.com/postfixadmin/postfixadmin/blob/postfixadmin-3.3.9/CHANGELOG.TXT

20210818:
AFFECTS: users of databases/redis
AUTHOR: [email protected]
Expand Down

0 comments on commit 8ac3567

Please sign in to comment.