Attachment 80789 Details for Bug 115819 – file.diff

[patch] file.diff

file.diff (text/plain), 6.18 KB, created by Tatsuki Makino on 2007-08-26 00:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2007-08-26 00:20:01 UTC

Size: 6.18 KB

patch

obsolete

>diff -urN libamrnb.orig/Makefile libamrnb/Makefile
>--- libamrnb.orig/Makefile	Sat Jul 14 21:33:04 2007
>+++ libamrnb/Makefile	Sat Aug 25 21:56:54 2007
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libamrnb
>-PORTVERSION=	6.1.0.4
>-PORTREVISION=	1
>+PORTVERSION=	7.0.0.0
> PORTEPOCH=	1
> CATEGORIES=	audio
> MASTER_SITES=	http://ftp.penguin.cz/pub/users/utx/amr/ \
>@@ -21,33 +20,29 @@
> 
> BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
> 
>-SRC3GPP=	26104-610.zip
>-
>+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}
>+	@${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 -urN libamrnb.orig/distinfo libamrnb/distinfo
>--- libamrnb.orig/distinfo	Sat Jul 14 21:33:04 2007
>+++ libamrnb/distinfo	Thu Aug 23 14:35:03 2007
>@@ -1,6 +1,6 @@
>-MD5 (amrnb-6.1.0.4.tar.bz2) = f482cdd0584469ba23ff33c6b331acbd
>-SHA256 (amrnb-6.1.0.4.tar.bz2) = 6f2df7089205cd6127d434e8ec8fac4cccc163d4df5ec4437211c884fbd9fe75
>-SIZE (amrnb-6.1.0.4.tar.bz2) = 224932
>-MD5 (26104-610.zip) = cfd9012bff83afdf5ad069b86d3063b6
>-SHA256 (26104-610.zip) = 8dc9453f9b93202247b4800a1d946ae6eaa3b9d0c48237ae8848144feb88399e
>-SIZE (26104-610.zip) = 292640
>+MD5 (amrnb-7.0.0.0.tar.bz2) = c89d657b75c936a061a8eaf12decadf8
>+SHA256 (amrnb-7.0.0.0.tar.bz2) = 6a54f9e33a5db0b70a8bf3661ccb3aa63d230f57d629dc1bb59d1d4d92306ea7
>+SIZE (amrnb-7.0.0.0.tar.bz2) = 226952
>+MD5 (26104-700.zip) = e8cedb8d502294ab7833ced0b407d238
>+SHA256 (26104-700.zip) = d17e4e65b6f8138ff6243f194cefa6f2b39450075cdb2e9bb431e2dc5a43f541
>+SIZE (26104-700.zip) = 303856
>diff -urN libamrnb.orig/files/patch-Makefile.in libamrnb/files/patch-Makefile.in
>--- libamrnb.orig/files/patch-Makefile.in	Sat Jul 14 21:33:04 2007
>+++ libamrnb/files/patch-Makefile.in	Thu Jan  1 00:00:00 1970
>@@ -1,24 +0,0 @@
>---- 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
>diff -urN libamrnb.orig/files/patch-configure libamrnb/files/patch-configure
>--- libamrnb.orig/files/patch-configure	Sat Jul 14 21:33:04 2007
>+++ libamrnb/files/patch-configure	Thu Jan  1 00:00:00 1970
>@@ -1,15 +0,0 @@
>---- 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; }
>diff -urN libamrnb.orig/files/patch-prepare_sources.sh libamrnb/files/patch-prepare_sources.sh
>--- libamrnb.orig/files/patch-prepare_sources.sh	Sat Jul 14 21:33:04 2007
>+++ libamrnb/files/patch-prepare_sources.sh	Thu Jan  1 00:00:00 1970
>@@ -1,31 +0,0 @@
>---- 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
>diff -urN libamrnb.orig/pkg-plist libamrnb/pkg-plist
>--- libamrnb.orig/pkg-plist	Tue Jun  5 07:10:40 2007
>+++ libamrnb/pkg-plist	Fri Aug 24 21:56:26 2007
>@@ -1,12 +1,12 @@
> bin/amrnb-decoder
>-bin/amrnb-encoder
>-bin/amrnb-decoder-if2
>-bin/amrnb-encoder-if2
> bin/amrnb-decoder-etsi
>+bin/amrnb-decoder-if2
>+bin/amrnb-encoder
> bin/amrnb-encoder-etsi
>-bin/amrnb-encoder-vad2
>-bin/amrnb-encoder-if2-vad2
> bin/amrnb-encoder-etsi-vad2
>+bin/amrnb-encoder-if2
>+bin/amrnb-encoder-if2-vad2
>+bin/amrnb-encoder-vad2
> include/amrnb/interf_dec.h
> include/amrnb/interf_enc.h
> include/amrnb/interf_rom.h
>@@ -15,8 +15,8 @@
> include/amrnb/sp_dec.h
> include/amrnb/sp_enc.h
> include/amrnb/typedef.h
>-lib/libamrnb.so.2
>-lib/libamrnb.so
>-lib/libamrnb.la
> lib/libamrnb.a
>+lib/libamrnb.la
>+lib/libamrnb.so
>+lib/libamrnb.so.3
> @dirrm include/amrnb

Actions: View | Diff

Attachments on bug 115819: 80789 | 80790