Attachment #80789 for bug #115819

View | Details | Raw Unified | Return to bug 115819
Collapse All | Expand All




#

PORTNAME=	libamrnb
PORTVERSION=	7.0.0.0
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	audio
MASTER_SITES=	http://ftp.penguin.cz/pub/users/utx/amr/ \


BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip

RESTRICTED=	license prohibits redistribution
RESTRICTED_FILES=	${SRC3GPP}
USE_BZIP2=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtool:15
GNU_CONFIGURE=	yes
CONFIGURE_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
GNU_CONFIGURE=	yes
CONFIGURE_ENV+=	LANG=C
MAKE_ENV=	LANG=C
USE_LDCONFIG=	yes

SRC3GPP=	26104-700.zip

post-extract:
	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}/

post-install:
.ifndef(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	@${MKDIR} ${DOCSDIR}
. for FILE in ${PORTDOCS}
		${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
		@${ECHO} -n " ${FILE}"
. endfor
	@${ECHO} .
	@${ECHO}
.endif
	@${CAT} ${PKGMESSAGE}


Lines 1-6 Link Here

(-)libamrnb/distinfo (-6 / +6 lines)
1	MD5 (amrnb-6.1.0.4.tar.bz2) = f482cdd0584469ba23ff33c6b331acbd	1	MD5 (amrnb-7.0.0.0.tar.bz2) = c89d657b75c936a061a8eaf12decadf8
2	SHA256 (amrnb-6.1.0.4.tar.bz2) = 6f2df7089205cd6127d434e8ec8fac4cccc163d4df5ec4437211c884fbd9fe75	2	SHA256 (amrnb-7.0.0.0.tar.bz2) = 6a54f9e33a5db0b70a8bf3661ccb3aa63d230f57d629dc1bb59d1d4d92306ea7
3	SIZE (amrnb-6.1.0.4.tar.bz2) = 224932	3	SIZE (amrnb-7.0.0.0.tar.bz2) = 226952
4	MD5 (26104-610.zip) = cfd9012bff83afdf5ad069b86d3063b6	4	MD5 (26104-700.zip) = e8cedb8d502294ab7833ced0b407d238
5	SHA256 (26104-610.zip) = 8dc9453f9b93202247b4800a1d946ae6eaa3b9d0c48237ae8848144feb88399e	5	SHA256 (26104-700.zip) = d17e4e65b6f8138ff6243f194cefa6f2b39450075cdb2e9bb431e2dc5a43f541
6	SIZE (26104-610.zip) = 292640	6	SIZE (26104-700.zip) = 303856




--- Makefile.in.orig	Sat May 26 04:34:54 2007
+++ Makefile.in	Sun Jul 15 00:48:06 2007
@@ -250,7 +250,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 EXTRA_DIST = amrnb-any-cflags.patch amrnb-intsizes.patch amrnb-strict-aliasing.patch prepare_sources.sh amrnb.spec
-DISTCLEANFILES = 26104-610.zip 26104-610.doc 26104-610_ANSI_C_source_code.zip
+DISTCLEANFILES = 26104-610.doc 26104-610_ANSI_C_source_code.zip
 lib_LTLIBRARIES = \
 	libamrnb.la
 
@@ -922,10 +922,10 @@
 	chmod og-w 26104-610.doc
 
 26104-610.zip:
-	$(WGET) -N http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip
+	test -e 26104-610.zip
 
 extraclean:
-	rm -f $(distdir)/*.c $(distdir)/*.h $(distdir)/readme.txt $(distdir)/26104-610.zip $(distdir)/26104-610.doc $(distdir)/26104-610_ANSI_C_source_code.zip
+	rm -f $(distdir)/*.c $(distdir)/*.h $(distdir)/readme.txt $(distdir)/26104-610.doc $(distdir)/26104-610_ANSI_C_source_code.zip
 
 # WARNING: These commands use internal automake command and may fail in future version.
 extradist-gzip: distdir extraclean




--- configure.orig	Fri Jun 22 12:43:20 2007
+++ configure	Fri Jun 22 12:43:24 2007
@@ -20338,12 +20338,6 @@
 fi
 
 
-if test x"$WGET" = x -a ! "(" -f "26104-610.zip" -o -f "sp_enc.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; }




--- prepare_sources.sh.orig	Wed Jun  6 23:52:12 2007
+++ prepare_sources.sh	Sat Jul 14 23:35: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
@@ -23,7 +23,7 @@
 patch <amrnb-strict-aliasing.patch
 patch <amrnb-any-cflags.patch
 
-for FILE in interf_{dec,enc}.{c,h} ; do
+for FILE in interf_dec.[ch] interf_enc.[ch] ; do
     echo "modifying file $FILE"
     if test $FILE = ${FILE%.h} ; then
 	ENDSTRING="^}"
@@ -100,3 +100,5 @@
 	rm $FILE.def $FILE.all
     done
 done
+
+trap 0

Lines 1-12 Link Here

(-)libamrnb/pkg-plist (-8 / +8 lines)
1	bin/amrnb-decoder	1	bin/amrnb-decoder
2	bin/amrnb-encoder
3	bin/amrnb-decoder-if2
4	bin/amrnb-encoder-if2
5	bin/amrnb-decoder-etsi	2	bin/amrnb-decoder-etsi
		3	bin/amrnb-decoder-if2
		4	bin/amrnb-encoder
6	bin/amrnb-encoder-etsi	5	bin/amrnb-encoder-etsi
7	bin/amrnb-encoder-vad2
8	bin/amrnb-encoder-if2-vad2
9	bin/amrnb-encoder-etsi-vad2	6	bin/amrnb-encoder-etsi-vad2
		7	bin/amrnb-encoder-if2
		8	bin/amrnb-encoder-if2-vad2
		9	bin/amrnb-encoder-vad2
10	include/amrnb/interf_dec.h	10	include/amrnb/interf_dec.h
11	include/amrnb/interf_enc.h	11	include/amrnb/interf_enc.h
12	include/amrnb/interf_rom.h	12	include/amrnb/interf_rom.h
Lines 15-22 Link Here
15	include/amrnb/sp_dec.h	15	include/amrnb/sp_dec.h
16	include/amrnb/sp_enc.h	16	include/amrnb/sp_enc.h
17	include/amrnb/typedef.h	17	include/amrnb/typedef.h
18	lib/libamrnb.so.2
19	lib/libamrnb.so
20	lib/libamrnb.la
21	lib/libamrnb.a	18	lib/libamrnb.a
		19	lib/libamrnb.la
		20	lib/libamrnb.so
		21	lib/libamrnb.so.3
22	@dirrm include/amrnb	22	@dirrm include/amrnb

Return to bug 115819

Lines 6-13 Link Here

(-)libamrnb/Makefile (-16 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= libamrnb	8	PORTNAME= libamrnb
9	PORTVERSION= 6.1.0.4	9	PORTVERSION= 7.0.0.0
10	PORTREVISION= 1
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= audio	11	CATEGORIES= audio
13	MASTER_SITES= http://ftp.penguin.cz/pub/users/utx/amr/ \	12	MASTER_SITES= http://ftp.penguin.cz/pub/users/utx/amr/ \
Lines 21-53 Link Here
21		20
22	BUILD_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip	21	BUILD_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
23		22
24	SRC3GPP= 26104-610.zip	23	RESTRICTED= license prohibits redistribution
25		24	RESTRICTED_FILES= ${SRC3GPP}
26	USE_BZIP2= yes	25	USE_BZIP2= yes
27	USE_GMAKE= yes	26	USE_GMAKE= yes
28	USE_AUTOTOOLS= libtool:15	27	USE_AUTOTOOLS= libtool:15
29	GNU_CONFIGURE= yes
30	CONFIGURE_ENV+= LANG=C
31	USE_LDCONFIG= yes
32	RESTRICTED= license prohibits redistribution
33	RESTRICTED_FILES= ${SRC3GPP}
34	PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt	28	PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
35	SUB_FILES= pkg-message	29	SUB_FILES= pkg-message
		30	GNU_CONFIGURE= yes
		31	CONFIGURE_ENV+= LANG=C
36	MAKE_ENV= LANG=C	32	MAKE_ENV= LANG=C
		33	USE_LDCONFIG= yes
		34
		35	SRC3GPP= 26104-700.zip
37		36
38	post-extract:	37	post-extract:
39	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}	38	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}/
40		39
41	post-install:	40	post-install:
42	.ifndef(NOPORTDOCS)	41	.ifndef(NOPORTDOCS)
43	@${ECHO} -n Install documents:	42	${MKDIR} ${DOCSDIR}
44	@${MKDIR} ${DOCSDIR}
45	. for FILE in ${PORTDOCS}	43	. for FILE in ${PORTDOCS}
46	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}	44	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
47	@${ECHO} -n " ${FILE}"
48	. endfor	45	. endfor
49	@${ECHO} .
50	@${ECHO}
51	.endif	46	.endif
52	@${CAT} ${PKGMESSAGE}	47	@${CAT} ${PKGMESSAGE}
53		48

Lines 1-24 Link Here

(-)libamrnb/files/patch-Makefile.in (-24 lines)
1	--- Makefile.in.orig Sat May 26 04:34:54 2007
2	+++ Makefile.in Sun Jul 15 00:48:06 2007
3	@@ -250,7 +250,7 @@
4	sysconfdir = @sysconfdir@
5	target_alias = @target_alias@
6	EXTRA_DIST = amrnb-any-cflags.patch amrnb-intsizes.patch amrnb-strict-aliasing.patch prepare_sources.sh amrnb.spec
7	-DISTCLEANFILES = 26104-610.zip 26104-610.doc 26104-610_ANSI_C_source_code.zip
8	+DISTCLEANFILES = 26104-610.doc 26104-610_ANSI_C_source_code.zip
9	lib_LTLIBRARIES = \
10	libamrnb.la
11
12	@@ -922,10 +922,10 @@
13	chmod og-w 26104-610.doc
14
15	26104-610.zip:
16	- $(WGET) -N http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip
17	+ test -e 26104-610.zip
18
19	extraclean:
20	- rm -f $(distdir)/.c $(distdir)/.h $(distdir)/readme.txt $(distdir)/26104-610.zip $(distdir)/26104-610.doc $(distdir)/26104-610_ANSI_C_source_code.zip
21	+ rm -f $(distdir)/.c $(distdir)/.h $(distdir)/readme.txt $(distdir)/26104-610.doc $(distdir)/26104-610_ANSI_C_source_code.zip
22
23	# WARNING: These commands use internal automake command and may fail in future version.
24	extradist-gzip: distdir extraclean

Lines 1-15 Link Here

(-)libamrnb/files/patch-configure (-15 lines)
1	--- configure.orig Fri Jun 22 12:43:20 2007
2	+++ configure Fri Jun 22 12:43:24 2007
3	@@ -20338,12 +20338,6 @@
4	fi
5
6
7	-if test x"$WGET" = x -a ! "(" -f "26104-610.zip" -o -f "sp_enc.c" ")" ; then
8	- { { echo "$as_me:$LINENO: error: You need wget utility to download sources." >&5
9	-echo "$as_me: error: You need wget utility to download sources." >&2;}
10	- { (exit 1); exit 1; }; }
11	-fi
12	-
13	# Checks for libraries.
14	{ echo "$as_me:$LINENO: checking for library containing sqrt" >&5
15	echo $ECHO_N "checking for library containing sqrt... $ECHO_C" >&6; }

Lines 1-31 Link Here

(-)libamrnb/files/patch-prepare_sources.sh (-31 lines)
1	--- prepare_sources.sh.orig Wed Jun 6 23:52:12 2007
2	+++ prepare_sources.sh Sat Jul 14 23:35:53 2007
3	@@ -1,10 +1,10 @@
4	-#! /bin/bash
5	+#! /bin/sh
6
7	set -o errexit
8	-trap "rm -rf c-code .c .h readme.txt .new .def *.all" ERR
9	+trap "rm -rf c-code .c .h readme.txt .new .def *.all" 0
10
11	if [ "$0" = prepare_sources.sh ] ; then
12	- cd "$(if ! which 2>/dev/null prepare_sources.sh ; then echo . fi )"
13	+ cd "$(if ! which 2>/dev/null prepare_sources.sh ; then echo . ; fi )"
14	else
15	cd "${0%/*}"
16	fi
17	@@ -23,7 +23,7 @@
18	patch <amrnb-strict-aliasing.patch
19	patch <amrnb-any-cflags.patch
20
21	-for FILE in interf_{dec,enc}.{c,h} ; do
22	+for FILE in interf_dec.[ch] interf_enc.[ch] ; do
23	echo "modifying file $FILE"
24	if test $FILE = ${FILE%.h} ; then
25	ENDSTRING="^}"
26	@@ -100,3 +100,5 @@
27	rm $FILE.def $FILE.all
28	done
29	done
30	+
31	+trap 0