Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 May 2021 11:49:10 GMT
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: adb93122cbf7 - main - Deorbit RESTRICTED && NO_CDROM, part one.
Message-ID:  <202105061149.146BnANa013685@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=adb93122cbf753a26a0497479dbb88cf415de29b

commit adb93122cbf753a26a0497479dbb88cf415de29b
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2021-04-27 12:02:27 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2021-05-06 11:47:41 +0000

    Deorbit RESTRICTED && NO_CDROM, part one.
    
    For ports that already use the licenses framwork, merge the content of
    RESTRICTED/NO_CDROM/LEGAL* entries into LICENSEs.
    
    Approved by:    rene
    Differential Revision:  https://reviews.freebsd.org/D30010
---
 archivers/rar/Makefile                      |  2 +-
 audio/libaacplus/Makefile                   |  4 +---
 audio/libamrnb/Makefile                     |  6 ++----
 audio/libamrwb/Makefile                     |  6 ++----
 audio/logitechmediaserver/Makefile          |  2 +-
 audio/optimfrog/Makefile                    |  2 +-
 benchmarks/netio/Makefile                   |  7 ++++---
 benchmarks/ramspeed/Makefile                |  2 +-
 biology/fasta3/Makefile                     |  5 ++---
 biology/linux-foldingathome/Makefile        |  3 +--
 biology/molden/Makefile                     |  3 +--
 biology/ucsc-userapps/Makefile              |  2 --
 cad/linux-eagle5/Makefile                   |  7 +++----
 comms/mbelib/Makefile                       | 11 ++++++----
 devel/astah-community/Makefile              |  4 +---
 devel/raknet/Makefile                       |  2 --
 devel/simian/Makefile                       |  3 +--
 emulators/atari800/Makefile                 |  8 +++++---
 emulators/fuse-roms/Makefile                |  3 +--
 emulators/snes9x-gtk/Makefile               |  2 +-
 emulators/stonx/Makefile                    |  8 +++++---
 emulators/vice/Makefile                     |  7 +++++--
 games/doom/Makefile                         |  3 +--
 games/jfsw/Makefile                         |  3 +--
 games/libretro-fbalpha/Makefile             |  3 +--
 games/libretro-genesis_plus_gx/Makefile     |  3 +--
 games/libretro-paralleln64/Makefile         |  3 +--
 games/libretro-snes9x/Makefile              |  3 +--
 games/libretro-snes9x2005/Makefile          |  3 +--
 games/libretro-snes9x2010/Makefile          |  3 +--
 games/macopix/Makefile                      | 31 +++++++++++++++--------------
 games/nwndata/Makefile                      |  4 +++-
 games/xbat/Makefile                         |  8 +++++---
 games/xfrisk/Makefile                       | 10 ++++++----
 graphics/yed/Makefile                       |  3 +--
 java/dbvis/Makefile                         |  2 +-
 lang/cbmbasic/Makefile                      |  6 +++---
 lang/icc/Makefile                           |  7 ++++---
 mail/rainloop/Makefile                      |  5 +----
 math/emc2/Makefile                          |  2 +-
 math/giacxcas/Makefile                      | 10 ++++++----
 misc/susv2/Makefile                         |  3 +--
 misc/susv3/Makefile                         |  3 +--
 misc/susv4/Makefile                         |  3 +--
 multimedia/libdvdcss/Makefile               | 10 ++++++----
 multimedia/makemkv/Makefile                 |  9 +++------
 multimedia/vdr-plugin-markad/Makefile       | 10 ++++++----
 net-mgmt/unifi-devel/Makefile               |  4 +---
 net/cloudflared/Makefile                    |  2 +-
 net/liveMedia/Makefile                      |  8 +++++---
 net/radiator/Makefile                       |  3 +--
 net/zerotier/Makefile                       |  3 +--
 print/epson-inkjet-printer-201401w/Makefile |  3 +--
 print/epson-inkjet-printer-201601w/Makefile |  3 +--
 print/hplip-plugin/Makefile                 |  3 +--
 security/vpnc/Makefile                      | 11 ++++++----
 sysutils/sas2ircu/Makefile                  |  6 ++----
 www/groupoffice/Makefile                    |  8 +++++---
 www/thundercache/Makefile                   |  2 --
 x11-fonts/webfonts/Makefile                 |  2 +-
 x11-themes/gnome-icons-lila/Makefile        | 11 ++++++----
 61 files changed, 153 insertions(+), 165 deletions(-)

diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 7dd1f7393933..8060b3a7962d 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -13,10 +13,10 @@ COMMENT=	File archiver (binary port)
 LICENSE=	RAR
 LICENSE_NAME=	RAR license
 LICENSE_FILE=	${WRKSRC}/license.txt
+# Only unmodified original package can be distributed
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
 ONLY_FOR_ARCHS=	amd64 i386
