FreeBSD/ports 5689c9cwww/forgejo-lts Makefile pkg-plist

www/forgejo-lts: Fix non-BINDATA case

DATADIR is still needed for static assets in the non-BINDATA case.
Point StaticRootPath at it.  In the BINDATA case (which is the default),
the assets are linked into the binary and StaticRootPath is not used.

PR:             294619
Fixes:          7c546a3a09e0 ("www/forgejo-lts: Correct AppWorkPAth")
MFH:            2026Q2
(cherry picked from commit 6d5d169cad9968a142e928d69e95438aafd95774)
DeltaFile
+4-1www/forgejo-lts/Makefile
+1-0www/forgejo-lts/pkg-plist
+5-12 files

FreeBSD/ports a50884ewww/forgejo Makefile pkg-plist

www/forgejo: Fix non-BINDATA case

DATADIR is still needed for static assets in the non-BINDATA case.
Point StaticRootPath at it.  In the BINDATA case (which is the default),
the assets are linked into the binary and StaticRootPath is not used.

PR:             294619
Fixes:          3686ad021c23 ("www/forgejo: Correct AppWorkPAth")
MFH:            2026Q2
(cherry picked from commit e75690e3147e1f973ad5936934721619ab319754)
DeltaFile
+4-1www/forgejo/Makefile
+1-0www/forgejo/pkg-plist
+5-12 files

FreeBSD/ports 6d5d169www/forgejo-lts Makefile pkg-plist

www/forgejo-lts: Fix non-BINDATA case

DATADIR is still needed for static assets in the non-BINDATA case.
Point StaticRootPath at it.  In the BINDATA case (which is the default),
the assets are linked into the binary and StaticRootPath is not used.

PR:             294619
Fixes:          7c546a3a09e0 ("www/forgejo-lts: Correct AppWorkPAth")
MFH:            2026Q2
DeltaFile
+4-1www/forgejo-lts/Makefile
+1-0www/forgejo-lts/pkg-plist
+5-12 files

FreeBSD/ports e75690ewww/forgejo Makefile pkg-plist

www/forgejo: Fix non-BINDATA case

DATADIR is still needed for static assets in the non-BINDATA case.
Point StaticRootPath at it.  In the BINDATA case (which is the default),
the assets are linked into the binary and StaticRootPath is not used.

PR:             294619
Fixes:          3686ad021c23 ("www/forgejo: Correct AppWorkPAth")
MFH:            2026Q2
DeltaFile
+4-1www/forgejo/Makefile
+1-0www/forgejo/pkg-plist
+5-12 files

FreeBSD/ports abadeccwww/marmite distinfo Makefile.crates

www/marmite: Update to 0.3.0

ChangeLog:
https://github.com/rochacbruno/marmite/releases/tag/0.3.0
DeltaFile
+549-311www/marmite/distinfo
+273-154www/marmite/Makefile.crates
+1-2www/marmite/Makefile
+823-4673 files

FreeBSD/src 56d81ebusr.bin/ident ident.1

ident: Fix typo in manual page

Fixes:          394f6b1b0a65 ("ident: Clean up")
(cherry picked from commit 3e6a26df1fb7e0508e1f81f826f8945b15a8bb48)
DeltaFile
+2-2usr.bin/ident/ident.1
+2-21 files

FreeBSD/src 3e6a26dusr.bin/ident ident.1

ident: Fix typo in manual page

Fixes:          394f6b1b0a65 ("ident: Clean up")
DeltaFile
+2-2usr.bin/ident/ident.1
+2-21 files

FreeBSD/ports 13a2adcdevel/R-cran-optparse distinfo Makefile

devel/R-cran-optparse: Update to 1.8.2

Numerous improvements and fixes
Changes: https://github.com/trevorld/r-optparse/releases

Reported by:    portscout
DeltaFile
+3-3devel/R-cran-optparse/distinfo
+1-1devel/R-cran-optparse/Makefile
+4-42 files

FreeBSD/ports 54c8c70sysutils/rundeck distinfo Makefile

sysutils/rundeck: Update 5.19.0 => 5.20.0

Release Notes:
https://docs.rundeck.com/docs/history/5_x/version-5.20.0.html

