Index: head/audio/icecast2/Makefile
===================================================================
--- head/audio/icecast2/Makefile	(revision 399552)
+++ head/audio/icecast2/Makefile	(revision 399553)
@@ -1,52 +1,52 @@
 # Created by: Chip Marshall <chip@eboai.org>
 # $FreeBSD$
 
 PORTNAME=	icecast2
 PORTVERSION=	2.4.2
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
 MASTER_SITES=	http://downloads.xiph.org/releases/icecast/:source \
 		http://svn.xiph.org/releases/icecast/:source \
 		LOCAL/sunpoet/icecast:icon,source \
 		http://www.icecast.org/:icon
 DISTFILES=	icecast-${PORTVERSION}${EXTRACT_SUFX}:source \
 		favicon.ico:icon
 DIST_SUBDIR=	icecast
 EXTRACT_ONLY=	icecast-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Streaming mp3/ogg-vorbis audio server
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libshout.so:${PORTSDIR}/audio/libshout \
 		libspeex.so:${PORTSDIR}/audio/speex \
 		libtheora.so:${PORTSDIR}/multimedia/libtheora \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libxslt.so:${PORTSDIR}/textproc/libxslt
 
 OPTIONS_DEFINE=	DOCS
 
-CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	${PORTNAME}
 USES=		cpe gmake
 WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
 
 DATADIR=	${PREFIX}/share/icecast
 DOCSDIR=	${PREFIX}/share/doc/icecast
 PLIST_FILES=	bin/icecast \
 		etc/icecast.xml.sample
 PORTDATA=	*
 PORTDOCS=	*
 SUB_FILES=	pkg-message
 
 CPE_VENDOR=	xiph
 CPE_PRODUCT=	icecast
 
 post-install:
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/favicon.ico ${STAGEDIR}${DATADIR}/web/
 
 .include <bsd.port.mk>
Index: head/audio/icecast2/files/patch-conf-Makefile.in
===================================================================
--- head/audio/icecast2/files/patch-conf-Makefile.in	(revision 399552)
+++ head/audio/icecast2/files/patch-conf-Makefile.in	(revision 399553)
@@ -1,12 +1,12 @@
---- conf/Makefile.in.orig	2008-05-30 08:58:57.000000000 +0900
-+++ conf/Makefile.in	2010-05-14 17:36:16.000000000 +0900
+--- conf/Makefile.in.orig	2008-05-29 23:58:57 UTC
++++ conf/Makefile.in
 @@ -407,8 +407,7 @@
 
  install-data-hook:
  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 -	test -f $(DESTDIR)$(sysconfdir)/icecast.xml || \
 -	$(INSTALL_DATA) icecast.xml.dist $(DESTDIR)$(sysconfdir)/icecast.xml
 +	$(INSTALL_DATA) icecast.xml.dist $(DESTDIR)$(sysconfdir)/icecast.xml.sample
  
  icecast.xml.dist: $(srcdir)/icecast.xml.in
  	$(edit) $(srcdir)/icecast.xml.in > icecast.xml.dist