-RESTRICTED=	only unmodified original package can be distributed
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/rar
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index aa87eabadce3..a7792948847b 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -15,12 +15,10 @@ COMMENT=	HE-AAC+ Codec as Shared Library
 
 LICENSE=	libaacplus
 LICENSE_NAME=	3GPP
-LICENSE_TEXT=	${RESTRICTED}
+LICENSE_TEXT=	unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 LICENSE_DISTFILES_3GPP=	${SRC26410}
 
-RESTRICTED=	unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies
-
 CONFLICTS=	aacplusenc-0*
 
 USE_CSTD=	gnu89
diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index 7c32c72e9989..05929e6430ad 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -16,15 +16,13 @@ MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP floating-point Adaptive Multi-Rate (AMR) Speech Codec
 
 LICENSE=	BSD3CLAUSE 3GPP
-LICENSE_COMB=	dual
+LICENSE_COMB=	multi
 LICENSE_NAME_3GPP=	3GPP
-LICENSE_TEXT_3GPP=	${RESTRICTED}
+LICENSE_TEXT_3GPP=	unclear legal status, probably need licenses from 3GPP and more
 LICENSE_PERMS_3GPP=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_3GPP=	${SRC26104}
 
-RESTRICTED=	unclear legal status, probably need licenses from 3GPP and more
-
 USES=		gmake tar:bzip2 libtool
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 GNU_CONFIGURE=	yes
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index 76abdc8ecdd9..dee7e7e37945 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -15,15 +15,13 @@ MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec
 
 LICENSE=	BSD3CLAUSE 3GPP
-LICENSE_COMB=	dual
+LICENSE_COMB=	multi
 LICENSE_NAME_3GPP=	3GPP
-LICENSE_TEXT_3GPP=	${RESTRICTED}
+LICENSE_TEXT_3GPP=	unclear legal status, probably need licenses from 3GPP and more
 LICENSE_PERMS_3GPP=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_3GPP=	${SRC26204}
 
-RESTRICTED=	unclear legal status, probably need licenses from 3GPP and more
-
 USES=		gmake tar:bzip2 libtool
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 GNU_CONFIGURE=	yes
diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile
index 2f4121b74dd3..e99d0b674f84 100644
--- a/audio/logitechmediaserver/Makefile
+++ b/audio/logitechmediaserver/Makefile
@@ -8,6 +8,7 @@ COMMENT=	Audio streaming server that powers Squeezebox players from Logitech
 LICENSE=	SDL
 LICENSE_NAME=	Slim Devices License
 LICENSE_FILE=	${WRKSRC}/License.txt
+# Contains non-redistributable firmware, documentation, and images
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 ONLY_FOR_ARCHS=	amd64 i386
@@ -47,7 +48,6 @@ LAME_RUN_DEPENDS=	lame:audio/lame
 SOX_RUN_DEPENDS=	sox:audio/sox
 TEST_VARS_OFF=		CONTRIB_FLAGS=-t
 
-RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 USERS=		${SLIMUSER}
 GROUPS=		${SLIMGROUP}
 EXTRA_PATCHES=	${FILESDIR}/vendorpatch-CPAN_buildme.sh
diff --git a/audio/optimfrog/Makefile b/audio/optimfrog/Makefile
index 06edee81fa95..8e58b58c568c 100644
--- a/audio/optimfrog/Makefile
+++ b/audio/optimfrog/Makefile
@@ -10,6 +10,7 @@ COMMENT?=	Best-ratio lossless audio codec
 LICENSE=	OptimFROG
 LICENSE_NAME=	OptimFROG - License
 LICENSE_FILE=	${WRKSRC}/license.html	#only available as html
+# No fees may be collected for redistribution
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
@@ -20,7 +21,6 @@ ONLY_FOR_ARCHS?=	amd64 i386
 
 USES=		tar:txz
 
-NO_CDROM=	No fees may be collected for redistribution
 NO_BUILD=	yes
 USE_LDCONFIG=	yes
 
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index 17cb86a81eb1..c51492108aba 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -12,9 +12,10 @@ COMMENT=	Network benchmark
 
 USES=		dos2unix gmake zip
 
-LICENSE_PERMS=no-pkg-mirror
-RESTRICTED=	Usage permitted for non-commercial purposes only
-NO_CDROM=	Sale for profit is not permitted
+LICENSE=	UNKNOWN
+LICENSE_NAME=	unknown
+LICENSE_TEXT=	Usage permitted for non-commercial purposes only. Sale for profit is not permitted.
+LICENSE_PERMS=	auto-accept
 
 DOS2UNIX_FILES=	Makefile netio.c
 NO_WRKSUBDIR=	yes