PR:             294774
Security:       CVE-2025-48924
Security:       CWE-770
Sponsored by:   UNIS Labs
MFH:            2026Q2

(cherry picked from commit 52e574ac86cb72168a2064aa231f0c2d8d5664a1)
DeltaFile
+3-3sysutils/rundeck/distinfo
+2-3sysutils/rundeck/Makefile
+5-62 files

FreeBSD/ports 52e574asysutils/rundeck distinfo Makefile

sysutils/rundeck: Update 5.19.0 => 5.20.0

Release Notes:
https://docs.rundeck.com/docs/history/5_x/version-5.20.0.html

PR:             294774
Security:       CVE-2025-48924
Security:       CWE-770
Sponsored by:   UNIS Labs
MFH:            2026Q2
DeltaFile
+3-3sysutils/rundeck/distinfo
+2-3sysutils/rundeck/Makefile
+5-62 files

FreeBSD/doc bdad001documentation/content/en/books/porters-handbook/versions _index.adoc

Renumber __FreeBSD_version value 1600016 to 1600017, insert correct 1600016 entry.
DeltaFile
+5-0documentation/content/en/books/porters-handbook/versions/_index.adoc
+5-01 files

FreeBSD/doc 8d40edewebsite/content/ru administration.adoc, website/content/ru/portmgr policies.adoc qa.adoc

website: ru - typos fixes in website pages

Reported by: maxim
Differential Revision: https://reviews.freebsd.org/D56636
DeltaFile
+14-14website/content/ru/portmgr/policies.adoc
+7-7website/content/ru/administration.adoc
+6-6website/content/ru/portmgr/qa.adoc
+5-5website/content/ru/status/report-2026-01-2026-03/sylve.adoc
+4-4website/content/ru/portmgr/charter.adoc
+4-4website/content/ru/releases/15.0R/relnotes.adoc
+40-4055 files not shown
+133-13361 files

FreeBSD/src 5845acbusr.bin/sockstat sockstat.1

sockstat: Unbreak SEE ALSO section

MFC after:      1 week
Fixes:          7b35b4d19630 ("sockstat: add libxo support")

(cherry picked from commit a6bd704850a615ae81076855a2083c7ab6481df1)
DeltaFile
+3-3usr.bin/sockstat/sockstat.1
+3-31 files

FreeBSD/ports f47b3e1games/coronapoker pkg-message Makefile, games/coronapoker/files patch-src_main_java_com_tonikelope_coronapoker_Panoptes.java

games/coronapoker: update 4.33 → 20.28
DeltaFile
+546-0games/coronapoker/files/patch-src_main_java_com_tonikelope_coronapoker_Panoptes.java
+54-0games/coronapoker/pkg-message
+11-7games/coronapoker/Makefile
+5-5games/coronapoker/distinfo
+4-0games/coronapoker/pkg-descr
+620-125 files

FreeBSD/ports b14a7begames/coronapoker Makefile pkg-message, games/coronapoker/files patch-src_main_java_com_tonikelope_coronapoker_Panoptes.java coronapoker.in

games/coronapoker: Remove

coronapoker downloads binary module that defeats its GPL license.
This download presents a potential security risk.

Reference: https://github.com/tonikelope/coronapoker/issues/7
DeltaFile
+0-546games/coronapoker/files/patch-src_main_java_com_tonikelope_coronapoker_Panoptes.java
+0-64games/coronapoker/Makefile
+0-54games/coronapoker/pkg-message
+0-5games/coronapoker/pkg-descr
+0-5games/coronapoker/distinfo
+0-5games/coronapoker/files/coronapoker.in
+0-6792 files not shown
+1-6808 files

FreeBSD/src c285081usr.bin/printenv printenv.c, usr.bin/printenv/tests printenv_test.sh

printenv: Clean up

* Error out if more than one argument is given.

* Check for stdio errors.

* Clean up the code.

* Clean up and expand the tests.

MFC after:      1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D56506

(cherry picked from commit abdf2a711cabebc107a04fd286e441e2030827f0)
DeltaFile
+52-18usr.bin/printenv/tests/printenv_test.sh
+30-22usr.bin/printenv/printenv.c
+82-402 files

