From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 19 18:10:03 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 97EF716A402 for ; Thu, 19 Jul 2007 18:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 7608113C4C8 for ; Thu, 19 Jul 2007 18:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l6JIA2lu054343 for ; Thu, 19 Jul 2007 18:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l6JIA2fg054342; Thu, 19 Jul 2007 18:10:02 GMT (envelope-from gnats) Resent-Date: Thu, 19 Jul 2007 18:10:02 GMT Resent-Message-Id: <200707191810.l6JIA2fg054342@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52FA616A408 for ; Thu, 19 Jul 2007 18:00:52 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa06.dion.ne.jp (msa06.dion.ne.jp [222.3.140.169]) by mx1.freebsd.org (Postfix) with ESMTP id E445113C48E for ; Thu, 19 Jul 2007 18:00:51 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from localhost.localdomain (ZT069236.ppp.dion.ne.jp [59.128.69.236]) by msa106.dion.ne.jp (DION MAIL) with ESMTP id C8FE3784037 for ; Fri, 20 Jul 2007 03:00:43 +0900 (JST) Message-Id: <20070720030010.2c7a1ffe.tkato432@yahoo.com> Date: Fri, 20 Jul 2007 03:00:10 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org X-Mailman-Approved-At: Thu, 19 Jul 2007 18:34:27 +0000 Cc: Subject: ports/114736: Update port: audio/streamripper to 1.62.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2007 18:10:03 -0000 >Number: 114736 >Category: ports >Synopsis: Update port: audio/streamripper to 1.62.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 19 18:10:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.2-RELEASE-p5 i386 >Organization: >Environment: >Description: - Update to version 1.62.1 Remove file: files/patch-lib_parse.c files/patch-lib_util.c >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/streamripper/Makefile audio/streamripper/Makefile --- /usr/ports/audio/streamripper/Makefile Sat Jun 30 14:01:14 2007 +++ audio/streamripper/Makefile Thu Jul 19 23:54:16 2007 @@ -6,35 +6,53 @@ # PORTNAME= streamripper -PORTVERSION= 1.61.27 +PORTVERSION= 1.62.1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= streamripper +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Splits SHOUTcast stream into tracks -LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad +LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ + tre.6:${PORTSDIR}/textproc/libtre +OPTIONS= FAAD "Include FAAD mpeg4 codec support" on \ + VORBIS "Include Ogg Vorbis codec support" on + +USE_GNOME= gnometarget USE_ICONV= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --without-included-libmad \ + --without-included-tre \ + --with-included-argv +CFLAGS+= -DANSI_PROTOTYPES -DHAVE_LANGINFO_CODESET -OPTIONS= VORBIS "Include Ogg Vorbis codec support" on +MAN1= streamripper.1 +PLIST_FILES= bin/cstreamripper bin/streamripper .include -.ifdef(WITH_VORBIS) -LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg \ - vorbis.3:${PORTSDIR}/audio/libvorbis +.if defined(WITHOUT_FAAD) +CONFIGURE_ARGS+= ac_cv_lib_faad_NeAACDecDecode2=no +.else +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad .endif -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_FILES= bin/streamripper -MAN1= streamripper.1 +.if defined(WITHOUT_VORBIS) +CONFIGURE_ARGS+= --without-ogg +.else +LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis +.endif -pre-install: - @${CHMOD} +x ${WRKSRC}/install-sh +post-patch: + @${REINPLACE_CMD} -e '/if test/s|==|=|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/cstreamripper ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/streamripper ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/streamripper.1 ${MANPREFIX}/man/man1 .include diff -urN /usr/ports/audio/streamripper/distinfo audio/streamripper/distinfo --- /usr/ports/audio/streamripper/distinfo Thu Jan 25 06:18:06 2007 +++ audio/streamripper/distinfo Thu Jul 19 22:48:01 2007 @@ -1,3 +1,3 @@ -MD5 (streamripper-1.61.27.tar.gz) = d92a37bf23ee3f1bd5a9498d72c0562a -SHA256 (streamripper-1.61.27.tar.gz) = d53fc5d3fb49bbb2332a4d26c5a63a0679009d6bf6b4b0e4e5078a9cdc183111 -SIZE (streamripper-1.61.27.tar.gz) = 1227559 +MD5 (streamripper-1.62.1.tar.gz) = c8c84b8acf84f3d431bf7b6303acc63b +SHA256 (streamripper-1.62.1.tar.gz) = 03890195689f72d93426d674c84d3baf2ddee39cb3e09d09811ca5b08c2b21a3 +SIZE (streamripper-1.62.1.tar.gz) = 1244851 diff -urN /usr/ports/audio/streamripper/files/patch-Makefile.in audio/streamripper/files/patch-Makefile.in --- /usr/ports/audio/streamripper/files/patch-Makefile.in Sat Jan 7 15:16:51 2006 +++ audio/streamripper/files/patch-Makefile.in Thu Jul 19 23:44:29 2007 @@ -1,50 +1,20 @@ ---- 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 = +--- Makefile.in.orig Sun May 27 04:26:06 2007 ++++ Makefile.in Thu Jul 19 23:40:43 2007 +@@ -64,7 +64,7 @@ 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@ + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) +-am_cstreamripper_OBJECTS = cstreamripper.$(OBJEXT) ++am_cstreamripper_OBJECTS = cstreamripper.$(OBJEXT) $(am__objects_1) + cstreamripper_OBJECTS = $(am_cstreamripper_OBJECTS) + cstreamripper_DEPENDENCIES = lib/libstreamripper.a + am_ictest_OBJECTS = ictest.$(OBJEXT) +@@ -227,7 +227,7 @@ + + streamripper_SOURCES = console/streamripper.c $(am__append_2) + cstreamripper_SOURCES = \ +- console/cstreamripper.c ++ console/cstreamripper.c $(am__append_2) + + libmad_manifest = \ + libmad-0.15.1b/README \ diff -urN /usr/ports/audio/streamripper/files/patch-lib_parse.c audio/streamripper/files/patch-lib_parse.c --- /usr/ports/audio/streamripper/files/patch-lib_parse.c Mon Feb 13 21:12:30 2006 +++ audio/streamripper/files/patch-lib_parse.c Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- 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$", - "" - }, - { PARSERULE_CMD_MATCH, - PARSERULE_ICASE, - 1, 2, 0, 0, -- 0, -- "^[[:space:]]*([^-]*[^-[:space:]])[[:space:]]*-[[:space:]]*(.*)[[:space:]]*$", -+ 0, -+ "^ *([^-]*[^- ]) *- *(.*) *$", - "" - }, - { 0x00, diff -urN /usr/ports/audio/streamripper/files/patch-lib_util.c audio/streamripper/files/patch-lib_util.c --- /usr/ports/audio/streamripper/files/patch-lib_util.c Thu Jan 5 09:10:47 2006 +++ audio/streamripper/files/patch-lib_util.c Thu Jan 1 09:00:00 1970 @@ -1,33 +0,0 @@ -Argh, FreeBSD 4.X has a wctype.h header that does nothing. - ---- 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 - #endif --#if defined HAVE_WCTYPE_H --#include --#endif -+#include - #endif - #include - #include -@@ -450,7 +448,7 @@ - - /* Replace illegals to legal */ - for (wstrp = w_in; *wstrp; wstrp++) { -- if ((wcschr(w_invalid, *wstrp) == NULL) && (!iswcntrl(*wstrp))) -+ if ((wcschr(w_invalid, *wstrp) == NULL) && (!iscntrl(*wstrp))) - continue; - *wstrp = replacement; - } -@@ -525,7 +523,7 @@ - - /* Replace illegals to legal */ - for (wstrp = w_in; *wstrp; wstrp++) { -- if ((wcschr(w_invalid, *wstrp) == NULL) && (!iswcntrl(*wstrp))) -+ if ((wcschr(w_invalid, *wstrp) == NULL) && (!iscntrl(*wstrp))) - continue; - *wstrp = replacement; - } >Release-Note: >Audit-Trail: >Unformatted: