Attachment 59346 Details for Bug 89328 – file.diff

[patch] file.diff

file.diff (text/plain), 4.63 KB, created by Yarema on 2005-11-20 21:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yarema

Created: 2005-11-20 21:10:17 UTC

Size: 4.63 KB

patch

obsolete

>diff -u -ruN streamripper-1.61.3/Makefile streamripper/Makefile
>--- streamripper-1.61.3/Makefile	Mon Apr 11 16:20:26 2005
>+++ streamripper/Makefile	Sun Nov 20 10:57:53 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	streamripper
>-PORTVERSION=	1.61.3
>-PORTREVISION=	1
>+PORTVERSION=	1.61.16
> CATEGORIES=	audio
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	streamripper
>diff -u -ruN streamripper-1.61.3/distinfo streamripper/distinfo
>--- streamripper-1.61.3/distinfo	Tue Jan 18 06:38:05 2005
>+++ streamripper/distinfo	Sun Nov 20 10:41:56 2005
>@@ -1,2 +1,3 @@
>-MD5 (streamripper-1.61.3.tar.gz) = 57cd09098917bda29f841d366649681c
>-SIZE (streamripper-1.61.3.tar.gz) = 1147933
>+MD5 (streamripper-1.61.16.tar.gz) = a7a2a2cc615a315b8844101c7fa31338
>+SHA256 (streamripper-1.61.16.tar.gz) = 515490ca632c412f02f72b0bf6255f72859bb152f26bfc25245b73106ad99deb
>+SIZE (streamripper-1.61.16.tar.gz) = 1191933
>diff -u -ruN streamripper-1.61.3/files/patch-Makefile.in streamripper/files/patch-Makefile.in
>--- streamripper-1.61.3/files/patch-Makefile.in	Wed Dec 31 19:00:00 1969
>+++ streamripper/files/patch-Makefile.in	Sun Nov  6 22:33:28 2005
>@@ -0,0 +1,50 @@
>+--- Makefile.in.orig	Sun Nov  6 22:33:28 2005
>++++ Makefile.in	Sun Nov  6 22:33:28 2005
>+@@ -25,10 +25,10 @@
>+ top_builddir = .
>+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>+ INSTALL = @INSTALL@
>+-install_sh_DATA = $(install_sh) -c -m 644
>+-install_sh_PROGRAM = $(install_sh) -c
>+-install_sh_SCRIPT = $(install_sh) -c
>+-INSTALL_HEADER = $(INSTALL_DATA)
>++install_sh_DATA = $(BSD_INSTALL_DATA)
>++install_sh_PROGRAM = $(BSD_INSTALL_PROGRAM)
>++install_sh_SCRIPT = $(BSD_INSTALL_SCRIPT)
>++INSTALL_HEADER = $(BSD_INSTALL_DATA)
>+ transform = $(program_transform_name)
>+ NORMAL_INSTALL = :
>+ PRE_INSTALL = :
>+@@ -57,7 +57,7 @@
>+ 	$(ACLOCAL_M4)
>+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
>+  configure.lineno configure.status.lineno
>+-mkinstalldirs = $(install_sh) -d
>++mkinstalldirs = $(INSTALL) -d
>+ CONFIG_HEADER = $(top_builddir)/lib/config.h
>+ CONFIG_CLEAN_FILES =
>+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
>+@@ -140,7 +140,7 @@
>+ INSTALL_DATA = @INSTALL_DATA@
>+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
>+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
>+-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
>++INSTALL_STRIP_PROGRAM = @INSTALL_PROGRAM@
>+ LDFLAGS = @LDFLAGS@
>+ LIBCHARSET = @LIBCHARSET@
>+ LIBIBERTY_LIBS = @LIBIBERTY_LIBS@
>+@@ -201,12 +201,12 @@
>+ host_vendor = @host_vendor@
>+ includedir = @includedir@
>+ infodir = @infodir@
>+-install_sh = @install_sh@
>++install_sh = @INSTALL@
>+ libdir = @libdir@
>+ libexecdir = @libexecdir@
>+ localstatedir = @localstatedir@
>+ mandir = @mandir@
>+-mkdir_p = @mkdir_p@
>++mkdir_p = @INSTALL@ -d
>+ oldincludedir = @oldincludedir@
>+ prefix = @prefix@
>+ program_transform_name = @program_transform_name@
>diff -u -ruN streamripper-1.61.3/files/patch-lib_parse.c streamripper/files/patch-lib_parse.c
>--- streamripper-1.61.3/files/patch-lib_parse.c	Mon Apr 11 16:19:40 2005
>+++ streamripper/files/patch-lib_parse.c	Sun Sep 11 12:45:28 2005
>@@ -1,20 +1,20 @@
>---- lib/parse.c.orig
>-+++ lib/parse.c
>-@@ -68,14 +68,14 @@
>+--- lib/parse.c.orig	Sun Sep 11 12:45:28 2005
>++++ lib/parse.c	Sun Sep 11 12:45:28 2005
>+@@ -70,14 +70,14 @@
>  	PARSERULE_ICASE,
>  	0, 0, 0, 0,
>  	0, 
> -	"[[:space:]]*-?[[:space:]]*mp3pro$",
>-+	" *-? *mp3pro$",
>++ 	" *-? *mp3pro$",
>  	""
>      },
>      { PARSERULE_CMD_MATCH, 
>  	PARSERULE_ICASE,
>  	1, 2, 0, 0,
> -	0, 
>--	"^[[:space:]]*([^-]*?)[[:space:]]*-[[:space:]]*(.*?)[[:space:]]*$",
>-+	0,
>-+	"^ *([^-]*)? *- *(.*) *$", 
>+-	"^[[:space:]]*([^-]*[^-[:space:]])[[:space:]]*-[[:space:]]*(.*)[[:space:]]*$",
>++ 	0,
>++ 	"^ *([^-]*)? *- *(.*) *$",
>  	""
>      },
>      { 0x00, 
>diff -u -ruN streamripper-1.61.3/files/patch-lib_util.c streamripper/files/patch-lib_util.c
>--- streamripper-1.61.3/files/patch-lib_util.c	Wed Jan 19 02:36:45 2005
>+++ streamripper/files/patch-lib_util.c	Sun Sep 11 12:46:20 2005
>@@ -1,7 +1,7 @@
> Argh, FreeBSD 4.X has a wctype.h header that does nothing.
> 
>---- lib/util.c.orig	Sat Nov 13 17:41:09 2004
>-+++ lib/util.c	Wed Jan 19 07:01:41 2005
>+--- lib/util.c.orig	Sun Sep 11 12:46:20 2005
>++++ lib/util.c	Sun Sep 11 12:46:20 2005
> @@ -28,9 +28,7 @@
>  #if defined HAVE_WCHAR_H
>  #include <wchar.h>
>@@ -13,7 +13,7 @@
>  #endif
>  #include <locale.h>
>  #include <time.h>
>-@@ -464,7 +462,7 @@ strip_invalid_chars_testing(char *str)
>+@@ -450,7 +448,7 @@
>  
>      /* Replace illegals to legal */
>      for (wstrp = w_in; *wstrp; wstrp++) {
>@@ -22,7 +22,7 @@
>  	    continue;
>  	*wstrp = replacement;
>      }
>-@@ -543,7 +541,7 @@ strip_invalid_chars_stable(char *str)
>+@@ -525,7 +523,7 @@
>  
>      /* Replace illegals to legal */
>      for (wstrp = w_in; *wstrp; wstrp++) {

Actions: View | Diff

Attachments on bug 89328: 59346