From tkato432@yahoo.com  Thu Mar 15 16:00:44 2007
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B427616A401
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 15 Mar 2007 16:00:44 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from nm05omta057.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.8])
	by mx1.freebsd.org (Postfix) with SMTP id 64E9313C480
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 15 Mar 2007 16:00:44 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from localhost ([59.128.65.189])
	by nm05mta.dion.ne.jp
	id <20070316010041719.MA77.82D96E8@nm05mta.dion.ne.jp>;
	Fri, 16 Mar 2007 01:00:41 +0900
Message-Id: <20070316010011.356bd3da.tkato432@yahoo.com>
Date: Fri, 16 Mar 2007 01:00:11 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: audio/darkice 0.18

>Number:         110338
>Category:       ports
>Synopsis:       Update port: audio/darkice 0.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 15 16:10:04 GMT 2007
>Closed-Date:    Fri Mar 16 13:26:19 GMT 2007
>Last-Modified:  Fri Mar 16 13:30:10 GMT 2007
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p26 i386
>Organization:
>Environment:
>Description:
- Update to version 0.18

Remove file:
files/patch-src_JackDspSource.cpp

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/darkice/Makefile audio/darkice/Makefile
--- /usr/ports/audio/darkice/Makefile	Sun May 28 22:05:52 2006
+++ audio/darkice/Makefile	Tue Mar  6 13:30:52 2007
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	darkice
-PORTVERSION=	0.17.1
+PORTVERSION=	0.18
 CATEGORIES=	audio net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://darkice.tyrell.hu/dist/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IceCast, IceCast2 and ShoutCast live audio streamer
@@ -24,8 +24,8 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--without-alsa \
-		--with-vorbis-prefix=${LOCALBASE}
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
+		--without-alsa
 
 MAN1=		darkice.1
 MAN5=		darkice.cfg.5
@@ -33,9 +33,14 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		does not compile on 4.x
+.endif
+
 .if defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--without-vorbis
 .else
+CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE}
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .endif
 
@@ -62,6 +67,7 @@
 
 .if defined(WITH_JACK)
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+=	--with-jack-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
diff -urN /usr/ports/audio/darkice/distinfo audio/darkice/distinfo
--- /usr/ports/audio/darkice/distinfo	Sun May 28 22:05:52 2006
+++ audio/darkice/distinfo	Tue Mar  6 13:14:42 2007
@@ -1,3 +1,3 @@
-MD5 (darkice-0.17.1.tar.gz) = 91221134cec3d52af842a9d50c06ee7d
-SHA256 (darkice-0.17.1.tar.gz) = 905f0d928e8ef009c864f6ac89884bb1bf773e6a91e625b37888d444f5115c45
-SIZE (darkice-0.17.1.tar.gz) = 1407826
+MD5 (darkice-0.18.tar.gz) = 52ef0c181372e1cb4a1e42a3b65ebaab
+SHA256 (darkice-0.18.tar.gz) = e7228918de0b2092f633e01c5b9078c902ea4be95e31a5b102bfa02740c1e4d5
+SIZE (darkice-0.18.tar.gz) = 286159
diff -urN /usr/ports/audio/darkice/files/patch-src_JackDspSource.cpp audio/darkice/files/patch-src_JackDspSource.cpp
--- /usr/ports/audio/darkice/files/patch-src_JackDspSource.cpp	Sat Apr 16 02:49:42 2005
+++ audio/darkice/files/patch-src_JackDspSource.cpp	Thu Jan  1 09:00:00 1970
@@ -1,32 +0,0 @@
---- src/JackDspSource.cpp.orig Mon Apr  4 17:36:17 2005
-+++ src/JackDspSource.cpp      Fri Apr 15 04:15:23 2005
-@@ -38,6 +38,18 @@
- #include "config.h"
- #endif
- 
-+#ifdef HAVE_STDIO_H
-+#include <stdio.h>
-+#else
-+#error need stdio.h
-+#endif
-+
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#else
-+#error need stdlib.h
-+#endif
-+
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #else
-@@ -60,6 +72,10 @@
- #include <math.h>
- #else
- #error need math.h
-+#endif
-+
-+#ifdef __FreeBSD__
-+#define lrintf(x) rintf(x)
- #endif
- 
- #include "Util.h"
diff -urN /usr/ports/audio/darkice/pkg-descr audio/darkice/pkg-descr
--- /usr/ports/audio/darkice/pkg-descr	Mon Oct 31 10:51:50 2005
+++ audio/darkice/pkg-descr	Tue Mar  6 13:12:02 2007
@@ -14,4 +14,4 @@
  IceCast 1.3.x and 2.x
  Darwin Streaming Server
 
-WWW: http://darkice.sourceforge.net/
+WWW: http://darkice.tyrell.hu/
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Mar 15 16:26:55 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110338 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Mar 16 13:26:17 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110338 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110338: commit references a PR
Date: Fri, 16 Mar 2007 13:26:25 +0000 (UTC)

 miwi        2007-03-16 13:26:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/darkice        Makefile distinfo pkg-descr 
   Removed files:
     audio/darkice/files  patch-src_JackDspSource.cpp 
   Log:
   - Update to 0.18
   
   PR:             110338
   Submitted by:   KATO Tsuguru <tkato432@yahoo.com>
   
   Revision  Changes    Path
   1.23      +11 -5     ports/audio/darkice/Makefile
   1.16      +3 -3      ports/audio/darkice/distinfo
   1.2       +0 -32     ports/audio/darkice/files/patch-src_JackDspSource.cpp (dead)
   1.3       +1 -1      ports/audio/darkice/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
