Commit 1574d330 authored by Steve Wills's avatar Steve Wills

Merge branch 'trunk' of ssh://gitlab.mouf.net:2223/swills/freebsd-ports into trunk

parents ee3af7d4 cce62b14

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -37,6 +37,7 @@ alex = Alexander Langer <[email protected]>
alexbl = Alexander Botero-Lowry <[email protected]>
alexey = Alexey Degtyarev <[email protected]>
alfred = Alfred Perlstein <[email protected]>
alfredo = Alfredo Dal'Ava Junior <[email protected]>
allanjude = Allan Jude <[email protected]>
alm = Andrew Moore <[email protected]>
alonso = Alonso Schaich <[email protected]>
......@@ -402,6 +403,7 @@ josef = Josef El-Rayes <[email protected]>
jpaetzel = Josh Paetzel <[email protected]>
jraynard = James Raynard <[email protected]>
jrm = Joseph Mingrone <[email protected]>
jrtc27 = James Clarke <[email protected]>
jsa = Joseph S. Atkinson <[email protected]>
jseger = Justin M. Seger <[email protected]>
jsm = Jesper Schmitz Mouridsen <[email protected]>
......@@ -450,6 +452,7 @@ landonf = Landon J. Fuller <[email protected]>
lars = Lars Fredriksen <[email protected]>
laszlof = Frank J. Laszlo <[email protected]>
lawrance = Sam Lawrance <[email protected]>
lbartoletti = Loïc Bartoletti <[email protected]>
lbr = Lars Balker Rasmussen <[email protected]>
le = Lukas Ertl <[email protected]>
leeym = Yen-Ming Lee <[email protected]>
......@@ -523,6 +526,7 @@ mheinen = Martin Heinen <[email protected]>
mhorne = Mitchell Horne <[email protected]>
mi = Mikhail Teterin <[email protected]>
mich = Michael Landin <[email protected]>
mikael = Mikael Urankar <[email protected]>
mike = Mike Barcroft <[email protected]>
mikeh = Mike Heffner <[email protected]>
milki = Jonathan Chu <[email protected]>
......@@ -687,6 +691,7 @@ sada = SADA Kenji <[email protected]>
sah = Sam Hopkins <[email protected]>
sahil = Sahil Tandon <[email protected]>
sam = Sam Leffler <[email protected]>
samm = Oleksii Samorukov <[email protected]>
sanpei = MIHIRA Sanpei Yoshiro <[email protected]>
sat = Andrew Pantyukhin <[email protected]>
sbruno = Sean Bruno <[email protected]>
......
......@@ -10,6 +10,18 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20200115:
AUTHOR: bapt@FreeBSD.org
${PREFIX}/share/man is now a valid location for manpages ${PREFIX}/man being
considered as deprecated.
20191009:
AUTHOR: bapt@FreeBSD.org
The ipv6 virtual category is gone, it does not make sense anymore in 2019
where the norm in applications is to have support both ipv4 and ipv6.
20191001:
AUTHOR: bapt@FreeBSD.org
......
......@@ -4,7 +4,7 @@
The compilation of software known as the FreeBSD Ports Collection is
distributed under the following terms:
Copyright (C) 1994-2019 The FreeBSD Project.
Copyright (C) 1994-2020 The FreeBSD Project.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
......
......@@ -7,7 +7,7 @@ operator:*:5:amanda
mail:*:6:postfix,clamav
ftp:*:14:
smmsp:*:25:
video:*:44:
video:*:44:lightdm
bind:*:53:
rdfdb:*:55:
spamd:*:58:
......@@ -185,7 +185,7 @@ tnc:*:241:
prosody:*:242:
ot-recorder:*:243:
mastodon:*:244:
# free: 245
routinator:*:245:
# free: 246
fcron:*:247:
# free: 248
......@@ -194,7 +194,7 @@ sems:*:250:
# free: 251
# free: 252
_adsuck:*:253:
# free: 254
imds:*:254:
_i2pd:*:255:
_tor:*:256:
_smtpd:*:257:
......@@ -675,7 +675,7 @@ bopm:*:717:
# free: 732
# free: 733
# free: 734
# free: 735
c-lightning:*:735:
# free: 736
# free: 737
# free: 738
......@@ -722,7 +722,7 @@ litecoin:*:778:
bitcoin:*:779:
zetacoin:*:780:
monero:*:781:
# free: 782
zeek:*:782:
# free: 783
# free: 784
# free: 785
......@@ -812,8 +812,8 @@ ebusd:*:854:
# free: 869
# free: 870
# free: 871
# free: 872
# free: 873
bitmark:*:872:
bitmark-recorder:*:873:
# free: 874
# free: 875
# free: 876
......
......@@ -40,11 +40,11 @@ atari800/* emulators/atari800 xf25 contains copyright ROMs and cannot be distri
baudline_* audio/baudline No redistribution allowed
BCWipe-* security/bcwipe Non-commercial distribution and use only
bicom* archivers/bicom Contact author personally regarding commercial use
boodler-* audio/boodler Not for commercial use
Browser*.tar.gz net/ldapbrowser No reply from author regarding redistribution licensing
bzip-* archivers/bzip Some algorithms used may infringe certain US patents. Opinions differ. Commercial use could render you liable to unfriendly legal action
citrix_ica-* net/citrix_ica License prohibits redistribution
arcconf-v* sysutils/arcconf May not be redistributed in binary form
cloudflare-cloudflared* net/cloudflared Not sure if we are allowed to redistribute it.
clustalw-* biology/clustalw No commercial use
consed_linux.tar.gz biology/consed Redistribution is not permitted in any form. You must request access permission via e-mail to get the tarball. Free for academic use.
cos-* java/cos Special conditions apply for commercial use
......@@ -99,7 +99,6 @@ groupoffice-com-* www/groupoffice Free for personal use only
HeroesOfMightAndMagic-* games/HeroesOfMightAndMagic Software is commercial
homard-* french/homard The free downloading of HOMARD software is only allowed for coupling with Code_Aster. For any other use, a license agreement is requested. Please contact HOMARD project: <[email protected]>.
hplip-*-plugin.run print/hplip-plugin License agreement is required
httprint_freebsd_*.zip security/httprint No cost for personal, education and non-commercial use
HyperSpec-* devel/clisp-hyperspec Commercial redistribution prohibited
HyperSpec-*.tar.gz devel/clisp-hyperspec Commercial redistribution prohibited
ICON-AquaFusion.* x11-themes/gnome-icons-aqua-fusion Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights.
......@@ -119,12 +118,9 @@ jdk-8*-apidocs.zip java/jdk8-doc This documentation is under license and export
jdk-8*-i586.tar.gz java/linux-oracle-jdk18 Redistribution of repackaged binaries not permitted
jfbuild-* games/jfsw Must be distributed only through the Internet and free of charge
jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted
jpgraph-2.* graphics/jpgraph2 The free version cannot be used in a commercial context
jre-8*-i586.tar.gz java/linux-oracle-jre18 License does not allow distribution with fee
jre-9*-x64_bin.tar.gz java/linux-oracle-jre9 Redistribution of repackaged binaries not permitted
jta-*.zip java/jta See the license
komodo-* editors/komodo-edit Distribution not permitted
kye-data_nuke_levels.20121101.tar.gz games/kye kye-data_nuke_levels is charityware
kzip-* archivers/kzip License does not allow redistribution
l0phtcrack/* security/l0phtcrack Parts are under GPL, so binaries should not be distributed. Contains crypto code from OpenSSL
ladder.tar games/ladder Possible copyright problems
......@@ -162,7 +158,6 @@ OptimFROG* audio/optimfrog No commercial use
oracle/* databases/jdbc-oracle11g This software is under license and export controls
oracle/sqldeveloper* databases/sqldeveloper This software is under license and export controls
oracle/instantclient-basic-linux* databases/linux-oracle-instantclient-basic Packaging prohibited by Oracle license
oracle/instantclient-sqlplus-linux* databases/linux-oracle-instantclient-sqlplus Packaging prohibited by Oracle license
pcsv*fb.tar.gz lang/petite-chez User must accept license terms before installation
PDFlib-Lite-*.tar.gz print/pdflib Many odd restrictions on usage and distribution
ppsmall-* archivers/ppunpack No commercial redistribution
......@@ -224,9 +219,7 @@ xinvaders-* games/xinvaders Do not sell for profit
xmdiary-* deskutils/xmdiary Do not sell for profit
xrisk-* games/xrisk Possible copyright/trademark violation
xtr1.50e* japanese/xtr Need to obtain permission for commercial redistribution
xtris-*.tar.gz games/xtris Possible trademark infringement
xzx-pro-*.tar.gz emulators/xzx Redistribution forbidden by license
yasou-fpw* japanese/yasou-fpw No commercial use, and no redistribution allowed with fee except media and/or shipping cost
yEd* graphics/yed Downloading requires acceptance of license agreement
zh-moettf/* chinese/moettf Contact Taiwan's Ministry of Education for commercial use
UrbanTerror*.zip games/urbanterror-data The mod files may not be sold or distributed on physical media unless with permission from id Software.
......@@ -243,3 +236,4 @@ vmd-* science/vmd No commercial use: commercial use requires a commercial lic
msms-* science/msms No commercial use, only for use by individuals in scientific research
unifi-devel-* net-mgmt/unifi-devel License restrictions, see https://www.ubnt.com/eula/
netio* benchmarks/netio No commercial use: commercial use requires a commercial license
zerotier-* net/zerotier No SaaS or Govt usage: https://github.com/zerotier/ZeroTierOne/blob/master/LICENSE.txt
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -40,7 +40,6 @@ SUBDIR += net-im
SUBDIR += net-mgmt
SUBDIR += net-p2p
SUBDIR += news
SUBDIR += palm
SUBDIR += polish
SUBDIR += ports-mgmt
SUBDIR += portuguese
......
......@@ -6,6 +6,9 @@ BEGIN {
gl_tuple_len = 0
crates_len = 0
package_name = "<unknown>"
crate_name = "<unknown>"
crate_version = "<unknown>"
crate_source = "<unknown>"
gitlab_sites["https://gitlab.com"] = 1
gitlab_sites["https://gitlab.freedesktop.org"] = 1
......@@ -13,19 +16,37 @@ BEGIN {
gitlab_sites["https://gitlab.redox-os.org"] = 1
}
/^"checksum .* .* \(registry\+.*\)" = ".*"/ {
# $2: crate
# $3: version
# $4: url
# $6: checksum
crates[crates_len++] = sprintf("%s-%s", $2, $3)
}
/^name = ".*"/ {
crate_name = $3
gsub(/"/, "", crate_name)
package_name = $3
gsub("[^a-zA-Z_]", "", package_name)
}
/^version = ".*"/ {
crate_version = $3
gsub(/"/, "", crate_version)
}
/^source = ".*"/ {
crate_source = $3
gsub(/"/, "", crate_source)
}
/^\[\[package\]\]$/ {
add_crate()
}
function add_crate() {
if (crate_source == "registry+https://github.com/rust-lang/crates.io-index") {
crates[crates_len++] = sprintf("%s-%s", crate_name, crate_version)
}
crate_name = "<unknown>"
crate_version = "<unknown>"
crate_source = "<unknown>"
}
function split_url(s) {
# scheme:[//[user[:password]@]host[:port]][/path][?query][#fragment]
split(s, url_scheme, "://")
......@@ -112,6 +133,8 @@ function print_array(start, arr, arrlen) {
}
END {
add_crate()
if (gh_tuple_len > 0 && ENVIRON["USE_GITHUB"] == "") {
printf "USE_GITHUB=\tnodefault\n"
}
......
......@@ -98,13 +98,15 @@ setup_plist_seds() {
\#${LOCALBASE}/lib/debug#d;"
sed_dirs_gen="s,^,@dir ,; \
${sed_portdocsexamples} \
/^@dir share\/licenses/d;"