FreeBSD/src 9671282usr.bin/ident ident.c ident.1, usr.bin/ident/tests ident_test.sh

ident: Clean up

* Use libcasper instead of reinventing it.

* Add long option support.

* Drop pointless use of temporary locales.

* Consistently check for stdio errors.

* Clean up the code.

* Clean up and expand the tests.

MFC after:      1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D56505

(cherry picked from commit 394f6b1b0a658755a9420906fb7a459c3d9501a5)
DeltaFile
+75-71usr.bin/ident/ident.c
+84-10usr.bin/ident/tests/ident_test.sh
+7-4usr.bin/ident/ident.1
+6-0usr.bin/ident/Makefile
+172-854 files

FreeBSD/src 3e08becshare/man/man7 tests.7

tests.7: Provide better examples

Previous authors appear to have prioritized brevity over clarity.  This
unfortunately resulted in a manual page that left its reader with the
false impression that Kyua is difficult to use.  Attempt to correct
this by providing more and simpler examples with longer explanations.

While here, correct outdated information about where Kyua stores its
logs and results.

MFC after:      1 week
Reviewed by:    ziaee, ngie
Differential Revision:  https://reviews.freebsd.org/D56475

(cherry picked from commit 3d00db6b8b73ef7f89654a2928d247d62d39ee29)
DeltaFile
+89-13share/man/man7/tests.7
+89-131 files

FreeBSD/src 47799d1. README.md

README: Update and harmonize

MFC after:      1 week
Reviewed by:    imp, markj, jhb
Differential Revision:  https://reviews.freebsd.org/D56499

(cherry picked from commit 480ba21efdc7df5d972083e64c88c39357877c0b)
DeltaFile
+12-11README.md
+12-111 files

FreeBSD/src 7f207b6stand/powerpc/boot1.chrp Makefile

Revert "Tentative fix for powerpc boot1.chrp linking problem."

This reverts base 4822a2cf990048c6eed7822fd34a1aeeb7c39cdf. The change
in base aa0bc7cca153f67f8becec8a8fb259ff5fd30fd0 already fixed the
original issue, which is that newer versions of lld complain "section
'.text' address (0x38000) is smaller than image base (0x10000000);
specify --image-base".

Reported by:    ivy
PR:             292067
MFC after:      1 month
DeltaFile
+0-6stand/powerpc/boot1.chrp/Makefile
+0-61 files

FreeBSD/src e6b2a40share/man/man7 build.7

build.7: Explain specifying multiple KERNCONFs

MFC after:              3 days
Reviewed by:            ivy, mhorne
Differential Revision:  https://reviews.freebsd.org/D56281

(cherry picked from commit b183dae4a9934ed9bb91763b5f9d9d4e4d4120a2)
DeltaFile
+14-5share/man/man7/build.7
+14-51 files

FreeBSD/src 73a0242share/man/man7 build.7

build.7: Improve make delete-old example

Be more explicit that deleting old files and libraries needs to be
really after you're rebooted a third time and you're really actually
sure your applications aren't using old libs, following irc discussion.

Also adjust an example slightly to fit on 80 character console.

MFC after:              3 days
Discussed with:         emaste, fuz, jhb
Differential Revision:  https://reviews.freebsd.org/D54079

(cherry picked from commit 1d69c8e4ac7da648f63a830b23b872582469ba37)
DeltaFile
+11-7share/man/man7/build.7
+11-71 files

FreeBSD/src 7bb347cshare/man/man7 build.7

build.7: Explain packaging a custom kernel

MFC after:              3 days (to 15 only)
Requested by:           vermaden
Discussed with:         emaste, ivy, Mark Millard <markmi_dsl-only.net>
Differential Revision:  https://reviews.freebsd.org/D56217

(cherry picked from commit 1bcd2e2f8311b737170e4bae8381dcb7de2c4413)
DeltaFile
+15-4share/man/man7/build.7
+15-41 files

FreeBSD/src a4a4dbeshare/man/man7 freebsd-base.7

freebsd-base.7: Add a caveat about dev branches

MFC after:              3 days (to 15)
Discussed with:         bapt, emaste, ivy
Differential Revision:  https://reviews.freebsd.org/D56389

