Attachment 109601 Details for Bug 150636 – file.diff

[patch] file.diff

file.diff (text/plain), 9.20 KB, created by Mykola Dzham on 2010-09-17 07:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mykola Dzham

Created: 2010-09-17 07:50:01 UTC

Size: 9.20 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/local/arch/csup/ports/audio/liquidsoap/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- Makefile	11 Aug 2010 21:04:43 -0000	1.6
>+++ Makefile	17 Sep 2010 06:12:13 -0000
>@@ -6,11 +6,11 @@
> #
> 
> PORTNAME=	liquidsoap
>-PORTVERSION=	0.9.2
>-PORTREVISION?=	5
> DISTVERSIONPREFIX=	full-
>+DISTVERSION=	0.9.3-1
> CATEGORIES=	audio net
>-MASTER_SITES=	SF/savonet/${PORTNAME}/${PORTVERSION}
>+RELVER=	${DISTVERSION:C/-[0-9]+$//}
>+MASTER_SITES=	SF/savonet/${PORTNAME}/${RELVER}
> 
> MAINTAINER=	i@levsha.me
> COMMENT=	The audio stream generator of the Savonet project
>@@ -68,14 +68,16 @@
> 
> LIQUIDSOAP_USER=	liquidsoap
> LIQUIDSOAP_GROUP=	${LIQUIDSOAP_USER}
>-UID=	923
>-GID=	${UID}
>+USERS=	${LIQUIDSOAP_USER}
>+GROUPS=	${LIQUIDSOAP_GROUP}
> LOGDIR=	/var/log/liquidsoap
> PIDDIR=	/var/run/liquidsoap
> 
>-SUB_FILES=	pkg-install
>-SUB_LIST=	LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} UID=${UID} GID=${GID} PIDDIR=${PIDDIR}
>-PLIST_SUB=	PORTVERSION=${PORTVERSION} LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR}
>+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>
> 
>@@ -150,7 +152,4 @@
> pre-configure:
> 	(cd ${WRKSRC} && ./bootstrap)
> 
>-pre-install:
>-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /usr/local/arch/csup/ports/audio/liquidsoap/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- distinfo	19 Jan 2010 23:24:44 -0000	1.1
>+++ distinfo	17 Sep 2010 06:12:13 -0000
>@@ -1,3 +1,3 @@
>-MD5 (liquidsoap-full-0.9.2.tar.gz) = 68fff21d149cd9e4b8697b29f7a35da9
>-SHA256 (liquidsoap-full-0.9.2.tar.gz) = 1348a79b1ad703cd09d3ace66a39139fb55f8d0eb762e9dfb7540ae5ffb91624
>-SIZE (liquidsoap-full-0.9.2.tar.gz) = 3404549
>+MD5 (liquidsoap-full-0.9.3-1.tar.gz) = ac15541bb7d3616d139a7033dbcf5bb4
>+SHA256 (liquidsoap-full-0.9.3-1.tar.gz) = b0293821a9f4a86f9747da6d1b0ddf7242b92368fa8196dc34a99e975cc4cf60
>+SIZE (liquidsoap-full-0.9.3-1.tar.gz) = 3455598
>Index: pkg-plist
>===================================================================
>RCS file: /usr/local/arch/csup/ports/audio/liquidsoap/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- pkg-plist	17 Jun 2010 10:46:46 -0000	1.2
>+++ pkg-plist	17 Sep 2010 06:12:13 -0000
>@@ -1,9 +1,9 @@
> bin/liquidsoap
> %%ETCDIR%%/radio.liq.example
> etc/logrotate.d/liquidsoap
>-lib/liquidsoap/%%PORTVERSION%%/extract-replaygain
>-lib/liquidsoap/%%PORTVERSION%%/liquidtts
>-lib/liquidsoap/%%PORTVERSION%%/utils.liq
>+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
>@@ -48,6 +48,7 @@
> %%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
>@@ -236,13 +237,13 @@
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>-@dirrm lib/liquidsoap/%%PORTVERSION%%
>+@dirrm lib/liquidsoap/%%RELVER%%
> @dirrm lib/liquidsoap
> @dirrmtry %%ETCDIR%%
> @dirrmtry etc/logrotate.d
>-@exec [ -d %%LOGDIR%% ] || mkdir %%LOGDIR%%
>+@exec mkdir -p %%LOGDIR%%
> @exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%LOGDIR%%
>-@unexec rmdir %%LOGDIR%% 2>/dev/null  || true
>-@exec [ -d %%PIDDIR%% ] || mkdir %%PIDDIR%%
>+@dirrmtry %%LOGDIR%%
>+@exec mkdir -p %%PIDDIR%%
> @exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%PIDDIR%%
>-@unexec rmdir %%PIDDIR%% 2>/dev/null  || true
>+@dirrmtry %%PIDDIR%%
>Index: files/liquidsoap.sh.in
>===================================================================
>RCS file: /usr/local/arch/csup/ports/audio/liquidsoap/files/liquidsoap.sh.in,v
>retrieving revision 1.2
>diff -u -r1.2 liquidsoap.sh.in
>--- files/liquidsoap.sh.in	27 Mar 2010 00:12:42 -0000	1.2
>+++ files/liquidsoap.sh.in	17 Sep 2010 06:12:13 -0000
>@@ -11,8 +11,6 @@
> 
> . /etc/rc.subr
> 
>-sig_stop=KILL
>-
> name=liquidsoap
> rcvar=`set_rcvar`
> 
>Index: files/patch-liquidsoap-x.x.x__Makefile
>===================================================================
>RCS file: files/patch-liquidsoap-x.x.x__Makefile
>diff -N files/patch-liquidsoap-x.x.x__Makefile
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-liquidsoap-x.x.x__Makefile	17 Sep 2010 06:12:13 -0000
>@@ -0,0 +1,13 @@
>+--- ./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 \
>Index: files/patch-liquidsoap-x.x.x__Makefile.defs.in
>===================================================================
>RCS file: files/patch-liquidsoap-x.x.x__Makefile.defs.in
>diff -N files/patch-liquidsoap-x.x.x__Makefile.defs.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-liquidsoap-x.x.x__Makefile.defs.in	17 Sep 2010 06:12:13 -0000
>@@ -0,0 +1,18 @@
>+--- ./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@
>Index: files/patch-liquidsoap-x.x.x__doc__Makefile
>===================================================================
>RCS file: files/patch-liquidsoap-x.x.x__doc__Makefile
>diff -N files/patch-liquidsoap-x.x.x__doc__Makefile
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-liquidsoap-x.x.x__doc__Makefile	17 Sep 2010 06:12:13 -0000
>@@ -0,0 +1,25 @@
>+--- ./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
>+ 
>Index: files/patch-liquidsoap-x.x.x__examples__Makefile
>===================================================================
>RCS file: files/patch-liquidsoap-x.x.x__examples__Makefile
>diff -N files/patch-liquidsoap-x.x.x__examples__Makefile
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-liquidsoap-x.x.x__examples__Makefile	17 Sep 2010 06:12:13 -0000
>@@ -0,0 +1,10 @@
>+--- ./liquidsoap-0.9.3/examples/Makefile.orig
>++++ ./liquidsoap-0.9.3/examples/Makefile
>+@@ -6,5 +6,5 @@
>+ 
>+ .PHONY: doc-install
>+ doc-install:
>+-	$(INSTALL) -d $(datadir)/doc/$(DISTDIR)/examples
>+-	$(INSTALL_DATA) $(wildcard *.liq) README $(datadir)/doc/$(DISTDIR)/examples
>++	$(PORTEXAMPLES)$(INSTALL) -d $(datadir)/examples/$(DISTDIR)
>++	$(PORTEXAMPLES)$(INSTALL_DATA) $(wildcard *.liq) README $(datadir)/examples/$(DISTDIR)
>Index: files/patch-ocaml-ao-x.x.x_src_ao__stubs.c
>===================================================================
>RCS file: files/patch-ocaml-ao-x.x.x_src_ao__stubs.c
>diff -N files/patch-ocaml-ao-x.x.x_src_ao__stubs.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-ocaml-ao-x.x.x_src_ao__stubs.c	17 Sep 2010 06:12:13 -0000
>@@ -0,0 +1,13 @@
>+
>+$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);

Actions: View | Diff

Attachments on bug 150636: 109601 | 109602