- Update libamrnb to version 7.0.0.0.

- Update libamrwb to version 7.0.0.2.

PR:		ports/115819
Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer)

6 files changed, 14 insertions, 88 deletions

diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index f8d22e24c87d..9499b26bb57e 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libamrwb
-PORTVERSION=	7.0.0.1
-PORTREVISION=	1
+PORTVERSION=	7.0.0.2
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.penguin.cz/pub/users/utx/amr/ \
 		http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/:3GPP
@@ -20,32 +19,29 @@ COMMENT=	3GPP Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec
 
 BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
-SRC3GPP=	26204-700.zip
-
+RESTRICTED=	license prohibits redistribution
+RESTRICTED_FILES=	${SRC3GPP}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
+PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
+SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LANG=C
+MAKE_ENV=	LANG=C
 USE_LDCONFIG=	yes
-RESTRICTED=	license prohibits redistribution
-RESTRICTED_FILES=	${SRC3GPP}
-PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
-SUB_FILES=	pkg-message
+
+SRC3GPP=	26204-700.zip
 
 post-extract:
 	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}/
 
 post-install:
 .ifndef(NOPORTDOCS)
-	@${ECHO} -n Install documents:
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 . for FILE in ${PORTDOCS}
-		@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-		@${ECHO} -n " ${FILE}"
+		${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 . endfor
-	@${ECHO} .
-	@${ECHO}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/audio/libamrwb/distinfo b/audio/libamrwb/distinfo
index db97371f6d12..55b579317260 100644
--- a/audio/libamrwb/distinfo
+++ b/audio/libamrwb/distinfo
@@ -1,6 +1,6 @@
-MD5 (amrwb-7.0.0.1.tar.bz2) = f823b5e055e1d85142740e225b86ac91
-SHA256 (amrwb-7.0.0.1.tar.bz2) = 16248eac1a909012be577333583d5f4bffaad2b7687c764d7f027ddc11f1ec86
-SIZE (amrwb-7.0.0.1.tar.bz2) = 220644
+MD5 (amrwb-7.0.0.2.tar.bz2) = ab6d134fdc36aadd45232ce36f8e12ac
+SHA256 (amrwb-7.0.0.2.tar.bz2) = 2fca28b405fe4f871c9e0465ea56ffd7545f58b2a431fbb8dce8dab30f096552
+SIZE (amrwb-7.0.0.2.tar.bz2) = 222579
 MD5 (26204-700.zip) = 2e5098687d3007a05b7acc8298a5b072
 SHA256 (26204-700.zip) = 1b8ba234f5ac520650cb66aee1079491681afb7dba78eb717dca9534ae3598f0
 SIZE (26204-700.zip) = 255757
diff --git a/audio/libamrwb/files/patch-Makefile.in b/audio/libamrwb/files/patch-Makefile.in
deleted file mode 100644
index a768eb212d27..000000000000
--- a/audio/libamrwb/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	Thu Jun  7 00:32:12 2007
-+++ Makefile.in	Sun Jul 15 00:58:13 2007
-@@ -224,7 +224,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = amrwb-any-cflags.patch amrwb-dhf-declaration.patch amrwb-intsizes.patch prepare_sources.sh amrwb.spec
--DISTCLEANFILES = 26204-700.zip 26204-700.doc 26204-700_ANSI-C_source_code.zip
-+DISTCLEANFILES = 26204-700.doc 26204-700_ANSI-C_source_code.zip
- lib_LTLIBRARIES = \
- 	libamrwb.la
- 
-@@ -807,10 +807,10 @@
- 	chmod og-w 26204-700.doc
- 
- 26204-700.zip:
--	$(WGET) -N http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip
-+	test -e 26204-700.zip
- 
- extraclean:
--	rm -f $(distdir)/*.c $(distdir)/*.h $(distdir)/readme.txt $(distdir)/26204-700.zip $(distdir)/26204-700.doc $(distdir)/26204-700_ANSI-C_source_code.zip
-+	rm -f $(distdir)/*.c $(distdir)/*.h $(distdir)/readme.txt $(distdir)/26204-700.doc $(distdir)/26204-700_ANSI-C_source_code.zip
- 
- # WARNING: These commands use internal automake command and may fail in future version.
- extradist-gzip: distdir extraclean
diff --git a/audio/libamrwb/files/patch-configure b/audio/libamrwb/files/patch-configure
deleted file mode 100644
index e0a2568cbea1..000000000000
--- a/audio/libamrwb/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	Fri Jun 22 13:50:03 2007
-+++ configure	Fri Jun 22 13:50:27 2007
-@@ -20338,12 +20338,6 @@
- fi
- 
- 
--if test x"$WGET" = x -a ! "(" -f "26204-700.zip" -o -f "enc_main.c" ")" ; then
--    { { echo "$as_me:$LINENO: error: You need wget utility to download sources." >&5
--echo "$as_me: error: You need wget utility to download sources." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
- # Checks for libraries.
- { echo "$as_me:$LINENO: checking for library containing sqrt" >&5
- echo $ECHO_N "checking for library containing sqrt... $ECHO_C" >&6; }
diff --git a/audio/libamrwb/files/patch-prepare_sources.sh b/audio/libamrwb/files/patch-prepare_sources.sh
deleted file mode 100644
index 3dc6ae8f030c..000000000000
--- a/audio/libamrwb/files/patch-prepare_sources.sh
+++ /dev/null
@@ -1,31 +0,0 @@
---- prepare_sources.sh.orig	Thu Jun  7 00:29:29 2007
-+++ prepare_sources.sh	Sun Jul 15 01:00:53 2007
-@@ -1,10 +1,10 @@
--#! /bin/bash
-+#! /bin/sh
- 
- set -o errexit
--trap "rm -rf c-code *.c *.h readme.txt *.new *.def *.all" ERR
-+trap "rm -rf c-code *.c *.h readme.txt *.new *.def *.all" 0
- 
- if [ "$0" = prepare_sources.sh ] ; then
--    cd "$(if ! which 2>/dev/null prepare_sources.sh ; then echo . fi )"
-+    cd "$(if ! which 2>/dev/null prepare_sources.sh ; then echo . ; fi )"
- else
-     cd "${0%/*}"
- fi
-@@ -24,7 +24,7 @@
- patch <amrwb-any-cflags.patch
- patch <amrwb-dhf-declaration.patch
- 
--for FILE in {dec,enc}_if.{c,h} ; do
-+for FILE in dec_if.[ch] enc_if.[ch] ; do
-     echo "modifying file $FILE"
-     if test $FILE = ${FILE%.h} ; then
- 	ENDSTRING="^}"
-@@ -47,3 +47,5 @@
-     mv $FILE.new $FILE
-     rm $FILE.def $FILE.all
- done
-+
-+trap 0
diff --git a/audio/libamrwb/pkg-plist b/audio/libamrwb/pkg-plist
index b7bff306ebc1..997170e35037 100644
--- a/audio/libamrwb/pkg-plist
+++ b/audio/libamrwb/pkg-plist
@@ -23,5 +23,5 @@ include/amrwb/typedef.h
 lib/libamrwb.a
 lib/libamrwb.la
 lib/libamrwb.so
-lib/libamrwb.so.2
+lib/libamrwb.so.3
 @dirrm include/amrwb