Attachment #109601 for bug #150636




#

PORTNAME=	liquidsoap
PORTVERSION=	0.9.2
PORTREVISION?=	5
DISTVERSIONPREFIX=	full-
DISTVERSION=	0.9.3-1
CATEGORIES=	audio net
RELVER=	${DISTVERSION:C/-[0-9]+$//}
MASTER_SITES=	SF/savonet/${PORTNAME}/${RELVER}

MAINTAINER=	i@levsha.me
COMMENT=	The audio stream generator of the Savonet project


LIQUIDSOAP_USER=	liquidsoap
LIQUIDSOAP_GROUP=	${LIQUIDSOAP_USER}
USERS=	${LIQUIDSOAP_USER}
GROUPS=	${LIQUIDSOAP_GROUP}
LOGDIR=	/var/log/liquidsoap
PIDDIR=	/var/run/liquidsoap

SUB_LIST=	LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} \
	PIDDIR=${PIDDIR}
PLIST_SUB=	RELVER=${RELVER} \
	LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} \
	LOGDIR=${LOGDIR} PIDDIR=${PIDDIR}

.include <bsd.port.options.mk>


pre-configure:
	(cd ${WRKSRC} && ./bootstrap)

pre-install:
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (liquidsoap-full-0.9.2.tar.gz) = 68fff21d149cd9e4b8697b29f7a35da9	1	MD5 (liquidsoap-full-0.9.3-1.tar.gz) = ac15541bb7d3616d139a7033dbcf5bb4
2	SHA256 (liquidsoap-full-0.9.2.tar.gz) = 1348a79b1ad703cd09d3ace66a39139fb55f8d0eb762e9dfb7540ae5ffb91624	2	SHA256 (liquidsoap-full-0.9.3-1.tar.gz) = b0293821a9f4a86f9747da6d1b0ddf7242b92368fa8196dc34a99e975cc4cf60
3	SIZE (liquidsoap-full-0.9.2.tar.gz) = 3404549	3	SIZE (liquidsoap-full-0.9.3-1.tar.gz) = 3455598




bin/liquidsoap
%%ETCDIR%%/radio.liq.example
etc/logrotate.d/liquidsoap
lib/liquidsoap/%%RELVER%%/extract-replaygain
lib/liquidsoap/%%RELVER%%/liquidtts
lib/liquidsoap/%%RELVER%%/utils.liq
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fallible.liq
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geek.liq

%%PORTDOCS%%%%DOCSDIR%%/html/images/design/background_page.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/design/logo.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/grab.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/graph_clocks.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/16/audio.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/32/audio.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/deb.png

%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
@dirrm lib/liquidsoap/%%RELVER%%
@dirrm lib/liquidsoap
@dirrmtry %%ETCDIR%%
@dirrmtry etc/logrotate.d
@exec mkdir -p %%LOGDIR%%
@exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%LOGDIR%%
@dirrmtry %%LOGDIR%%
@exec mkdir -p %%PIDDIR%%
@exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%PIDDIR%%
@dirrmtry %%PIDDIR%%

Lines 11-18 Link Here

(-)files/liquidsoap.sh.in (-2 lines)
11		11
12	. /etc/rc.subr	12	. /etc/rc.subr
13		13
14	sig_stop=KILL
15
16	name=liquidsoap	14	name=liquidsoap
17	rcvar=`set_rcvar`	15	rcvar=`set_rcvar`
18		16




--- ./liquidsoap-0.9.3/Makefile.orig	2009-10-30 16:07:44.000000000 +0200
+++ ./liquidsoap-0.9.3/Makefile	2009-12-11 21:42:24.000000000 +0200
@@ -64,8 +64,8 @@
 endif
 	$(INSTALL_DIRECTORY) $(bindir)
 	$(INSTALL_DIRECTORY) $(libdir)/liquidsoap/$(libs_dir_version)
-	$(INSTALL_PROGRAM) scripts/liquidtts $(libdir)/liquidsoap/$(libs_dir_version)
-	$(INSTALL_PROGRAM) scripts/extract-replaygain $(libdir)/liquidsoap/$(libs_dir_version)
+	$(INSTALL_SCRIPT) scripts/liquidtts $(libdir)/liquidsoap/$(libs_dir_version)
+	$(INSTALL_SCRIPT) scripts/extract-replaygain $(libdir)/liquidsoap/$(libs_dir_version)
 	$(INSTALL_DATA) scripts/utils.liq $(libdir)/liquidsoap/$(libs_dir_version)
 	$(INSTALL_DIRECTORY) ${sysconfdir}/liquidsoap
 	$(INSTALL_DATA) examples/radio.liq \