diff --git a/benchmarks/ramspeed/Makefile b/benchmarks/ramspeed/Makefile
index f35152e2f7d5..4739ac1128ab 100644
--- a/benchmarks/ramspeed/Makefile
+++ b/benchmarks/ramspeed/Makefile
@@ -7,7 +7,7 @@ DISTNAME=	ramsmp-${PORTVERSION}
 MAINTAINER=	mkamm@gmx.net
 COMMENT=	Cache and memory benchmarking tool
 
-NO_CDROM=	do not sell for money
+# do not sell for money
 LICENSE=	ALASIR
 LICENSE_NAME=	Alasir Licence
 LICENSE_FILE=	${WRKSRC}/LICENCE
diff --git a/biology/fasta3/Makefile b/biology/fasta3/Makefile
index 79f4c21e0c43..9c359e248184 100644
--- a/biology/fasta3/Makefile
+++ b/biology/fasta3/Makefile
@@ -13,12 +13,11 @@ COMMENT=	Collection of programs for searching DNA and protein databases
 LICENSE=	Fasta
 LICENSE_NAME=	Fasta program copyright W. Pearson and U.Virginia
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+# May not be sold or incorporated into a commercial product
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_CDROM=	May not be sold or incorporated into a commercial product
-
 WRKSRC=		${WRKDIR}/${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/biology/linux-foldingathome/Makefile b/biology/linux-foldingathome/Makefile
index 75d3956dc8fa..09a06fabcccb 100644
--- a/biology/linux-foldingathome/Makefile
+++ b/biology/linux-foldingathome/Makefile
@@ -11,14 +11,13 @@ EXTRACT_SUFX=	.x86_64.rpm
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Folding@home Client
 
+# Distribution without permission is prohibited
 LICENSE=	FAHSL
 LICENSE_NAME=	Folding@home Software License
 LICENSE_FILE=	${WRKSRC}/usr/share/doc/fahclient/copyright
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell \
 		auto-accept
 
-LEGAL_TEXT=	Distribution without permission is prohibited
-
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	The i386 client has not been ported
 
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index c1f79a1a449c..089279889f16 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Display molecular orbitals and electron densities in 2D and 3D
 LICENSE=	Molden
 LICENSE_NAME=	Molden
 LICENSE_FILE=	${WRKSRC}/CopyRight
+# free for academic, non profit usage; do not re-distribute source and executable.
 LICENSE_PERMS=	auto-accept
 
-RESTRICTED=	free for academic, non profit usage; do not re-distribute source and executable.
-
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 
 USES=		fortran gl gmake xorg
diff --git a/biology/ucsc-userapps/Makefile b/biology/ucsc-userapps/Makefile
index 7a3244c70fcb..00c5fcf8e33a 100644
--- a/biology/ucsc-userapps/Makefile
+++ b/biology/ucsc-userapps/Makefile
@@ -31,8 +31,6 @@ RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake localbase:ldflags shebangfix perl5 python:3.6+ ssl tar:tgz
 
-RESTRICTED=	Redistribution is limited, see license
-
 SHEBANG_FILES=	kent/src/checkUmask.sh \
 		kent/src/utils/bigHeat \
 		kent/src/utils/chromToUcsc/chromToUcsc \
diff --git a/cad/linux-eagle5/Makefile b/cad/linux-eagle5/Makefile
index 947e3fb3f870..4edf54740b9b 100644
--- a/cad/linux-eagle5/Makefile
+++ b/cad/linux-eagle5/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Easy to use, yet powerful tool for designing printed circuit boards
 LICENSE=	Eagle
 LICENSE_NAME=	Eagle End User License Agreement
 LICENSE_FILE=	${WRKSRC}/doc/license_en.txt
+# Usage permitted for non-commercial purposes only
+# Sale for profit is not permitted
+# Copying the software is only allowed for backup by an individual licensee
 LICENSE_PERMS=	auto-accept
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -25,10 +28,6 @@ EXTRACT_CMD=	${SED}
 EXTRACT_BEFORE_ARGS=	-e '1,/^__DATA__$$/d'
 EXTRACT_AFTER_ARGS=	| ${BZCAT} -c 2>/dev/null | ${TAR} -xf -
 
-RESTRICTED=	Usage permitted for non-commercial purposes only
-NO_CDROM=	Sale for profit is not permitted
-NO_PACKAGE=	Copying the software is only allowed for backup by an individual licensee
-
 EAGLEBASEVERSION=	5.12
 EAGLEBUGFIX=	0
 EAGLEVERSION=	${EAGLEBASEVERSION}.${EAGLEBUGFIX}
diff --git a/comms/mbelib/Makefile b/comms/mbelib/Makefile
index 9259b3ee13d2..2a5fc2e8aa03 100644
--- a/comms/mbelib/Makefile
+++ b/comms/mbelib/Makefile
@@ -6,8 +6,13 @@ CATEGORIES=	comms hamradio
 MAINTAINER=	takefu@airport.fm
 COMMENT=	P25 Phase 1 and ProVoice vocoder
 
-LICENSE=	ISCL
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+LICENSE=	ISCL UNKNOWN
+LICENSE_COMB=	multi
+LICENSE_NAME_UNKNOWN=	Unknwon licene
+LICENSE_FILE_ISCL=	${WRKSRC}/COPYRIGHT
+LICENSE_FILE_UNKNOWN=	${WRKSRC}/README.md
+# Provided for educational purposes only
+LICENSE_PERMS_UNKNOWN=	auto-accept
 
 USES=		cmake
 USE_GITHUB=	yes
@@ -16,8 +21,6 @@ USE_LDCONFIG=	yes
 
 CMAKE_ON=	DISABLE_TEST
 
-RESTRICTED=	Provided for educational purposes only
-
 PLIST_FILES=	include/mbelib.h lib/libmbe.a lib/libmbe.so.1.0 \
 		lib/libmbe.so.1 lib/libmbe.so
 
diff --git a/devel/astah-community/Makefile b/devel/astah-community/Makefile
index d1c63f595551..df9e8b0e1439 100644
--- a/devel/astah-community/Makefile
+++ b/devel/astah-community/Makefile
@@ -13,11 +13,9 @@ COMMENT=	Java/UML Object-Oriented Design Tool
 
 LICENSE=	EULA
 LICENSE_NAME=	End User License Agreement
-LICENSE_TEXT=	${RESTRICTED}
+LICENSE_TEXT=	License restrictions -- See http://astah.net/faq/community/enduser-license-agreement
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept
 
-RESTRICTED=	License restrictions -- See http://astah.net/faq/community/enduser-license-agreement
-
 USES=		zip
 USE_JAVA=	yes
 REVISION=	b4c6e9
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index 92cda60a5b6d..f69fe6cd21b1 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -25,8 +25,6 @@ LICENSE_PERMS_SpecialAuth=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 NOT_FOR_ARCHS=		aarch64 mips mips64
 NOT_FOR_ARCHS_REASON=	fails to compile: error: Add your platform to the list
 
-LEGAL_TEXT=	Special authorization granted to distribute version 3.x under GPLv3
-
 NO_WRKSUBDIR=	yes
 
 USES=		dos2unix cmake:insource zip
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index 72e469603156..286ee4934520 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -11,13 +11,12 @@ COMMENT=	Similarity analyser for source and other text files
 LICENSE=	SIMIAN
 LICENSE_NAME=	SIMIAN SOFTWARE LICENSE
 LICENSE_FILE=	${WRKSRC}/license.pdf
+# Have to agree to license before download
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-RESTRICTED=	Have to agree to license before download
-
 SUB_FILES=	simian
 SUB_LIST+=	VERSION=${PORTVERSION}
 PLIST_SUB+=	VERSION=${PORTVERSION}
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 3a32b4582e83..bfc5dd669d11 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -14,13 +14,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Atari 8-bit computer emulator
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 ROM
+LICENSE_COMB=	multi
+LICENSE_NAME_ROM=	Copyrighted ROMs
+LICENSE_TEXT_ROM=	xf25 contains copyright ROMs and cannot be distributed.
+LICENSE_PERMS_ROM=	auto-accept
 
 BUILD_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 LIB_DEPENDS=	libpng.so:graphics/png
 
-RESTRICTED=	xf25 contains copyright ROMs and cannot be distributed.
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USES=		gmake
diff --git a/emulators/fuse-roms/Makefile b/emulators/fuse-roms/Makefile
index f566f679b1fd..9fb348b13ab9 100644
--- a/emulators/fuse-roms/Makefile
+++ b/emulators/fuse-roms/Makefile
@@ -14,6 +14,7 @@ MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Spectrum ROM files, for use with the Fuse emulator
 
 LICENSE=	NONE
+# No explicit permission to redistribute
 
 FCREV=		14
 FCVER=		33
@@ -26,8 +27,6 @@ ROMS=		128p-0.rom 128p-1.rom 256s-0.rom 256s-1.rom 256s-2.rom \
 		256s-3.rom gluck.rom if1-1.rom if1-2.rom opus.rom trdos.rom
 PLIST_FILES=	${ROMS:S|^|${DATADIR_REL}/|}
 
-RESTRICTED=	No explicit permission to redistribute
-
 OPTIONS_DEFINE=	DOCS
 
 DOCS_PLIST_FILES=${DOCSDIR_REL}/rom-distribution.txt
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 197ce7af1de0..2461d066fe37 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -9,6 +9,7 @@ PKGNAMESUFFIX=	-gtk
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Super Nintendo Entertainment System (SNES) Emulator
 
+# Commercial users must seek permission from copyright holders.
 LICENSE=	Snes9x
 LICENSE_NAME=	Snes9x License
 LICENSE_FILE=	${WRKSRC}/../docs/snes9x-license.txt
@@ -29,7 +30,6 @@ LDFLAGS+=	-Wl,--as-needed
 
 PATCH_WRKSRC=	${WRKSRC}/..
 WRKSRC_SUBDIR=	gtk
-NO_CDROM=	Commercial users must seek permission from copyright holders.
 
 OPTIONS_DEFINE=		DEBUG JMA NETPLAY
 OPTIONS_GROUP=		SOUND VIDEO
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index 78964aa6b502..7679dc13e0b8 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -10,15 +10,17 @@ DISTNAME=	STonX-0.6.7.6
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	AtariST emulator
 
-LICENSE=	GPLv2+
+LICENSE=	GPLv2+ ROM
+LICENSE_COMB=	multi
+LICENSE_NAME_ROM=	Atari ROM
+LICENSE_TEXT_ROM=	Contains ROM (C) by Atari
+LICENSE_PERMS_ROM=	auto-accept
 
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
 		gccmakedep:devel/gccmakedep \
 		mkfontscale:x11-fonts/mkfontscale \
 		${LOCALBASE}/share/fonts/misc/10x20-ISO8859-1.pcf.gz:x11-fonts/font-misc-misc
 
-RESTRICTED=	Contains ROM (C) by Atari
-
 TOSIMG?=	tos.img
 USES=		fonts xorg
 FONTNAME=	misc
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index ee8c73e06614..5c4e6d803ad2 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -9,7 +9,11 @@ MASTER_SITES=	SF/vice-emu/releases
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 ROM
+LICENSE_COMB=	multi
+LICENSE_NAME_ROM=	Commodore ROMs
+LICENSE_TEXT_ROM=	ROMs are copyrighted by Commodore Business Machines
+LICENSE_PERMS_ROM=	auto-accept
 
 BUILD_DEPENDS=	xa65:devel/xa65 \
 		xdg-open:devel/xdg-utils
@@ -27,7 +31,6 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libpcre2-8.so:devel/pcre2 \
 		libgnutls.so:security/gnutls
 
-RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 USES=		compiler:c++11-lang pkgconfig makeinfo localbase:ldflags \
 		gmake iconv:wchar_t jpeg readline gettext xorg
 USE_XORG=	xpm ice sm xext xv xt x11 xmu xxf86vm
diff --git a/games/doom/Makefile b/games/doom/Makefile
index e85f057bc5a2..3ac3005711a5 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -10,13 +10,12 @@ DISTNAME=	doomsrc
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DOOM: the game and the sound server
 
+# Redistribution is limited, see license; Requested by id Software
 LICENSE=	IDSOFTWARE
 LICENSE_NAME=	ID SOFTWARE LICENSE
 LICENSE_FILE=	${WRKSRC}/linuxdoom-${PORTVERSION}/DOOMLIC.TXT
 LICENSE_PERMS=	dist-mirror pkg-mirror
 
-NO_CDROM=	Redistribution is limited, see license; Requested by id Software
-
 ONLY_FOR_ARCHS=	i386
 
 USES=		gmake xorg zip
diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index a486caf705de..a7414b25c1ee 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -7,6 +7,7 @@ CATEGORIES=	games
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Jonathon Fowler's Shadow Warrior Port
 
+# Must be distributed only through the Internet and free of charge
 LICENSE=	GPLv2 BuildLic
 LICENSE_COMB=	multi
 LICENSE_NAME_BuildLic=	Build source code license
@@ -36,8 +37,6 @@ GH_TAGNAME=	c434002 \
 		1149eb1:mact
 GH_SUBDIR=	jfbuild:build jfaudiolib:audio jfmact:mact
 
-NO_CDROM=	Must be distributed only through the Internet and free of charge
-
 MAKE_ENV+=	DATADIR="${DATADIR}"
 
 SUB_FILES=	pkg-message
diff --git a/games/libretro-fbalpha/Makefile b/games/libretro-fbalpha/Makefile
index 3e01491007f7..f6bc87061599 100644
--- a/games/libretro-fbalpha/Makefile
+++ b/games/libretro-fbalpha/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	games
 MAINTAINER=	menelkir@itroll.org
 COMMENT=	Final Burn Alpha port for libretro
 
+# Commercial users must seek permission from copyright holders.
 LICENSE=	FBA
 LICENSE_NAME=	FBA
 LICENSE_FILE=	${WRKSRC}/src/license.txt
@@ -16,8 +17,6 @@ USE_GL=		gl
 
 PLIST_FILES=	lib/libretro/fbalpha_libretro.so
 
-NO_CDROM=       Commercial users must seek permission from copyright holders.
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	fbalpha
diff --git a/games/libretro-genesis_plus_gx/Makefile b/games/libretro-genesis_plus_gx/Makefile
index 65ecfc30bda8..9c1756e62800 100644
--- a/games/libretro-genesis_plus_gx/Makefile
+++ b/games/libretro-genesis_plus_gx/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	games
 MAINTAINER=	menelkir@itroll.org
 COMMENT=	Enhanced port of Genesis Plus
 
+# Commercial users must seek permission from copyright holders.
 LICENSE=	GPGX
 LICENSE_NAME=	GPGX
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -13,8 +14,6 @@ LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 USES=		compiler:c++11-lib gmake
 USE_LDCONFIG=	yes
 
-NO_CDROM=	Commercial users must seek permission from copyright holders.
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	Genesis-Plus-GX
diff --git a/games/libretro-paralleln64/Makefile b/games/libretro-paralleln64/Makefile
index 8337796f887c..d86c94d24f3c 100644
--- a/games/libretro-paralleln64/Makefile
+++ b/games/libretro-paralleln64/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	games
 MAINTAINER=	menelkir@itroll.org
 COMMENT=	Improved Nintendo 64 core for libretro
 
+# Commercial users must seek permission from copyright holders.
 LICENSE=	BITSTREAM_VERA CC0-1.0 GFDL GPLv2 GPLv3 LGPL3 MIT ZLIB
 LICENSE_COMB=	multi
 LICENSE_NAME_BITSTREAM_VERA=	Bitstream Vera Sans - Roman Release 1.10
@@ -17,8 +18,6 @@ USES=		compiler:c++11-lang gmake gl localbase
 USE_GL=		gl
 USE_LDCONFIG=	yes
 
-NO_CDROM=	Commercial users must seek permission from copyright holders.
-
 DYNAREC=	${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/}
 
 MAKE_ARGS=	WITH_DYNAREC=${DYNAREC}
diff --git a/games/libretro-snes9x/Makefile b/games/libretro-snes9x/Makefile
index 841ab02d33e1..149d4836c49e 100644
--- a/games/libretro-snes9x/Makefile
+++ b/games/libretro-snes9x/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	games
 MAINTAINER=	menelkir@itroll.org
 COMMENT=	Snes9x - Portable Super Nintendo emulator
 
+# Commercial users must seek permission from copyright holders.
 LICENSE=	PS
 LICENSE_NAME=	PS
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,8 +16,6 @@ BROKEN_FreeBSD_11=	linker error: unrecognized option '-plugin'
 USES=		compiler:c++11-lib gmake
 USE_LDCONFIG=	yes
 
-NO_CDROM=	Commercial users must seek permission from copyright holders.
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	snes9x
diff --git a/games/libretro-snes9x2005/Makefile b/games/libretro-snes9x2005/Makefile
index 0334af1a8cd0..5c8362b40a38 100644
--- a/games/libretro-snes9x2005/Makefile
+++ b/games/libretro-snes9x2005/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	games
 MAINTAINER=	menelkir@itroll.org
 COMMENT=	Snes9x - Portable Super Nintendo emulator (1.43)
 
+# Commercial users must seek permission from copyright holders.
 LICENSE=	PS
 LICENSE_NAME=	PS
 LICENSE_FILE=	${WRKSRC}/copyright
@@ -13,8 +14,6 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 USES=		compiler:c++11-lib gmake
 USE_LDCONFIG=	yes
 
-NO_CDROM=	Commercial users must seek permission from copyright holders.
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	snes9x2005
diff --git a/games/libretro-snes9x2010/Makefile b/games/libretro-snes9x2010/Makefile
index 4036a8792a79..837af11a56c4 100644
--- a/games/libretro-snes9x2010/Makefile
+++ b/games/libretro-snes9x2010/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	games
 MAINTAINER=	menelkir@itroll.org
 COMMENT=	Snes9x - Portable Super Nintendo emulator (1.52)
 
+# Commercial users must seek permission from copyright holders.
 LICENSE=	PS
 LICENSE_NAME=	PS
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -13,8 +14,6 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 USES=		compiler:c++11-lib gmake
 USE_LDCONFIG=	yes
 
-NO_CDROM=	Commercial users must seek permission from copyright holders.
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	snes9x2010
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index ac00f641ed7a..d2746bf49f50 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -5,25 +5,17 @@ PORTVERSION=	1.7.4
 PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LICENSE_DISTFILES_DATA}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window sitter for X11
 
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: AutoBar
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: AutoBar
-BROKEN_armv6=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
-BROKEN_armv7=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
-
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libtiff.so:graphics/tiff
-
-RESTRICTED=	'contains commercial character data'
-
-RESTRICTED_FILES=	\
+LICENSE=	GPLv2+ DATA
+LICENSE_COMB=	multi
+LICENSE_NAME_DATA=	Commercial character data
+LICENSE_TEXT_DATA=	contains commercial character data
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE_DISTFILES_DATA=	\
 		macopix-mascot-comic_party-euc-ja-1.02.tar.gz \
 		macopix-mascot-cosmos-euc-ja-1.02.tar.gz \
 		macopix-mascot-kanon-euc-ja-1.02.tar.gz \
