Bug 186065 - [update] audio/libamrnb and audio/libamrwb
Summary: [update] audio/libamrnb and audio/libamrwb
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Thomas Zander
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-24 06:20 UTC by Tatsuki Makino
Modified: 2014-03-15 08:17 UTC (History)
0 users

See Also:


Attachments
file.shar (6.44 KB, text/plain)
2014-01-24 06:20 UTC, Tatsuki Makino
no flags Details
patch-audio_libamr.shar.txt (6.19 KB, patch)
2014-01-24 06:49 UTC, Tatsuki Makino
no flags Details | Diff
ports-186065.shar.txt (8.37 KB, text/plain; format=flowed)
2014-03-10 08:16 UTC, Tatsuki Makino
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Tatsuki Makino 2014-01-24 06:20:00 UTC
change MASTER_SITES.
fix LEGAL.
support stage.

Fix: Patch attached with submission follows:
Comment 1 Tatsuki Makino 2014-01-24 06:49:31 UTC
Correction of patches.
Please use these patches. 		 	   		  
Comment 2 Thomas Zander freebsd_committer freebsd_triage 2014-03-09 18:50:55 UTC
Responsible Changed
From-To: freebsd-ports-bugs->riggs

I'll take it.
Comment 3 Thomas Zander freebsd_committer freebsd_triage 2014-03-09 19:39:39 UTC
Hi,

thanks for submitting the update. Build looks good in poudriere at
first glance, however I have a suggestion and a question:
- The distfiles are not particularly self-describing. Would you
consider using DIST_SUBDIR in the port makefiles to put them in their
own subdir in ${DISTDIR}? This also would apply to the change to
LEGAL. It simply would be cleaner to have e.g. libamr/* in LEGAL than
26104*.
- Using LICENSE=BSD for the overall port is quite audacious
considering the fact that there is a pkg-message explaining that
basically nothing is probably/likely/maybe legal without obtaining
further licenses for using, linking or distributing. I'd say this
qualifies for an unclear status and more restrictive LICENSE* keys.
Would you have a look at audio/libaacplus and check if similar rules
apply?

Thanks in advance
Riggs
Comment 4 Tatsuki Makino 2014-03-10 08:16:30 UTC
Hello.
Thank you for taking.

I tried to make new patch that included my answers of your suggestion and 
question.
Would you check it?

Thank you. 
Comment 5 dfilter service freebsd_committer freebsd_triage 2014-03-15 08:08:34 UTC
Author: riggs
Date: Sat Mar 15 08:08:29 2014
New Revision: 348294
URL: http://svnweb.freebsd.org/changeset/ports/348294
QAT: https://qat.redports.org/buildarchive/r348294/

Log:
  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)

Modified:
  head/LEGAL
  head/audio/libamrnb/Makefile
  head/audio/libamrnb/distinfo
  head/audio/libamrwb/Makefile
  head/audio/libamrwb/distinfo

Modified: head/LEGAL
==============================================================================
--- head/LEGAL	Sat Mar 15 08:01:49 2014	(r348293)
+++ head/LEGAL	Sat Mar 15 08:08:29 2014	(r348294)
@@ -164,8 +164,8 @@ lame*			audio/lame		patent issues, see h
 lgrind/*		print/lgrind		Contains non-free code written by Van Jacobson
 lha-1.14i-ac*		archivers/lha-ac	No redistribution allowed
 libaacplus-*		audio/libaacplus	Unclear legal status
-libamrnb		audio/libamrnb		No redistribution allowed
-libamrwb		audio/libamrwb		No redistribution allowed
+libamrnb/26104-*.zip	audio/libamrnb		unclear legal status, probably need licenses from 3GPP and more
+libamrwb/26204-*.zip	audio/libamrwb		unclear legal status, probably need licenses from 3GPP and more
 libdvdcss-*.tar.bz2	multimedia/libdvdcss	CSS code may violate the DMCA
 linux-unrealgold*	games/linux-unrealgold	Redistribution limited
 linux-ut/*		games/linux-ut		Redistribution limited

Modified: head/audio/libamrnb/Makefile
==============================================================================
--- head/audio/libamrnb/Makefile	Sat Mar 15 08:01:49 2014	(r348293)
+++ head/audio/libamrnb/Makefile	Sat Mar 15 08:08:29 2014	(r348294)
@@ -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>

Modified: head/audio/libamrnb/distinfo
==============================================================================
--- head/audio/libamrnb/distinfo	Sat Mar 15 08:01:49 2014	(r348293)
+++ head/audio/libamrnb/distinfo	Sat Mar 15 08:08:29 2014	(r348294)
@@ -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

Modified: head/audio/libamrwb/Makefile
==============================================================================
--- head/audio/libamrwb/Makefile	Sat Mar 15 08:01:49 2014	(r348293)
+++ head/audio/libamrwb/Makefile	Sat Mar 15 08:08:29 2014	(r348294)
@@ -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>

Modified: head/audio/libamrwb/distinfo
==============================================================================
--- head/audio/libamrwb/distinfo	Sat Mar 15 08:01:49 2014	(r348293)
+++ head/audio/libamrwb/distinfo	Sat Mar 15 08:08:29 2014	(r348294)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Thomas Zander freebsd_committer freebsd_triage 2014-03-15 08:17:05 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!