--- ./liquidsoap-0.9.3/Makefile.defs.in.orig
+++ ./liquidsoap-0.9.3/Makefile.defs.in
@@ -1,6 +1,6 @@
 # @configure_input@
 
-DISTDIR=liquidsoap-@version@
+DISTDIR=liquidsoap
 
 user=@install_user@
 group=@install_group@
@@ -17,6 +17,7 @@
 datadir = @datadir@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DIRECTORY = @INSTALL@ -d
 INSTALL_DATA = @INSTALL_DATA@
 MAKE = @MAKE@




--- ./liquidsoap-0.9.3/doc/Makefile.orig
+++ ./liquidsoap-0.9.3/doc/Makefile
@@ -1,4 +1,4 @@
-.PHONY: doc upload reference all-subdirs
+.PHONY: doc upload reference all-subdirs html-install man-install
 
 SUBDIRS = content liqi
 DISTFILES = liquidsoap.1 Makefile reference_to_liqi.pl settings_to_liqi.pl no-ref.txt
@@ -89,9 +89,13 @@
 	@echo ""
 	@find html/scripts | grep '\.pl' | sort | ./scripts/test_snipets "perl -c"
 
-doc-install: $(HTML)
-	$(INSTALL)  -d $(datadir)/doc/$(DISTDIR)/html
-	cp -rf html/* $(datadir)/doc/$(DISTDIR)/html
+doc-install: html-install man-install
+
+html-install: $(HTML)
+	$(PORTDOCS)$(INSTALL)  -d $(datadir)/doc/$(DISTDIR)/html
+	$(PORTDOCS)cp -rf html/* $(datadir)/doc/$(DISTDIR)/html
+
+man-install:
 	$(INSTALL) -d $(mandir)/man1
 	$(INSTALL_DATA) liquidsoap.1 $(mandir)/man1
 

Added Link Here

(-)files/patch-liquidsoap-x.x.x__examples__Makefile (+10 lines)
1	--- ./liquidsoap-0.9.3/examples/Makefile.orig
2	+++ ./liquidsoap-0.9.3/examples/Makefile
3	@@ -6,5 +6,5 @@
4
5	.PHONY: doc-install
6	doc-install:
7	- $(INSTALL) -d $(datadir)/doc/$(DISTDIR)/examples
8	- $(INSTALL_DATA) $(wildcard *.liq) README $(datadir)/doc/$(DISTDIR)/examples
9	+ $(PORTEXAMPLES)$(INSTALL) -d $(datadir)/examples/$(DISTDIR)
10	+ $(PORTEXAMPLES)$(INSTALL_DATA) $(wildcard *.liq) README $(datadir)/examples/$(DISTDIR)





$FreeBSD: ports/audio/liquidsoap/files/patch-ocaml-ao-0.1.10_src_ao__stubs.c,v 1.1 2010/06/06 20:39:13 naddy Exp $

--- ocaml-ao-0.2.0/src/ao_stubs.c.orig
+++ ocaml-ao-0.2.0/src/ao_stubs.c
@@ -138,6 +138,7 @@
                        value channels,
                        value byte_format)
 {
+  memset(format, 0, sizeof(*format));
   format->bits = Int_val(bits);
   format->rate = Int_val(rate);
   format->channels = Int_val(channels);

Return to bug 150636

Lines 6-16 Link Here

(-)Makefile (-11 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= liquidsoap	8	PORTNAME= liquidsoap
9	PORTVERSION= 0.9.2
10	PORTREVISION?= 5
11	DISTVERSIONPREFIX= full-	9	DISTVERSIONPREFIX= full-
		10	DISTVERSION= 0.9.3-1
12	CATEGORIES= audio net	11	CATEGORIES= audio net
13	MASTER_SITES= SF/savonet/${PORTNAME}/${PORTVERSION}	12	RELVER= ${DISTVERSION:C/-[0-9]+$//}
		13	MASTER_SITES= SF/savonet/${PORTNAME}/${RELVER}
14		14
15	MAINTAINER= i@levsha.me	15	MAINTAINER= i@levsha.me
16	COMMENT= The audio stream generator of the Savonet project	16	COMMENT= The audio stream generator of the Savonet project
Lines 68-81 Link Here
68		68
69	LIQUIDSOAP_USER= liquidsoap	69	LIQUIDSOAP_USER= liquidsoap
70	LIQUIDSOAP_GROUP= ${LIQUIDSOAP_USER}	70	LIQUIDSOAP_GROUP= ${LIQUIDSOAP_USER}
71	UID= 923	71	USERS= ${LIQUIDSOAP_USER}
72	GID= ${UID}	72	GROUPS= ${LIQUIDSOAP_GROUP}
73	LOGDIR= /var/log/liquidsoap	73	LOGDIR= /var/log/liquidsoap
74	PIDDIR= /var/run/liquidsoap	74	PIDDIR= /var/run/liquidsoap
75		75
76	SUB_FILES= pkg-install	76	SUB_LIST= LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} \
77	SUB_LIST= LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} UID=${UID} GID=${GID} PIDDIR=${PIDDIR}	77	PIDDIR=${PIDDIR}
78	PLIST_SUB= PORTVERSION=${PORTVERSION} LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR}	78	PLIST_SUB= RELVER=${RELVER} \
		79	LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} \
		80	LOGDIR=${LOGDIR} PIDDIR=${PIDDIR}
79		81
80	.include <bsd.port.options.mk>	82	.include <bsd.port.options.mk>
81		83
Lines 150-156 Link Here
150	pre-configure:	152	pre-configure:
151	(cd ${WRKSRC} && ./bootstrap)	153	(cd ${WRKSRC} && ./bootstrap)
152		154
153	pre-install:
154	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
155
156	.include <bsd.port.mk>	155	.include <bsd.port.mk>

Lines 1-9 Link Here

(-)pkg-plist (-8 / +9 lines)
1	bin/liquidsoap	1	bin/liquidsoap
2	%%ETCDIR%%/radio.liq.example	2	%%ETCDIR%%/radio.liq.example
3	etc/logrotate.d/liquidsoap	3	etc/logrotate.d/liquidsoap
4	lib/liquidsoap/%%PORTVERSION%%/extract-replaygain	4	lib/liquidsoap/%%RELVER%%/extract-replaygain
5	lib/liquidsoap/%%PORTVERSION%%/liquidtts	5	lib/liquidsoap/%%RELVER%%/liquidtts
6	lib/liquidsoap/%%PORTVERSION%%/utils.liq	6	lib/liquidsoap/%%RELVER%%/utils.liq
7	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README	7	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
8	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fallible.liq	8	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fallible.liq
9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geek.liq	9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geek.liq
Lines 48-53 Link Here
48	%%PORTDOCS%%%%DOCSDIR%%/html/images/design/background_page.png	48	%%PORTDOCS%%%%DOCSDIR%%/html/images/design/background_page.png
49	%%PORTDOCS%%%%DOCSDIR%%/html/images/design/logo.png	49	%%PORTDOCS%%%%DOCSDIR%%/html/images/design/logo.png
50	%%PORTDOCS%%%%DOCSDIR%%/html/images/grab.png	50	%%PORTDOCS%%%%DOCSDIR%%/html/images/grab.png
		51	%%PORTDOCS%%%%DOCSDIR%%/html/images/graph_clocks.png
51	%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/16/audio.png	52	%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/16/audio.png
52	%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/32/audio.png	53	%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/32/audio.png
53	%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/deb.png	54	%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/deb.png
Lines 236-248 Link Here
236	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html	237	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
237	%%PORTDOCS%%@dirrm %%DOCSDIR%%	238	%%PORTDOCS%%@dirrm %%DOCSDIR%%
238	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%	239	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
239	@dirrm lib/liquidsoap/%%PORTVERSION%%	240	@dirrm lib/liquidsoap/%%RELVER%%
240	@dirrm lib/liquidsoap	241	@dirrm lib/liquidsoap
241	@dirrmtry %%ETCDIR%%	242	@dirrmtry %%ETCDIR%%
242	@dirrmtry etc/logrotate.d	243	@dirrmtry etc/logrotate.d
243	@exec [ -d %%LOGDIR%% ] \|\| mkdir %%LOGDIR%%	244	@exec mkdir -p %%LOGDIR%%
244	@exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%LOGDIR%%	245	@exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%LOGDIR%%
245	@unexec rmdir %%LOGDIR%% 2>/dev/null \|\| true	246	@dirrmtry %%LOGDIR%%
246	@exec [ -d %%PIDDIR%% ] \|\| mkdir %%PIDDIR%%	247	@exec mkdir -p %%PIDDIR%%
247	@exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%PIDDIR%%	248	@exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%PIDDIR%%
248	@unexec rmdir %%PIDDIR%% 2>/dev/null \|\| true	249	@dirrmtry %%PIDDIR%%

Added Link Here

(-)files/patch-liquidsoap-x.x.x__Makefile (+13 lines)
1	--- ./liquidsoap-0.9.3/Makefile.orig 2009-10-30 16:07:44.000000000 +0200
2	+++ ./liquidsoap-0.9.3/Makefile 2009-12-11 21:42:24.000000000 +0200
3	@@ -64,8 +64,8 @@
4	endif
5	$(INSTALL_DIRECTORY) $(bindir)
6	$(INSTALL_DIRECTORY) $(libdir)/liquidsoap/$(libs_dir_version)
7	- $(INSTALL_PROGRAM) scripts/liquidtts $(libdir)/liquidsoap/$(libs_dir_version)
8	- $(INSTALL_PROGRAM) scripts/extract-replaygain $(libdir)/liquidsoap/$(libs_dir_version)
9	+ $(INSTALL_SCRIPT) scripts/liquidtts $(libdir)/liquidsoap/$(libs_dir_version)
10	+ $(INSTALL_SCRIPT) scripts/extract-replaygain $(libdir)/liquidsoap/$(libs_dir_version)
11	$(INSTALL_DATA) scripts/utils.liq $(libdir)/liquidsoap/$(libs_dir_version)
12	$(INSTALL_DIRECTORY) ${sysconfdir}/liquidsoap
13	$(INSTALL_DATA) examples/radio.liq \

Added Link Here

(-)files/patch-liquidsoap-x.x.x__Makefile.defs.in (+18 lines)
1	--- ./liquidsoap-0.9.3/Makefile.defs.in.orig
2	+++ ./liquidsoap-0.9.3/Makefile.defs.in
3	@@ -1,6 +1,6 @@
4	# @configure_input@
5
6	-DISTDIR=liquidsoap-@version@
7	+DISTDIR=liquidsoap
8
9	user=@install_user@
10	group=@install_group@
11	@@ -17,6 +17,7 @@
12	datadir = @datadir@
13	INSTALL = @INSTALL@
14	INSTALL_PROGRAM = @INSTALL_PROGRAM@
15	+INSTALL_SCRIPT = @INSTALL_SCRIPT@
16	INSTALL_DIRECTORY = @INSTALL@ -d
17	INSTALL_DATA = @INSTALL_DATA@
18	MAKE = @MAKE@

Added Link Here

(-)files/patch-liquidsoap-x.x.x__doc__Makefile (+25 lines)
1	--- ./liquidsoap-0.9.3/doc/Makefile.orig
2	+++ ./liquidsoap-0.9.3/doc/Makefile
3	@@ -1,4 +1,4 @@
4	-.PHONY: doc upload reference all-subdirs
5	+.PHONY: doc upload reference all-subdirs html-install man-install
6
7	SUBDIRS = content liqi
8	DISTFILES = liquidsoap.1 Makefile reference_to_liqi.pl settings_to_liqi.pl no-ref.txt
9	@@ -89,9 +89,13 @@
10	@echo ""
11	@find html/scripts \| grep '\.pl' \| sort \| ./scripts/test_snipets "perl -c"
12
13	-doc-install: $(HTML)
14	- $(INSTALL) -d $(datadir)/doc/$(DISTDIR)/html
15	- cp -rf html/* $(datadir)/doc/$(DISTDIR)/html
16	+doc-install: html-install man-install
17	+
18	+html-install: $(HTML)
19	+ $(PORTDOCS)$(INSTALL) -d $(datadir)/doc/$(DISTDIR)/html
20	+ $(PORTDOCS)cp -rf html/* $(datadir)/doc/$(DISTDIR)/html
21	+
22	+man-install:
23	$(INSTALL) -d $(mandir)/man1
24	$(INSTALL_DATA) liquidsoap.1 $(mandir)/man1
25

Added Link Here

(-)files/patch-ocaml-ao-x.x.x_src_ao__stubs.c (+13 lines)
1
2	$FreeBSD: ports/audio/liquidsoap/files/patch-ocaml-ao-0.1.10_src_ao__stubs.c,v 1.1 2010/06/06 20:39:13 naddy Exp $
3
4	--- ocaml-ao-0.2.0/src/ao_stubs.c.orig
5	+++ ocaml-ao-0.2.0/src/ao_stubs.c
6	@@ -138,6 +138,7 @@
7	value channels,
8	value byte_format)
9	{
10	+ memset(format, 0, sizeof(*format));
11	format->bits = Int_val(bits);
12	format->rate = Int_val(rate);
13	format->channels = Int_val(channels);