@@ -34,6 +26,15 @@ RESTRICTED_FILES=	\
 		macopix-mascot-tsukihime-euc-ja-1.02.tar.gz \
 		macopix-mascot-marimite-euc-ja-2.20.tar.gz \
 		macopix-mascot-HxB-euc-ja-0.30.tar.gz
+LICENSE_PERMS_DATA=	auto-accept
+
+BROKEN_FreeBSD_13=	ld: error: duplicate symbol: AutoBar
+BROKEN_FreeBSD_14=	ld: error: duplicate symbol: AutoBar
+BROKEN_armv6=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
+BROKEN_armv7=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
+
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USES=		gettext gmake gnome iconv jpeg libtool pkgconfig xorg
 USE_GNOME=	gtk20
diff --git a/games/nwndata/Makefile b/games/nwndata/Makefile
index e46a92054162..cba1af7257cb 100644
--- a/games/nwndata/Makefile
+++ b/games/nwndata/Makefile
@@ -15,6 +15,9 @@ MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Neverwinter Nights Data Files
 
 LICENSE=	Proprietary
+LICENSE_NAME=	Proprietary
+LICENSE_TEXT=	Distribution not allowed
+LICENSE_PERMS=	auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Binary Distribution on x86 only
@@ -38,7 +41,6 @@ PLIST_SUB+=	DIAMOND="@comment " ORIGINAL=""
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/nwn
-RESTRICTED=	Distribution not allowed
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index bfc39b002fb2..2bf132b20547 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -10,9 +10,11 @@ DISTNAME=	xev111
 MAINTAINER=	TsurutaniNaoki@gmail.com
 COMMENT=	XEVIOUS like shooting game
 