(cherry picked from commit 886610c1003e0d0e270531f5a75b0f2c2b5eb2b8)
DeltaFile
+4-1share/man/man7/freebsd-base.7
+4-11 files

FreeBSD/doc 1e455b3documentation/content/en/articles/committers-guide _index.adoc

committers-guide: Remove VCS ID comment

Matching what we did in software-license guide.

Discussed with: emaste, lwhsu
DeltaFile
+0-1documentation/content/en/articles/committers-guide/_index.adoc
+0-11 files

FreeBSD/doc 97deb2bdocumentation/content/en/articles/committers-guide _index.adoc

committers-guide: Switch license to SPDX only

Matching what we did in style(9) and license-guide.

Reviewed by:            emaste, imp, mhorne
Differential Revision:  https://reviews.freebsd.org/D54444
DeltaFile
+1-22documentation/content/en/articles/committers-guide/_index.adoc
+1-221 files

FreeBSD/src 1633c00sys/dev/adb adb_bus.c, sys/dev/atkbdc psm.c

chore: replace {0, 0} with {DEV,KOBJ}METHOD_END

Both of the aforementioned macros have been present in FreeBSD
for well over a decade: 2009 for `KOBJMETHOD_END`; 2011 for
`DEVMETHOD_END`.

Adapt all hardcoded references of `{0, 0}` with `DEVMETHOD_END`
and `KOBJMETHOD_END` as appropriate. This helps ensure that
future adaptations to drivers following patterns documented
in driver(9) can be made more easily/without issue.

MFC after:      1 week
Differential Revision:   https://reviews.freebsd.org/D55414

MFC notes:
        All conflicts were dropped as they didn't apply to code in branch.

Conflicts:
        sys/dev/flash/w25n.c

    [7 lines not shown]
DeltaFile
+6-6sys/dev/adb/adb_bus.c
+6-6sys/dev/sound/pci/vibes.c
+2-2sys/dev/atkbdc/psm.c
+2-2sys/dev/axgbe/if_axgbe.c
+2-2sys/dev/cxgbe/t4_main.c
+2-2sys/dev/dpaa/bman_fdt.c
+20-20174 files not shown
+201-201180 files

FreeBSD/src 1b5bee9sys/dev/adb adb_bus.c, sys/dev/atkbdc psm.c

chore: replace {0, 0} with {DEV,KOBJ}METHOD_END

Both of the aforementioned macros have been present in FreeBSD
for well over a decade: 2009 for `KOBJMETHOD_END`; 2011 for
`DEVMETHOD_END`.

Adapt all hardcoded references of `{0, 0}` with `DEVMETHOD_END`
and `KOBJMETHOD_END` as appropriate. This helps ensure that
future adaptations to drivers following patterns documented
in driver(9) can be made more easily/without issue.

MFC after:      1 week
Differential Revision:   https://reviews.freebsd.org/D55414

MFC notes:
- All changes to nvme/nvd were dropped as they didn't apply.
- Change to ufshci_pci.c was adjusted to match code in branch.

Conflicts:

    [5 lines not shown]
DeltaFile
+6-6sys/dev/adb/adb_bus.c
+6-6sys/dev/sound/pci/vibes.c
+2-2sys/dev/usb/input/uep.c
+2-2sys/dev/atkbdc/psm.c
+2-2sys/dev/axgbe/if_axgbe.c
+2-2sys/dev/cxgbe/t4_main.c
+20-20178 files not shown
+205-205184 files

FreeBSD/src ca93c98sys/dev/asmc asmc.c

use ASMC_FAN_FUNCS2 to avoid trying to read non-existent keys

Signed-off-by: tslight <tslight at pm.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2051
(cherry picked from commit cecd12ac3b4d98bd52dc0e802a4a38bc72f50e2c)
DeltaFile
+1-1sys/dev/asmc/asmc.c
+1-11 files

FreeBSD/src a2c7643sys/dev/asmc asmc.c

use ASMC_FAN_FUNCS2 to avoid trying to read non-existent keys

Signed-off-by: tslight <tslight at pm.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2051
(cherry picked from commit cecd12ac3b4d98bd52dc0e802a4a38bc72f50e2c)
DeltaFile
+1-1sys/dev/asmc/asmc.c
+1-11 files