ports/90992: [UPDATE] audio/streamripper to 1.61.17

[Rainer Alves]

>Number:         90992
>Category:       ports
>Synopsis:       [UPDATE] audio/streamripper to 1.61.17
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 27 22:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Rainer Alves
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
>Description:

- Update to 1.61.17
- Make portlint happier
- Add SHA256 checksum

>How-To-Repeat:
>Fix:

--- streamripper-1.61.17.diff begins here ---
diff -ruN audio/streamripper.orig/Makefile audio/streamripper/Makefile
--- audio/streamripper.orig/Makefile	Tue Dec 27 17:25:33 2005
+++ audio/streamripper/Makefile	Tue Dec 27 19:43:06 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	streamripper
-PORTVERSION=	1.61.3
-PORTREVISION=	1
+PORTVERSION=	1.61.17
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	streamripper
@@ -15,8 +14,9 @@
 MAINTAINER=	trevor at FreeBSD.org
 COMMENT=	Splits SHOUTcast stream into tracks
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad
+
+USE_ICONV=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -24,5 +24,8 @@
 
 PLIST_FILES=	bin/streamripper
 MAN1=		streamripper.1
+
+pre-install:
+		@${CHMOD} +x ${WRKSRC}/install-sh
 
 .include <bsd.port.mk>
diff -ruN audio/streamripper.orig/distinfo audio/streamripper/distinfo
--- audio/streamripper.orig/distinfo	Tue Dec 27 17:25:33 2005
+++ audio/streamripper/distinfo	Tue Dec 27 17:28:41 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.17.tar.gz) = d98c28ffe7e3a387ea508f95efeedc2d
+SHA256 (streamripper-1.61.17.tar.gz) = 35122194d5046f741460968db90f4bf62e5c7c6817d4b6d60f8d942448d7ab5d
+SIZE (streamripper-1.61.17.tar.gz) = 1186562
diff -ruN audio/streamripper.orig/files/patch-lib_parse.c audio/streamripper/files/patch-lib_parse.c
--- audio/streamripper.orig/files/patch-lib_parse.c	Tue Dec 27 17:25:33 2005
+++ audio/streamripper/files/patch-lib_parse.c	Tue Dec 27 18:23:31 2005
@@ -1,6 +1,6 @@
---- lib/parse.c.orig
-+++ lib/parse.c
-@@ -68,14 +68,14 @@
+--- lib/parse.c.orig	Tue Dec 27 17:34:12 2005
++++ lib/parse.c	Tue Dec 27 17:36:02 2005
+@@ -70,14 +70,14 @@
  	PARSERULE_ICASE,
  	0, 0, 0, 0,
  	0, 
@@ -11,10 +11,9 @@
      { PARSERULE_CMD_MATCH, 
  	PARSERULE_ICASE,
  	1, 2, 0, 0,
--	0, 
--	"^[[:space:]]*([^-]*?)[[:space:]]*-[[:space:]]*(.*?)[[:space:]]*$",
-+	0,
-+	"^ *([^-]*)? *- *(.*) *$", 
+ 	0, 
+-	"^[[:space:]]*([^-]*[^-[:space:]])[[:space:]]*-[[:space:]]*(.*)[[:space:]]*$",
++	"^ *([^-]*[^- ]) *- *(.*) *$",
  	""
      },
      { 0x00, 
diff -ruN audio/streamripper.orig/files/patch-lib_util.c audio/streamripper/files/patch-lib_util.c
--- audio/streamripper.orig/files/patch-lib_util.c	Tue Dec 27 17:25:33 2005
+++ audio/streamripper/files/patch-lib_util.c	Tue Dec 27 18:27:03 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	Tue Dec 27 17:36:25 2005
++++ lib/util.c	Tue Dec 27 17:38:49 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++) {
--- streamripper-1.61.17.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: