libamr(n|w)b

- Change MASTER_SITES
- Add LICENSE_* for complicated legal status
- Update LEGAL
- Support stage
- While on it, USE_BZIP2 -> USES tar:bzip2

PR:		ports/186065
Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer)
Approved by:	thierry (mentor)

4 files changed, 46 insertions, 40 deletions

diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index 196a0942ee6c..df9e281c2724 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -5,46 +5,49 @@ PORTNAME=	libamrnb
 PORTVERSION=	11.0.0.0
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://ftp.penguin.cz/pub/users/utx/amr/ \
-		http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/:3GPP
+MASTER_SITES=	http://www.penguin.cz/~utx/ftp/amr/ \
+		http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/:SRC26104
 DISTNAME=	amrnb-${DISTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SRC3GPP}:3GPP
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SRC26104}:SRC26104
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP floating-point Adaptive Multi-Rate (AMR) Speech Codec
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE 3GPP
+LICENSE_COMB=	dual
+LICENSE_NAME_3GPP=	3GPP
+LICENSE_TEXT_3GPP=	${RESTRICTED}
+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}
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-LICENSE_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-RESTRICTED=	license prohibits redistribution
-RESTRICTED_FILES=	${SRC3GPP}
-USE_BZIP2=	yes
-NO_STAGE=	yes
-USES=		gmake
+RESTRICTED=	unclear legal status, probably need licenses from 3GPP and more
+
+USES=		gmake tar:bzip2
 USE_AUTOTOOLS=	libtool
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LANG=C
-MAKE_ENV=	LANG=C
+MAKE_ENV+=	LANG=C
 USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOCS
 
-SRC3GPP=	26104-b00.zip
+SRC26104=	26104-b00.zip
 
 .include <bsd.port.options.mk>
 
 post-extract:
-	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}/
+	@${CP} ${_DISTDIR}/${SRC26104} ${WRKSRC}/
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/audio/libamrnb/distinfo b/audio/libamrnb/distinfo
index a9bcd8b611c7..bd01c083ebe5 100644
--- a/audio/libamrnb/distinfo
+++ b/audio/libamrnb/distinfo
@@ -1,4 +1,4 @@
-SHA256 (amrnb-11.0.0.0.tar.bz2) = 3890004b665278b963ecaae2dc1321dcee29c53ea9d91aaf18d9286105e0f1e1
-SIZE (amrnb-11.0.0.0.tar.bz2) = 244917
-SHA256 (26104-b00.zip) = 23df8b24b0f009783027b8eef5fa8225ec71f859f2704bdb06829f09018cc8f1
-SIZE (26104-b00.zip) = 427897
+SHA256 (libamrnb/amrnb-11.0.0.0.tar.bz2) = 3890004b665278b963ecaae2dc1321dcee29c53ea9d91aaf18d9286105e0f1e1
+SIZE (libamrnb/amrnb-11.0.0.0.tar.bz2) = 244917
+SHA256 (libamrnb/26104-b00.zip) = 23df8b24b0f009783027b8eef5fa8225ec71f859f2704bdb06829f09018cc8f1
+SIZE (libamrnb/26104-b00.zip) = 427897
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index daf4f8f193be..081670b019cb 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -4,46 +4,49 @@
 PORTNAME=	libamrwb
 PORTVERSION=	11.0.0.0
 CATEGORIES=	audio
-MASTER_SITES=	http://ftp.penguin.cz/pub/users/utx/amr/ \
-		http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/:3GPP
+MASTER_SITES=	http://www.penguin.cz/~utx/ftp/amr/ \
+		http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/:SRC26204
 DISTNAME=	amrwb-${DISTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SRC3GPP}:3GPP
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SRC26204}:SRC26204
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE 3GPP
+LICENSE_COMB=	dual
+LICENSE_NAME_3GPP=	3GPP
+LICENSE_TEXT_3GPP=	${RESTRICTED}
+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}
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-LICENSE_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-RESTRICTED=	license prohibits redistribution
-RESTRICTED_FILES=	${SRC3GPP}
-USE_BZIP2=	yes
-NO_STAGE=	yes
-USES=		gmake
+RESTRICTED=	unclear legal status, probably need licenses from 3GPP and more
+
+USES=		gmake tar:bzip2
 USE_AUTOTOOLS=	libtool
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LANG=C
-MAKE_ENV=	LANG=C
+MAKE_ENV+=	LANG=C
 USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOCS
 
-SRC3GPP=	26204-b00.zip
+SRC26204=	26204-b00.zip
 
 .include <bsd.port.options.mk>
 
 post-extract:
-	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}/
+	@${CP} ${_DISTDIR}/${SRC26204} ${WRKSRC}/
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/audio/libamrwb/distinfo b/audio/libamrwb/distinfo
index 20d6c58cc80c..7ddd9d4ac98d 100644
--- a/audio/libamrwb/distinfo
+++ b/audio/libamrwb/distinfo
@@ -1,4 +1,4 @@
-SHA256 (amrwb-11.0.0.0.tar.bz2) = 5caf59b14480b0cd2a7babb8be472c4af39ff4c7c95f1278116557049a4dd5dc
-SIZE (amrwb-11.0.0.0.tar.bz2) = 240170
-SHA256 (26204-b00.zip) = c885c44483fd4502d354ec9656f2cdc0469050015052f8f3ecc1d5e08c869fec
-SIZE (26204-b00.zip) = 385394
+SHA256 (libamrwb/amrwb-11.0.0.0.tar.bz2) = 5caf59b14480b0cd2a7babb8be472c4af39ff4c7c95f1278116557049a4dd5dc
+SIZE (libamrwb/amrwb-11.0.0.0.tar.bz2) = 240170
+SHA256 (libamrwb/26204-b00.zip) = c885c44483fd4502d354ec9656f2cdc0469050015052f8f3ecc1d5e08c869fec
+SIZE (libamrwb/26204-b00.zip) = 385394