Attachment #89561 for bug #126526

View | Details | Raw Unified | Return to bug 126526
Collapse All | Expand All




#

PORTNAME=	icecast2
PORTVERSION=	2.3.2
PORTREVISION=	7
PORTEPOCH=	1
CATEGORIES=	audio net ipv6
MASTER_SITES=	http://downloads.xiph.org/releases/icecast/ \
		http://svn.xiph.org/releases/icecast/
DISTNAME=	icecast-${PORTVERSION}

MAINTAINER=	lofi@freebsd.org

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}


Lines 1-3 Link Here

(-)/usr/ports/sunpoet/icecast2/distinfo (-3 / +3 lines)
1	MD5 (icecast-2.3.1.tar.gz) = 2d80a249fa8529f82d018c6216108ea8	1	MD5 (icecast-2.3.2.tar.gz) = ff516b3ccd2bcc31e68f460cd316093f
2	SHA256 (icecast-2.3.1.tar.gz) = 7bcc2a1e2137a143deeacd7619cd348300672aaf8774fcfcb2e43aa7c3e74660	2	SHA256 (icecast-2.3.2.tar.gz) = 4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0
3	SIZE (icecast-2.3.1.tar.gz) = 1094154	3	SIZE (icecast-2.3.2.tar.gz) = 1152319




--- 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)




bin/icecast
etc/icecast.xml.sample
%%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

@dirrm share/icecast/doc
@dirrm share/icecast/admin
@dirrm share/icecast
@dirrm %%DOCSDIR%%

Return to bug 126526

Lines 6-16 Link Here

(-)/usr/ports/sunpoet/icecast2/Makefile (-3 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= icecast2	8	PORTNAME= icecast2
9	PORTVERSION= 2.3.1	9	PORTVERSION= 2.3.2
10	PORTREVISION= 7
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= audio net ipv6	11	CATEGORIES= audio net ipv6
13	MASTER_SITES= http://svn.xiph.org/releases/icecast/	12	MASTER_SITES= http://downloads.xiph.org/releases/icecast/ \
		13	http://svn.xiph.org/releases/icecast/
14	DISTNAME= icecast-${PORTVERSION}	14	DISTNAME= icecast-${PORTVERSION}
15		15
16	MAINTAINER= lofi@freebsd.org	16	MAINTAINER= lofi@freebsd.org
Lines 30-39 Link Here
30	PKGMESSAGE= ${WRKDIR}/pkg-message	30	PKGMESSAGE= ${WRKDIR}/pkg-message
31	CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include	31	CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include
32		32
		33	DOCSDIR= ${PREFIX}/share/doc/icecast
33	WRKSRC= ${WRKDIR}/icecast-${PORTVERSION}	34	WRKSRC= ${WRKDIR}/icecast-${PORTVERSION}
34		35
35	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
36		37
		38	.if defined(NOPORTDOCS)
		39	post-patch:
		40	${REINPLACE_CMD} \
		41	-e 's\|SUBDIRS = src conf debian doc web admin win32 examples\|SUBDIRS = src conf debian web admin win32 examples # doc\|' \
		42	-e 's\| install-exec-am install-data-am\| install-exec-am\|' ${WRKSRC}/Makefile.in
		43	.endif
		44
37	post-install:	45	post-install:
38	@${CAT} ${PKGMESSAGE}	46	@${CAT} ${PKGMESSAGE}
39		47

Lines 1-12 Link Here

(-)/usr/ports/sunpoet/icecast2/files/patch-src::auth_url.c (-12 lines)
1	--- src/auth_url.c.orig Thu Dec 7 17:26:49 2006
2	+++ src/auth_url.c Thu Dec 7 17:27:05 2006
3	@@ -518,7 +518,9 @@
4	curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle);
5	curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L);
6	curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L);
7	+#if LIBCURL_VERSION_NUM < 0x071000
8	curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass);
9	+#endif
10	curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]);
11
12	if (url_info->username && url_info->password)