-LICENSE=	GPLv2
-
-NO_CDROM=	Possible copyright infringement
+LICENSE=	GPLv2 CR
+LICENSE_COMB=	multi
+LICENSE_NAME_CR=	Copyright
+LICENSE_TEXT_CR=	Possible copyright infringement
+LICENSE_PERMS_CR=	dist-mirror pkg-mirror auto-accept
 
 USES=		imake xorg
 USE_XORG=	x11 xext
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 4147be2bce12..97a6839c59ce 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -11,13 +11,15 @@ DISTNAME=	XFrisk-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-player networked Risk game for X11
 
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2+ CR
+LICENSE_COMB=	multi
+LICENSE_NAME_CR=	Copyright
+LICENSE_TEXT_CR=	Possible trademark infringement
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE_PERMS_CR=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
-NO_CDROM=	Possible trademark infringement
-
 WRKSRC=		${WRKDIR}/XFrisk
 
 USES=		gmake xorg
diff --git a/graphics/yed/Makefile b/graphics/yed/Makefile
index 25ade9a66231..9a338e789cad 100644
--- a/graphics/yed/Makefile
+++ b/graphics/yed/Makefile
@@ -13,14 +13,13 @@ LICENSE=	YED_1_1
 LICENSE_NAME=	yEd Software License Agreement (Version 1.1)
 LICENSE_TEXT=	Description of the license can be obtained from the following URL: \
 		http://www.yworks.com/products/yed/license.html
