Date: Wed, 16 Jan 2013 18:15:33 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310508 - in head/comms/ebook2cw: . files Message-ID: <201301161815.r0GIFXaP007649@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Wed Jan 16 18:15:33 2013 New Revision: 310508 URL: http://svnweb.freebsd.org/changeset/ports/310508 Log: - Update to 0.8.2 [1] 0.8.2 / 2013-01-04 Fabian Kurz <fabian@fkurz.net> * Time of conversion and speed-up calculations * Fixed text command |T0 * Samplerate of output file now always according to -s parameter (no longer using LAME's own preference for the given bitrate) * New text command |v for volume control * Chapter splitting now possible by duration (-d seconds) and number of words (-l words) (suggested by DM3KPO) * Fix inconsistent numbers for waveforms (0 = sine, 1 = sawtooth, 2 = square) * Fix OGG/Vorbis headers in CGI mode * New CGI mode (make cgibuffered) where the whole sound file is first created temporarily and then sent to the client. This makes it possible to send the Content-Length header. * Code cleanup PR: ports/175117 [1] Submitted by: Chris Petrik <c.petrik.sosa@gmail.com> Modified: head/comms/ebook2cw/Makefile (contents, props changed) head/comms/ebook2cw/distinfo (contents, props changed) head/comms/ebook2cw/files/patch-Makefile (contents, props changed) Modified: head/comms/ebook2cw/Makefile ============================================================================== --- head/comms/ebook2cw/Makefile Wed Jan 16 18:15:25 2013 (r310507) +++ head/comms/ebook2cw/Makefile Wed Jan 16 18:15:33 2013 (r310508) @@ -1,13 +1,8 @@ -# ports collection makefile for: ebook2cw -# Date created: 17 July 2008 -# Whom: db -# # $FreeBSD$ # PORTNAME= ebook2cw -PORTVERSION= 0.8.1 -PORTREVISION?= 2 +PORTVERSION= 0.8.2 CATEGORIES= comms hamradio MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \ ${MASTER_SITE_LOCAL} @@ -24,6 +19,8 @@ MAN1= ebook2cw.1 post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'g \ ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|'g \ + ${WRKSRC}/Makefile do-install: @${INSTALL_SCRIPT} ${WRKSRC}/ebook2cw ${PREFIX}/bin/ebook2cw @${INSTALL_DATA} ${WRKSRC}/ebook2cw.1 ${MANPREFIX}/man/man1 Modified: head/comms/ebook2cw/distinfo ============================================================================== --- head/comms/ebook2cw/distinfo Wed Jan 16 18:15:25 2013 (r310507) +++ head/comms/ebook2cw/distinfo Wed Jan 16 18:15:33 2013 (r310508) @@ -1,2 +1,2 @@ -SHA256 (ebook2cw-0.8.1.tar.gz) = 3f97d2e6fbb419f8c985b0cbe3a9d33bfaa8fd746ea3651ecf086e523395c908 -SIZE (ebook2cw-0.8.1.tar.gz) = 26581 +SHA256 (ebook2cw-0.8.2.tar.gz) = d8277ac6aaf9e64d9cb9a96457488b3a0dbd77e87622ded8f0825acb500c5758 +SIZE (ebook2cw-0.8.2.tar.gz) = 29170 Modified: head/comms/ebook2cw/files/patch-Makefile ============================================================================== --- head/comms/ebook2cw/files/patch-Makefile Wed Jan 16 18:15:25 2013 (r310507) +++ head/comms/ebook2cw/files/patch-Makefile Wed Jan 16 18:15:33 2013 (r310508) @@ -1,18 +1,20 @@ ---- Makefile.orig 2011-04-04 15:57:55.000000000 -0400 -+++ Makefile 2011-04-16 11:11:52.000000000 -0400 -@@ -1,34 +1,26 @@ - # ebook2cw Makefile -- Fabian Kurz, DJ1YFK -- http://fkurz.net/ham/ebook2cw.html +--- Makefile.orig 2013-01-04 09:33:04.000000000 -0500 ++++ Makefile 2013-01-16 10:16:50.000000000 -0500 +@@ -3,37 +3,26 @@ + # $Id: Makefile 547 2012-12-29 21:07:53Z dj1yfk $ - VERSION=0.8.1 + VERSION=0.8.2 -DESTDIR ?= /usr -+DESTDIR ?= /usr/local -+CC ?= gcc - +- -# Set to NO to compile without Lame/Ogg-vorbis support -USE_LAME?=YES -USE_OGG?=YES ++DESTDIR ?= %%PREFIX%% ++CC ?= gcc CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" ++CFLAGS+= -I%%LOCALBASE%%/include -D LAME -D OGGV ++LDFLAGS+= -L%%LOCALBASE%%/lib -lmp3lame -lvorbis -lvorbisenc -logg -ifeq ($(USE_LAME), YES) - CFLAGS:=$(CFLAGS) -D LAME @@ -22,10 +24,8 @@ - CFLAGS:=$(CFLAGS) -D OGGV - LDFLAGS:=$(LDFLAGS) -lvorbis -lvorbisenc -logg -endif -+CFLAGS+= -I/usr/local/include -D LAME -D OGGV -+LDFLAGS+= -L/usr/local/lib -lmp3lame -lvorbis -lvorbisenc -logg - - +- +- -all: ebook2cw +all: ebook2cw cgi @@ -37,18 +37,13 @@ - gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi + ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi + cgibuffered: ebook2cw.c codetables.h +- gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi ++ ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi + static: - gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -o ebook2cw + ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -o ebook2cw install: install -d -v $(DESTDIR)/share/man/man1/ -@@ -41,7 +33,7 @@ - install -m 0644 ebook2cw.conf $(DESTDIR)/share/doc/ebook2cw/examples/ - install -m 0644 isomap.txt $(DESTDIR)/share/doc/ebook2cw/examples/ - install -m 0644 utf8map.txt $(DESTDIR)/share/doc/ebook2cw/examples/ -- -+ - uninstall: - rm -f $(DESTDIR)/bin/ebook2cw - rm -f $(DESTDIR)/share/man/man1/ebook2cw.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301161815.r0GIFXaP007649>