Skip to content

Commit

Permalink
Framework: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Sep 7, 2018
1 parent 1791cd6 commit af05838
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 4 deletions.
1 change: 1 addition & 0 deletions LEGAL
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,4 @@ sas2ircu-* sysutils/sas2ircu May not be redistributed. Must accept license to d
snes9x-* emulators/snes9x-gtk Commercial users must seek permission from copyright holders.
rainloop-1.*.zip mail/rainloop Redistribution in any form is prohibited
lha-114i.tar.gz archivers/lha Binary only redistribution is prohibited. Non-network redistribution such as CDROM requires prior notification to author. Commercial use whose main purpose is to provide the functions of this program is prohibited.
atom-*.tgz science/atom Redistribution in any form is prohibited
3 changes: 3 additions & 0 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -10514,3 +10514,6 @@ devel/renpy6|games/renpy6|2018-09-03|Moved to better category
devel/rlvm|games/rlvm|2018-09-03|Moved to better category
dns/openmdns|net/openmdns|2018-09-03|Moved to better category
www/hs-activehs||2018-09-03|Has expired: Doesn't build with recent dependencies
science/mpqc-mpich|science/mpqc|2018-09-03|MPI option is enabled by default in mpqc, no need for mpqc-mpich
misc/timediff|misc/tzdiff|2018-09-04|Project was renamed
www/rubygem-hamlit26||2018-09-06|Obsolete by gitlab-ce 11.2.x update, please use www/rubygem-hamlit instead
9 changes: 8 additions & 1 deletion Mk/Uses/cargo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,15 @@ do-test:
# Helper targets for port maintainers
#

# cargo-crates will output the crates list from Cargo.lock.
# cargo-crates will output the crates list from Cargo.lock. If there
# is no Cargo.lock for some reason, try and generate it first.
cargo-crates: extract
@if [ ! -r "${CARGO_CARGOLOCK}" ]; then \
${ECHO_MSG} "===> ${CARGO_CARGOLOCK} not found. Trying to generate it..."; \
${CARGO_CARGO_RUN} generate-lockfile \
--manifest-path ${CARGO_CARGOTOML} \
--verbose; \
fi
@${SETENV} USE_GITHUB=${USE_GITHUB} \
${AWK} -f ${SCRIPTSDIR}/cargo-crates.awk ${CARGO_CARGOLOCK}

Expand Down
4 changes: 2 additions & 2 deletions Mk/Uses/kde.mk
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ KDE_FRAMEWORKS_VERSION?= 5.49.0
KDE_FRAMEWORKS_BRANCH?= stable

# Current KDE applications.
KDE_APPLICATIONS_VERSION?= 18.08.0
KDE_APPLICATIONS_SHLIB_VER?= 5.9.0
KDE_APPLICATIONS_VERSION?= 18.08.1
KDE_APPLICATIONS_SHLIB_VER?= 5.9.1
KDE_APPLICATIONS_BRANCH?= stable
# Upstream moves old software to Attic/. Specify the newest applications release there.
# Only the major version is used for the comparison.
Expand Down
2 changes: 1 addition & 1 deletion Mk/bsd.default-versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R}
# Possible values: 9.3, 9.4, 9.5, 9.6, 10
PGSQL_DEFAULT?= 9.5
# Possible values: 5.6, 7.0, 7.1, 7.2
PHP_DEFAULT?= 5.6
PHP_DEFAULT?= 7.1
# Possible values: 2.7, 3.4, 3.5, 3.6, 3.7
PYTHON_DEFAULT?= 2.7
# Possible values: 2.7
Expand Down
14 changes: 14 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ 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.

20180905:
AFFECTS: users of lang/php56
AUTHOR: [email protected]

The default version of PHP has been switched from 5.6 to 7.1.

If you use binary packages you should make a list of php packages
before running 'pkg upgrade':

# pkg info php5\* > ~/installed-php-ports-list

After the upgrade, check with such list if all your php extensions
are still installed, and reinstall them if needed.

20180901:
AFFECTS: net/samba48
AUTHOR: [email protected]
Expand Down

0 comments on commit af05838

Please sign in to comment.