4 files changed, 39 insertions, 41 deletions

diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 4882afa864bc..2c04b58aa6e1 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	icecast2
-PORTVERSION=	2.3.1
-PORTREVISION=	7
+PORTVERSION=	2.3.2
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
-MASTER_SITES=	http://svn.xiph.org/releases/icecast/
+MASTER_SITES=	http://downloads.xiph.org/releases/icecast/ \
+		http://svn.xiph.org/releases/icecast/
 DISTNAME=	icecast-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -30,10 +30,18 @@ SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include
 
+DOCSDIR=	${PREFIX}/share/doc/icecast
 WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
+.if defined(NOPORTDOCS)
+post-patch:
+	${REINPLACE_CMD} \
+		-e 's|SUBDIRS = src conf debian doc web admin win32 examples|SUBDIRS = src conf debian web admin win32 examples # doc|' \
+		-e 's| install-exec-am install-data-am| install-exec-am|' ${WRKSRC}/Makefile.in
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/audio/icecast2/distinfo b/audio/icecast2/distinfo
index d30bf9b19e12..7bca54c42f7b 100644
--- a/audio/icecast2/distinfo
+++ b/audio/icecast2/distinfo
@@ -1,3 +1,3 @@
-MD5 (icecast-2.3.1.tar.gz) = 2d80a249fa8529f82d018c6216108ea8
-SHA256 (icecast-2.3.1.tar.gz) = 7bcc2a1e2137a143deeacd7619cd348300672aaf8774fcfcb2e43aa7c3e74660
-SIZE (icecast-2.3.1.tar.gz) = 1094154
+MD5 (icecast-2.3.2.tar.gz) = ff516b3ccd2bcc31e68f460cd316093f
+SHA256 (icecast-2.3.2.tar.gz) = 4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0
+SIZE (icecast-2.3.2.tar.gz) = 1152319
diff --git a/audio/icecast2/files/patch-src::auth_url.c b/audio/icecast2/files/patch-src::auth_url.c
deleted file mode 100644
index d70bf74b9e70..000000000000
--- a/audio/icecast2/files/patch-src::auth_url.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/auth_url.c.orig	Thu Dec  7 17:26:49 2006
-+++ src/auth_url.c	Thu Dec  7 17:27:05 2006
-@@ -518,7 +518,9 @@
-     curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle);
-     curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L);
-     curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L);
-+#if LIBCURL_VERSION_NUM < 0x071000
-     curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass);
-+#endif
-     curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]);
- 
-     if (url_info->username && url_info->password)
diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist
index cfa8a63a0fd7..777cd5ff2abd 100644
--- a/audio/icecast2/pkg-plist
+++ b/audio/icecast2/pkg-plist
@@ -1,27 +1,29 @@
 bin/icecast
 etc/icecast.xml.sample
-share/doc/icecast/AUTHORS
-share/doc/icecast/COPYING
-share/doc/icecast/ChangeLog
-share/doc/icecast/NEWS
-share/doc/icecast/README
-share/doc/icecast/TODO
-share/doc/icecast/icecast2_admin.html
-share/doc/icecast/icecast2_basicsetup.html
-share/doc/icecast/icecast2_changes.html
-share/doc/icecast/icecast2_config_file.html
-share/doc/icecast/icecast2_faq.html
-share/doc/icecast/icecast2_glossary.html
-share/doc/icecast/icecast2_introduction.html
-share/doc/icecast/icecast2_listenerauth.html
-share/doc/icecast/icecast2_relay.html
-share/doc/icecast/icecast2_stats.html
-share/doc/icecast/icecast2_win32.html
-share/doc/icecast/icecast2_yp.html
-share/doc/icecast/index.html
-share/doc/icecast/listener_auth1.jpg
-share/doc/icecast/listener_auth2.jpg
-share/doc/icecast/listener_auth3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_admin.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_basicsetup.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_changes.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_config_file.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_faq.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_listenerauth.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_relay.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_stats.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_win32.html
+%%PORTDOCS%%%%DOCSDIR%%/icecast2_yp.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/listener_auth1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/listener_auth2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/listener_auth3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/masterslave.png
+%%PORTDOCS%%%%DOCSDIR%%/relay.png
 share/icecast/admin/listclients.xsl
 share/icecast/admin/listmounts.xsl
 share/icecast/admin/manageauth.xsl
@@ -50,4 +52,4 @@ share/icecast/web/tunein.png
 @dirrm share/icecast/doc
 @dirrm share/icecast/admin
 @dirrm share/icecast
-@dirrm share/doc/icecast
+%%PORTDOCS%%@dirrm %%DOCSDIR%%