Index: Makefile =================================================================== RCS file: /usr/share/cvs/freebsd/ports/audio/liquidsoap/Makefile,v --- Makefile 5 Oct 2010 19:57:25 -0000 1.8 +++ Makefile 15 Oct 2010 21:42:30 -0000 @@ -2,15 +2,15 @@ # Date created: 4 Nov 2009 # Whom: Mykola Dzham # -# $FreeBSD: ports/audio/liquidsoap/Makefile,v 1.8 2010/10/05 19:57:25 ade Exp $ +# $FreeBSD: ports/audio/liquidsoap/Makefile,v 1.7 2010/09/15 18:33:55 ade Exp $ # PORTNAME= liquidsoap -PORTVERSION= 0.9.2 -PORTREVISION?= 6 +PORTVERSION= 0.9.3 DISTVERSIONPREFIX= full- +DISTNAME= ${PORTNAME}-full-${PORTVERSION}-1 CATEGORIES= audio net -MASTER_SITES= SF/savonet/${PORTNAME}/${PORTVERSION} +MASTER_SITES= SF/savonet/${PORTNAME}/${PORTVERSION} MAINTAINER= i@levsha.me COMMENT= The audio stream generator of the Savonet project @@ -39,7 +39,7 @@ SOUNDTOUCH "for changing pitch and tempo of sound" Off \ PULSEAUDIO "cross-platform audio sound server" Off \ TAGLIB "for MP3 ID3 tag reading" On \ - WGET "for downloading remote files (http, https, ftp)" On + WGET "for downloading remote files (http, https, ftp)" On # xmplapalylist disabled now: missing ocaml-xmlm port # XMLPLAYLIST "support various xml format (rss/podcast/etc)" Off \ @@ -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=${PORTVERSION} \ + LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} \ + LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} .include @@ -107,19 +109,19 @@ .endif .if defined(WITH_VORBIS) && !defined(WITH_OGG) -IGNORE= OGG required for VORBIS. Please rerun make config and select OGG +IGNORE= ogg required for vorbis. please rerun make config and select ogg .endif .if defined(WITH_SPEEX) && !defined(WITH_OGG) -IGNORE= OGG required for SPEEX. Please rerun make config and select OGG +IGNORE= ogg required for speex. please rerun make config and select ogg .endif .if defined(WITH_THEORA) && ( !defined(WITH_OGG) || !defined(WITH_VORBIS) ) -IGNORE= OGG and VORBIS required for THEORA. Please rerun make config and select OGG and VORBIS +IGNORE= ogg and vorbis required for theora. Please rerun make config and select ogg and vorbis .endif .if defined(WITH_LASTFM) && !defined(WITH_XMLPLAYLIST) -IGNORE= XMLPLAYLIST required for LASTFM. Please rerun make config and select XMLPLAYLIST +IGNORE= xmlplaylist required for lastfm. please rerun make config and select xmlplaylist .endif #Server is known as JACK, but module named ocaml-bjack @@ -150,7 +152,4 @@ pre-configure: (cd ${WRKSRC} && ./bootstrap) -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - .include Index: distinfo =================================================================== RCS file: /usr/share/cvs/freebsd/ports/audio/liquidsoap/distinfo,v --- distinfo 19 Jan 2010 23:24:44 -0000 1.1 +++ distinfo 5 Oct 2010 14:32:50 -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/share/cvs/freebsd/ports/audio/liquidsoap/pkg-plist,v --- pkg-plist 17 Jun 2010 10:46:46 -0000 1.2 +++ pkg-plist 6 Oct 2010 13:41:19 -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/share/cvs/freebsd/ports/audio/liquidsoap/files/liquidsoap.sh.in,v --- files/liquidsoap.sh.in 27 Mar 2010 00:12:42 -0000 1.2 +++ files/liquidsoap.sh.in 6 Oct 2010 13:41:19 -0000 @@ -11,8 +11,6 @@ . /etc/rc.subr -sig_stop=KILL - name=liquidsoap rcvar=`set_rcvar` Index: files/patch-liquidsoap-0.9.2__Makefile =================================================================== RCS file: files/patch-liquidsoap-0.9.2__Makefile --- files/patch-liquidsoap-0.9.2__Makefile 19 Jan 2010 23:24:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- ./liquidsoap-0.9.2/Makefile.orig 2009-10-30 16:07:44.000000000 +0200 -+++ ./liquidsoap-0.9.2/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-0.9.2__Makefile.defs.in =================================================================== RCS file: files/patch-liquidsoap-0.9.2__Makefile.defs.in --- files/patch-liquidsoap-0.9.2__Makefile.defs.in 17 Jun 2010 10:46:46 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ ---- ./liquidsoap-0.9.2/Makefile.defs.in.orig -+++ ./liquidsoap-0.9.2/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-0.9.2__doc__Makefile =================================================================== RCS file: files/patch-liquidsoap-0.9.2__doc__Makefile --- files/patch-liquidsoap-0.9.2__doc__Makefile 17 Jun 2010 10:46:46 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ ---- ./liquidsoap-0.9.2/doc/Makefile.orig -+++ ./liquidsoap-0.9.2/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-0.9.2__examples__Makefile =================================================================== RCS file: files/patch-liquidsoap-0.9.2__examples__Makefile --- files/patch-liquidsoap-0.9.2__examples__Makefile 17 Jun 2010 10:46:46 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- ./liquidsoap-0.9.2/examples/Makefile.orig -+++ ./liquidsoap-0.9.2/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-0.1.10_src_ao__stubs.c =================================================================== RCS file: files/patch-ocaml-ao-0.1.10_src_ao__stubs.c --- files/patch-ocaml-ao-0.1.10_src_ao__stubs.c 6 Jun 2010 20:39:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ - -$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.1.10/src/ao_stubs.c.orig -+++ ocaml-ao-0.1.10/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); Index: files/pkg-install.in =================================================================== RCS file: files/pkg-install.in --- files/pkg-install.in 19 Jan 2010 23:24:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -#! /bin/sh - -# $FreeBSD: ports/audio/liquidsoap/files/pkg-install.in,v 1.1 2010/01/19 23:24:44 wen Exp $ - -PATH=/bin:/usr/sbin - -USER=%%LIQUIDSOAP_USER%% -GROUP=%%LIQUIDSOAP_GROUP%% -UID=%%UID%% -GID=%%GID%% - -case $2 in -PRE-INSTALL) - - if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /nonexistent -c "Liquidsoap User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - - ;; -esac