svn commit: r356749 - in branches/2014Q2: . x11-fonts/freefonts

[Jimmy Olgeni]

Author: olgeni
Date: Fri Jun  6 08:39:12 2014
New Revision: 356749
URL: http://svnweb.freebsd.org/changeset/ports/356749
QAT: https://qat.redports.org/buildarchive/r356749/

Log:
  MFH: r353684, r353941, r354411, r354418.
  
  - Sync text of LEGAL and RESTRICTED for x11-fonts/freefonts.
  - Unbreak with working MASTER_SITES and fix portlint warning.
  
  CR:		https://phabric.freebsd.org/D185
  Approved by:	portmgr (bapt)

Modified:
  branches/2014Q2/LEGAL
  branches/2014Q2/x11-fonts/freefonts/Makefile

Modified: branches/2014Q2/LEGAL
==============================================================================
--- branches/2014Q2/LEGAL	Fri Jun  6 07:52:18 2014	(r356748)
+++ branches/2014Q2/LEGAL	Fri Jun  6 08:39:12 2014	(r356749)
@@ -105,7 +105,7 @@ foiltex*		textproc/foiltex	Redistributio
 fp-freebsd-ws-*		security/f-prot		Free for personal users on personal workstations only
 fuse-emulator-roms*	emulators/fuse-roms	No explicit permission to redistribute
 Opus-22.rom		emulators/fuse-roms	No explicit permission to redistribute
-freefonts-*		x11-fonts/freefonts	Some of the fonts are shareware.  Some are freeware.  Permission must be obtained before distributing at least four (mazama.license, muriel.license, roosthea.license, shf_____.license).  Two have inconsistent licenses (tempofon.license and tempoita.license say "placed into the public domain and may [not be] sold")
+freefonts-*		x11-fonts/freefonts	License prohibits redistribution; see individual .license files
 freqship/*		sysutils/freqsdwn	License agreement is required to download
 fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data	Only Unreal Voodoo site is allowed to distribute the music
 fvcom/sourcecode1.tar.gz	science/fvcom	Requires (free) registration

Modified: branches/2014Q2/x11-fonts/freefonts/Makefile
==============================================================================
--- branches/2014Q2/x11-fonts/freefonts/Makefile	Fri Jun  6 07:52:18 2014	(r356748)
+++ branches/2014Q2/x11-fonts/freefonts/Makefile	Fri Jun  6 08:39:12 2014	(r356749)
@@ -3,12 +3,12 @@
 
 PORTNAME=	freefonts
 PORTVERSION=	0.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \
-		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
+MASTER_SITES=	http://download.gimp.org/pub/%SUBDIR%/ \
+		ftp://ftp.sunet.se/pub/gnu/%SUBDIR%/   \
+		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
+		http://mirrors.xmission.com/gimp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	gimp/fonts
 
 MAINTAINER=	olgeni at FreeBSD.org
@@ -16,7 +16,14 @@ COMMENT=	Collection of ATM fonts (not al
 
 BUILD_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
-RESTRICTED=	see accompanying .license files
+# Some of the fonts are shareware. Some are freeware. Permission must
+# be obtained before distributing at least four (mazama.license,
+# muriel.license, roosthea.license, shf_____.license). Two have
+# inconsistent licenses (tempofon.license and tempoita.license say
+# "placed into the public domain and may [not be] sold")
+
+RESTRICTED=	License prohibits redistribution; see individual .license files
+
 NO_WRKSUBDIR=	yes
 
 FONTDIR?=	${PREFIX}/lib/X11/fonts/freefont