+# Downloading requires acceptance of license agreement
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
 USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 
-RESTRICTED=	Downloading requires acceptance of license agreement
-
 DESKTOP_ENTRIES="yEd" "${COMMENT}" "" "yed" "Graphics;" false
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/java/dbvis/Makefile b/java/dbvis/Makefile
index f8421d2934f9..770c65250120 100644
--- a/java/dbvis/Makefile
+++ b/java/dbvis/Makefile
@@ -12,12 +12,12 @@ COMMENT=	DbVisualizer database tool
 LICENSE=	DbVisualizer_EULA
 LICENSE_NAME=	End-User License Agreement for DbVisualizer
 LICENSE_TEXT=	Full license can be found at http://www.dbvis.com/eula/
+# Redistribution is not permitted
 LICENSE_PERMS=	auto-accept
 
 USE_JAVA=	yes
 JAVA_VENDOR=	openjdk
 NO_BUILD=	yes
-RESTRICTED=	Redistribution is not permitted
 
 PLIST_FILES=	bin/dbvis
 WRKSRC=		${WRKDIR}/DbVisualizer
diff --git a/lang/cbmbasic/Makefile b/lang/cbmbasic/Makefile
index cd7bf7e67746..8f4b89259183 100644
--- a/lang/cbmbasic/Makefile
+++ b/lang/cbmbasic/Makefile
@@ -5,9 +5,9 @@ CATEGORIES=	lang
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Portable version of Commodore 64 BASIC
 
