svn commit: r417172 - in head: . audio/faac

[Thomas Zander]

Author: riggs
Date: Mon Jun 20 18:58:36 2016
New Revision: 417172
URL: https://svnweb.freebsd.org/changeset/ports/417172

Log:
  Update LICENSE* in audio/faac; remove from LEGAL
  
  Detailed log:
  - Remove audio/faac from LEGAL. There is no evidence that faac
    may not be redistributed on sold media like FreeBSD CDs/DVDs.
    Other well-established open source organisations arrive at the
    same conclusion, e.g. Debian:
    http://metadata.ftp-master.debian.org/changelogs//non-free/f/faac/faac_1.28-6_copyright
    and, by extension, Ubuntu:
    https://launchpad.net/ubuntu/trusty/+source/faac/+copyright
    Arch Linux ships redistributable packages as well:
    https://www.archlinux.org/packages/?sort=&repo=Extra&q=faac
  - Add LICENSE* tags in audio/faac
  - Bump PORTREVISION in audio/faac (package metadata changes)
  - Pet portlint
  
  PR:		209959
  Submitted by:	takefu at airport.fm
  Reviewed by:	riggs

Modified:
  head/LEGAL
  head/audio/faac/Makefile

Modified: head/LEGAL
==============================================================================
--- head/LEGAL	Mon Jun 20 18:04:15 2016	(r417171)
+++ head/LEGAL	Mon Jun 20 18:58:36 2016	(r417172)
@@ -84,7 +84,6 @@ etqw*			games/linux-etqw-demo-server Red
 etqw*			games/linux-etqw-server Redistribution limited
 ezmlm-*			mail/ezmlm		No license -- see http://cr.yp.to/softwarelaw.html
 ezmlm-*			mail/ezmlm-idx		No license -- see http://cr.yp.to/softwarelaw.html
-faac*			audio/faac		Restrictive copyright (do not sell for profit)
 fasta2*			biology/fasta		May not be sold or incorporated into a commercial product
 fasta3*			biology/fasta3		May not be sold or incorporated into a commercial product
 festival/festlex_OALD*	audio/festlex-oald	No commercial use

Modified: head/audio/faac/Makefile
==============================================================================
--- head/audio/faac/Makefile	Mon Jun 20 18:04:15 2016	(r417171)
+++ head/audio/faac/Makefile	Mon Jun 20 18:58:36 2016	(r417172)
@@ -3,18 +3,23 @@
 
 PORTNAME=	faac
 PORTVERSION=	1.28
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	multimedia at FreeBSD.org
 COMMENT=	MPEG-2 and MPEG-4 AAC audio encoder
 
-LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
+LICENSE=	GPLv2 LGPL21+ ISO
+LICENSE_COMB=	multi
+LICENSE_NAME_ISO=	ISO/IEC14496
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE_ISO=	${WRKSRC}/README
+LICENSE_PERMS_ISO=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RESTRICTED=	Distribution in binary form is prohibited
+LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 
-USES=		autoreconf dos2unix gmake libtool tar:bzip2
+USES=		autoreconf gmake libtool tar:bzip2
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mp4v2
@@ -25,6 +30,6 @@ USE_LDCONFIG=	yes
 post-patch:
 	@${ECHO_CMD} "" >> ${WRKSRC}/libfaac/psych.h
 	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
-		${WRKSRC}/frontend/main.c \
+		${WRKSRC}/frontend/main.c
 
 .include <bsd.port.mk>