From owner-svn-ports-all@FreeBSD.ORG  Tue Nov  6 20:43:56 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0AD35DCE;
 Tue,  6 Nov 2012 20:43:56 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C484D8FC14;
 Tue,  6 Nov 2012 20:43:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6Khtxx046113;
 Tue, 6 Nov 2012 20:43:55 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6KhtqV046111;
 Tue, 6 Nov 2012 20:43:55 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201211062043.qA6KhtqV046111@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Tue, 6 Nov 2012 20:43:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307093 - head/audio/ices
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 20:43:56 -0000

Author: pawel
Date: Tue Nov  6 20:43:55 2012
New Revision: 307093
URL: http://svnweb.freebsd.org/changeset/ports/307093

Log:
  - Update MASTER_SITES
  - Add LICENSE
  - Add MAKE_JOBS_SAFE
  - Add option for ALSA support
  
  While here:
  - Fix COMMENT
  - Add missing deps that package links to
  
  PR:		ports/171960
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Feature safe:	yes

Modified:
  head/audio/ices/Makefile

Modified: head/audio/ices/Makefile
==============================================================================
--- head/audio/ices/Makefile	Tue Nov  6 19:56:30 2012	(r307092)
+++ head/audio/ices/Makefile	Tue Nov  6 20:43:55 2012	(r307093)
@@ -1,28 +1,44 @@
-# New ports collection makefile for: ices
-# Date created:         11 Nov 2002
-# Whom:                 Michael Nottebrock <michaelnottebrock@gmx.net>
-#
+# Created by: Michael Nottebrock <michaelnottebrock@gmx.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ices
 PORTVERSION=	2.0.2
 PORTEPOCH=	1
 CATEGORIES=	audio net
-MASTER_SITES=	http://svn.xiph.org/releases/ices/
+MASTER_SITES=	http://downloads.xiph.org/releases/ices/ \
+		http://svn.xiph.org/releases/ices/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A vorbis streaming source client for icecast 2
+COMMENT=	Vorbis streaming source client for icecast 2
 
-LIB_DEPENDS=	shout:${PORTSDIR}/audio/libshout2 \
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
+		shout:${PORTSDIR}/audio/libshout2 \
 		vorbis:${PORTSDIR}/audio/libvorbis \
-		xml2:${PORTSDIR}/textproc/libxml2
+		speex:${PORTSDIR}/audio/speex \
+		theora:${PORTSDIR}/multimedia/libtheora
+
+OPTIONS_DEFINE=	ALSA
 
-CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--disable-alsa --disable-roaraudio --disable-sun-audio
+USE_BZIP2=	yes
+USE_GNOME=	libxml2
 USE_GMAKE=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
+CONFIGURE_ARGS=	--disable-roaraudio --disable-sun-audio
+USE_PKGCONFIG=	build
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+.else
+CONFIGURE_ARGS+=--disable-alsa
+.endif
 
 .include <bsd.port.mk>