-LICENSE=	BSD
-
-RESTRICTED=	Not really sure about the legal status
+LICENSE=	BSD NONE
+# Not really sure about the legal status
+LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mist64
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 5facddbef691..c61655c13d49 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -13,13 +13,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Intel C/C++ compiler, set up to produce native FreeBSD binaries
 
-LICENSE=	EPL LGPL21
+LICENSE=	EPL LGPL21 INTEL
 LICENSE_COMB=	multi
+LICENSE_NAME_INTEL=	Intel
+LICENSE_TEXT_INTEL=	Intel forbids any redistribution.
+LICENSE_PERMS_INTEL=	auto-accept
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:archivers/rpm2cpio
 
-RESTRICTED=	Intel forbids any redistribution.
-
 USES=		linux
 USE_LINUX=	base
 
diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile
index 0fa202b36d3a..004d9b8277af 100644
--- a/mail/rainloop/Makefile
+++ b/mail/rainloop/Makefile
@@ -11,6 +11,7 @@ COMMENT?=	Modern and interactive webmail
 LICENSE=	RainLoop
 LICENSE_NAME=	RainLoop Software License
 LICENSE_TEXT=	License can be found at: http://www.rainloop.net/licensing/
+# Redistribution in any form is prohibited
 LICENSE_PERMS=	auto-accept
 .endif
 