Lines 1-27 Link Here

(-)/usr/ports/sunpoet/icecast2/pkg-plist (-23 / +25 lines)
1	bin/icecast	1	bin/icecast
2	etc/icecast.xml.sample	2	etc/icecast.xml.sample
3	share/doc/icecast/AUTHORS	3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
4	share/doc/icecast/COPYING	4	%%PORTDOCS%%%%DOCSDIR%%/COPYING
5	share/doc/icecast/ChangeLog	5	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
6	share/doc/icecast/NEWS	6	%%PORTDOCS%%%%DOCSDIR%%/NEWS
7	share/doc/icecast/README	7	%%PORTDOCS%%%%DOCSDIR%%/README
8	share/doc/icecast/TODO	8	%%PORTDOCS%%%%DOCSDIR%%/TODO
9	share/doc/icecast/icecast2_admin.html	9	%%PORTDOCS%%%%DOCSDIR%%/icecast2_admin.html
10	share/doc/icecast/icecast2_basicsetup.html	10	%%PORTDOCS%%%%DOCSDIR%%/icecast2_basicsetup.html
11	share/doc/icecast/icecast2_changes.html	11	%%PORTDOCS%%%%DOCSDIR%%/icecast2_changes.html
12	share/doc/icecast/icecast2_config_file.html	12	%%PORTDOCS%%%%DOCSDIR%%/icecast2_config_file.html
13	share/doc/icecast/icecast2_faq.html	13	%%PORTDOCS%%%%DOCSDIR%%/icecast2_faq.html
14	share/doc/icecast/icecast2_glossary.html	14	%%PORTDOCS%%%%DOCSDIR%%/icecast2_glossary.html
15	share/doc/icecast/icecast2_introduction.html	15	%%PORTDOCS%%%%DOCSDIR%%/icecast2_introduction.html
16	share/doc/icecast/icecast2_listenerauth.html	16	%%PORTDOCS%%%%DOCSDIR%%/icecast2_listenerauth.html
17	share/doc/icecast/icecast2_relay.html	17	%%PORTDOCS%%%%DOCSDIR%%/icecast2_relay.html
18	share/doc/icecast/icecast2_stats.html	18	%%PORTDOCS%%%%DOCSDIR%%/icecast2_stats.html
19	share/doc/icecast/icecast2_win32.html	19	%%PORTDOCS%%%%DOCSDIR%%/icecast2_win32.html
20	share/doc/icecast/icecast2_yp.html	20	%%PORTDOCS%%%%DOCSDIR%%/icecast2_yp.html
21	share/doc/icecast/index.html	21	%%PORTDOCS%%%%DOCSDIR%%/index.html
22	share/doc/icecast/listener_auth1.jpg	22	%%PORTDOCS%%%%DOCSDIR%%/listener_auth1.jpg
23	share/doc/icecast/listener_auth2.jpg	23	%%PORTDOCS%%%%DOCSDIR%%/listener_auth2.jpg
24	share/doc/icecast/listener_auth3.jpg	24	%%PORTDOCS%%%%DOCSDIR%%/listener_auth3.jpg
		25	%%PORTDOCS%%%%DOCSDIR%%/masterslave.png
		26	%%PORTDOCS%%%%DOCSDIR%%/relay.png
25	share/icecast/admin/listclients.xsl	27	share/icecast/admin/listclients.xsl
26	share/icecast/admin/listmounts.xsl	28	share/icecast/admin/listmounts.xsl
27	share/icecast/admin/manageauth.xsl	29	share/icecast/admin/manageauth.xsl
Lines 50-53 Link Here
50	@dirrm share/icecast/doc	52	@dirrm share/icecast/doc
51	@dirrm share/icecast/admin	53	@dirrm share/icecast/admin
52	@dirrm share/icecast	54	@dirrm share/icecast
53	@dirrm share/doc/icecast	55	@dirrm %%DOCSDIR%%