@@ -21,10 +22,6 @@ NO_WRKSUBDIR=	yes
 USE_PHP=	curl dom iconv json openssl pcre simplexml spl xml zlib
 PLIST_SUB=	VER="${PORTVERSION}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
-.if "${PKGNAMESUFFIX}" == "${PHP_PKGNAMESUFFIX}"
-RESTRICTED=	Redistribution in any form is prohibited
-.endif
-
 OPTIONS_RADIO=		DB
 OPTIONS_RADIO_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	SQLITE
diff --git a/math/emc2/Makefile b/math/emc2/Makefile
index 3be29fa705d5..de44df8b410c 100644
--- a/math/emc2/Makefile
+++ b/math/emc2/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Graphical editor of two-dimensional mesh geometries
 LICENSE=	INRIA
 LICENSE_NAME=	INRIA license, perhaps specific to emc2
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+# No resale, contact author for commercial usage
 LICENSE_PERMS=	auto-accept no-dist-sell no-pkg-sell
 
 USES=		gmake xorg
 USE_XORG=	x11 xau xcb xdmcp
 
 ALL_TARGET=	${PORTNAME}
-RESTRICTED=	No resale, contact author for commercial usage
 
 .if defined(LANG) && ${LANG:Mfr*} != ""
 CFLAGS+=	-DFRENCH
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index 2286d76cd923..ee7199c4a759 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -15,8 +15,12 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer algebra system
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv3 DOC
+LICENSE_COMB=	multi
+LICENSE_NAME_DOC=	French documentation
+LICENSE_TEXT_DOC=	French documentation is for non-commercial use only
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
+LICENSE_PERMS_DOC=	dist-mirror pkg-mirror auto-accept
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libao.so:audio/libao \
@@ -33,8 +37,6 @@ LIB_DEPENDS=	libao.so:audio/libao \
 		libsamplerate.so:audio/libsamplerate
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-NO_CDROM=	French documentation is for non-commercial use only
-
 USES=		blaslapack compiler:c++14-lang desktop-file-utils fortran \
 		gettext gl gmake gnome jpeg libtool localbase ncurses perl5 \
 		readline shebangfix xorg
diff --git a/misc/susv2/Makefile b/misc/susv2/Makefile
index 0699b62c5510..569a71fa7fe7 100644
--- a/misc/susv2/Makefile
+++ b/misc/susv2/Makefile
@@ -9,12 +9,11 @@ DISTNAME=	susv2
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Single UNIX Specification Version 2
 
+# Redistribution of the documents is not permitted
 LICENSE=	NONE
 
 USES=		tar:bzip2
 
-RESTRICTED=	Redistribution of the documents is not permitted
-
 NO_BUILD=	yes
 PORTDOCS=	*
 
diff --git a/misc/susv3/Makefile b/misc/susv3/Makefile
index 0efdf29c00fe..c083d7f19d64 100644
--- a/misc/susv3/Makefile
+++ b/misc/susv3/Makefile
@@ -9,12 +9,11 @@ DISTNAME=	susv3
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Single UNIX Specification Version 3
 
+# Redistribution of the documents is not permitted
 LICENSE=	NONE
 
 USES=		tar:bzip2
 
-RESTRICTED=	Redistribution of the documents is not permitted
-
 NO_BUILD=	yes
 PORTDOCS=	*
 
diff --git a/misc/susv4/Makefile b/misc/susv4/Makefile
index 38930a2545e8..c6903da51e5e 100644
--- a/misc/susv4/Makefile
+++ b/misc/susv4/Makefile
@@ -8,12 +8,11 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
*** 383 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105061149.146BnANa013685>