Date: Fri, 22 Dec 2006 01:42:04 -0800 From: "Jack L." <xxjack12xx@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/107088: Upgrade audacity to Audacity 1.2.6 Message-ID: <ab581e310612220142o5671b780s49bcfc49fb75b2@mail.gmail.com> Resent-Message-ID: <200612221020.kBMAKEdY005420@freefall.freebsd.org> In-Reply-To: <200612220936.kBM9axpL078492@laptop.jack.com> References: <200612220936.kBM9axpL078492@laptop.jack.com>
next in thread | previous in thread | raw e-mail | index | archive | help
>Number: 107088
>Category: ports
>Synopsis: Upgrade audacity to Audacity 1.2.6
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 22 10:20:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jack
>Release: FreeBSD 6.1-RELEASE-p11 amd64
>Organization:
>Environment:
System: FreeBSD laptop.jack.com 6.1-RELEASE-p11 FreeBSD
6.1-RELEASE-p11 #0: Thu Dec 7 14:19:49 PST 2006
jack@laptop.jack.com:/usr/obj/usr/src/sys/LAPTOP amd64
>Description:
Upgrade audacity from 1.2.4 to 1.2.6. Also fixes build error with gcc 4.1.
>How-To-Repeat:
>Fix:
--- audacity.shar begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# audacity
# audacity/CVS
# audacity/CVS/Root
# audacity/CVS/Repository
# audacity/CVS/Entries
# audacity/files
# audacity/files/CVS
# audacity/files/CVS/Root
# audacity/files/CVS/Repository
# audacity/files/CVS/Entries
# audacity/files/patch-Makefile.in
# audacity/files/patch-libnyquist-Makefile.in
# audacity/files/patch-libnyquist-switches.h
# audacity/files/patch-libnyquist-term.c
# audacity/files/patch-libresample-Makefile.in
# audacity/files/patch-portaudio-pa_unix.c
# audacity/files/patch-portaudio-pa_unix.h
# audacity/files/patch-portaudio-pa_unix_oss.c
# audacity/files/patch-portmixer-px_unix_oss.c
# audacity/Makefile
# audacity/distinfo
# audacity/pkg-descr
# audacity/pkg-plist
#
echo c - audacity
mkdir -p audacity > /dev/null 2>&1
echo c - audacity/CVS
mkdir -p audacity/CVS > /dev/null 2>&1
echo x - audacity/CVS/Root
sed 's/^X//' >audacity/CVS/Root << 'END-of-audacity/CVS/Root'
X:pserver:anoncvs@anoncvs.at.freebsd.org:/home/ncvs
END-of-audacity/CVS/Root
echo x - audacity/CVS/Repository
sed 's/^X//' >audacity/CVS/Repository << 'END-of-audacity/CVS/Repository'
Xports/audio/audacity
END-of-audacity/CVS/Repository
echo x - audacity/CVS/Entries
sed 's/^X//' >audacity/CVS/Entries << 'END-of-audacity/CVS/Entries'
X/distinfo/1.6/Mon Dec 12 20:02:40 2005//
X/pkg-descr/1.1/Wed May 29 18:30:13 2002//
X/pkg-plist/1.7/Mon Dec 12 20:02:40 2005//
XD/files////
X/Makefile/1.32/Sun Dec 3 09:43:15 2006//
END-of-audacity/CVS/Entries
echo c - audacity/files
mkdir -p audacity/files > /dev/null 2>&1
echo c - audacity/files/CVS
mkdir -p audacity/files/CVS > /dev/null 2>&1
echo x - audacity/files/CVS/Root
sed 's/^X//' >audacity/files/CVS/Root << 'END-of-audacity/files/CVS/Root'
X:pserver:anoncvs@anoncvs.at.freebsd.org:/home/ncvs
END-of-audacity/files/CVS/Root
echo x - audacity/files/CVS/Repository
sed 's/^X//' >audacity/files/CVS/Repository <<
'END-of-audacity/files/CVS/Repository'
Xports/audio/audacity/files
END-of-audacity/files/CVS/Repository
echo x - audacity/files/CVS/Entries
sed 's/^X//' >audacity/files/CVS/Entries << 'END-of-audacity/files/CVS/Entries'
X/patch-Makefile.in/1.2/Mon Dec 6 20:33:32 2004//
X/patch-libnyquist-Makefile.in/1.1/Wed Mar 3 13:10:46 2004//
X/patch-libnyquist-switches.h/1.1/Wed Mar 3 13:10:46 2004//
X/patch-libnyquist-term.c/1.1/Wed Mar 3 13:10:46 2004//
X/patch-libresample-Makefile.in/1.1/Wed Mar 3 13:10:46 2004//
X/patch-portaudio-pa_unix.c/1.1/Mon Dec 6 20:33:32 2004//
X/patch-portaudio-pa_unix.h/1.1/Wed Mar 3 13:10:47 2004//
X/patch-portaudio-pa_unix_oss.c/1.1/Wed Mar 3 13:10:47 2004//
X/patch-portmixer-px_unix_oss.c/1.1/Wed Mar 3 13:10:47 2004//
X/patch-src-effects-ToneGen.cpp/1.1/Sat Apr 15 20:10:03 2006//
XD
END-of-audacity/files/CVS/Entries
echo x - audacity/files/patch-Makefile.in
sed 's/^X//' >audacity/files/patch-Makefile.in <<
'END-of-audacity/files/patch-Makefile.in'
X--- Makefile.in.orig Tue Nov 30 21:49:32 2004
X+++ Makefile.in Tue Nov 30 21:50:05 2004
X@@ -31,9 +31,11 @@
X $(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)
X -test -f audacity-1.2-help.htb && $(INSTALL) -m 644
audacity-1.2-help.htb \
X $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/audacity-1.2-help.htb
X+ifeq ($(DOC),yes)
X $(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
X $(INSTALL) -m 644 README.txt
$(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt
X $(INSTALL) -m 644 LICENSE.txt
$(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt
X+endif
X
X # install manpage
X $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
END-of-audacity/files/patch-Makefile.in
echo x - audacity/files/patch-libnyquist-Makefile.in
sed 's/^X//' >audacity/files/patch-libnyquist-Makefile.in <<
'END-of-audacity/files/patch-libnyquist-Makefile.in'
X--- lib-src/libnyquist/Makefile.in.orig Tue Dec 2 19:32:18 2003
X+++ lib-src/libnyquist/Makefile.in Tue Dec 2 19:32:42 2003
X@@ -465,13 +465,13 @@
X cc -c cmt/userio.c -o cmt/userio.o $(CFLAGS)
X
X misc/intgen: misc/intgen.c
X- cd misc; make intgen
X+ cd misc; $(MAKE) intgen
X
X misc/unpacker: misc/unpacker.c misc/convert.c
X- cd misc; make unpacker
X+ cd misc; $(MAKE) unpacker
X
X misc/packer: misc/packer.c misc/convert.c
X- cd misc; make packer
X+ cd misc; $(MAKE) packer
X
X nyqsrc/sndfnintptrs.h: $(NYQHDRS) snd/snd.h misc/intgen
X $(INTGEN) nyqsrc/sndfnint $(NYQHDRS)
X@@ -481,14 +481,14 @@
X
X clean:
X rm -f libnyquist.a
X- cd misc; make clean
X+ cd misc; $(MAKE) clean
X rm -f $(OBJECTS)
X # Note that these files are machine-generated:
X rm -f nyqsrc/sndfnintptrs.h nyqsrc/sndfnint.c nyqsrc/sndfnintdefs.h
X rm -f nyqsrc/seqfnintptrs.h nyqsrc/seqfnint.c nyqsrc/seqfnintdefs.h
X
X cleaner: clean
X- cd misc; make cleaner
X+ cd misc; $(MAKE) cleaner
X rm -f *.backup */*.backup
X rm -f *~ */*.*~
X rm -f *.save */*.save
END-of-audacity/files/patch-libnyquist-Makefile.in
echo x - audacity/files/patch-libnyquist-switches.h
sed 's/^X//' >audacity/files/patch-libnyquist-switches.h <<
'END-of-audacity/files/patch-libnyquist-switches.h'
X--- lib-src/libnyquist/sys/switches.h.orig Tue Dec 2 19:14:40 2003
X+++ lib-src/libnyquist/sys/switches.h Tue Dec 2 19:16:20 2003
X@@ -39,7 +39,7 @@
X */
X #define nyquist_printf printf
X
X-#if __APPLE__ && __GNUC__ /* Mac OS X */
X+#if (__FreeBSD__ || __APPLE__) && __GNUC__ /* Mac OS X */
X #define NEED_ULONG 1
X #else
X #include <sys/types.h>
END-of-audacity/files/patch-libnyquist-switches.h
echo x - audacity/files/patch-libnyquist-term.c
sed 's/^X//' >audacity/files/patch-libnyquist-term.c <<
'END-of-audacity/files/patch-libnyquist-term.c'
X--- lib-src/libnyquist/sys/term.c.orig Tue Dec 2 19:17:30 2003
X+++ lib-src/libnyquist/sys/term.c Tue Dec 2 19:17:51 2003
X@@ -40,7 +40,7 @@
X #else
X
X #include <termios.h>
X-#ifndef __APPLE__
X+#if !defined(__APPLE__) && !defined(__FreeBSD__)
X #include <asm/ioctls.h>
X #endif
X #include <signal.h>
END-of-audacity/files/patch-libnyquist-term.c
echo x - audacity/files/patch-libresample-Makefile.in
sed 's/^X//' >audacity/files/patch-libresample-Makefile.in <<
'END-of-audacity/files/patch-libresample-Makefile.in'
X--- lib-src/libresample/Makefile.in.orig Tue Dec 2 19:46:02 2003
X+++ lib-src/libresample/Makefile.in Tue Dec 2 19:46:25 2003
X@@ -6,7 +6,7 @@
X CC = @CC@
X CFLAGS = @CFLAGS@ -Wall
X
X-LIBS = @LIBS@ -lm
X+LIBS = @LDFLAGS@ @LIBS@ -lm
X
X AR = @AR@
X RANLIB = @RANLIB@
END-of-audacity/files/patch-libresample-Makefile.in
echo x - audacity/files/patch-portaudio-pa_unix.c
sed 's/^X//' >audacity/files/patch-portaudio-pa_unix.c <<
'END-of-audacity/files/patch-portaudio-pa_unix.c'
X--- lib-src/portaudio/pa_unix_oss/pa_unix.c.orig Tue Nov 30 21:18:35 2004
X+++ lib-src/portaudio/pa_unix_oss/pa_unix.c Tue Nov 30 21:33:58 2004
X@@ -422,7 +422,7 @@
X maxPri = sched_get_priority_max(SCHEDULER_POLICY);
X if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;
X
X- if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
X+ if (pthread_setschedparam(pahsc->pahsc_WatchDogThread,
SCHEDULER_POLICY, &schp) != 0)
X {
X ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
X goto killAudio;
X@@ -465,7 +465,7 @@
X lowerAudio:
X {
X struct sched_param schat = { 0 };
X- if( sched_setscheduler(pahsc->pahsc_AudioThreadPID,
SCHED_OTHER, &schat) != 0)
X+ if( pthread_setschedparam(pahsc->pahsc_AudioThread,
SCHED_OTHER, &schat) != 0)
X {
X ERR_RPT(("PaHost_WatchDogProc: failed to lower audio
priority. errno = %d\n", errno ));
X /* Fall through into killing audio thread. */
X@@ -585,7 +585,7 @@
X
sched_get_priority_min(SCHEDULER_POLICY)) / 2;
X schp.sched_priority = pahsc->pahsc_AudioPriority;
X
X- if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
X+ if (pthread_setschedparam(pahsc->pahsc_AudioThread,
SCHEDULER_POLICY, &schp) != 0)
X {
X DBUG(("PortAudio: only superuser can use real-time priority.\n"));
X }
END-of-audacity/files/patch-portaudio-pa_unix.c
echo x - audacity/files/patch-portaudio-pa_unix.h
sed 's/^X//' >audacity/files/patch-portaudio-pa_unix.h <<
'END-of-audacity/files/patch-portaudio-pa_unix.h'
X--- lib-src/portaudio/pa_unix_oss/pa_unix.h.orig Tue Dec 2 19:56:56 2003
X+++ lib-src/portaudio/pa_unix_oss/pa_unix.h Tue Dec 2 19:58:33 2003
X@@ -82,7 +82,7 @@
X #define MAX_TIMEOUT_MSEC (1000)
X
X /************************************************* Definitions ********/
X-#ifdef __linux__
X+#if defined(__linux__) || defined(__FreeBSD__)
X #define DEVICE_NAME_BASE "/dev/dsp"
X #else
X #define DEVICE_NAME_BASE "/dev/audio"
END-of-audacity/files/patch-portaudio-pa_unix.h
echo x - audacity/files/patch-portaudio-pa_unix_oss.c
sed 's/^X//' >audacity/files/patch-portaudio-pa_unix_oss.c <<
'END-of-audacity/files/patch-portaudio-pa_unix_oss.c'
X--- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c.orig Tue Dec 2 19:57:13 2003
X+++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c Tue Dec 2 19:57:47 2003
X@@ -42,6 +42,8 @@
X
X #ifdef __linux__
X #include <linux/soundcard.h>
X+#elif defined(__FreeBSD__)
X+#include <sys/soundcard.h>
X #else
X #include <machine/soundcard.h> /* JH20010905 */
X #endif
END-of-audacity/files/patch-portaudio-pa_unix_oss.c
echo x - audacity/files/patch-portmixer-px_unix_oss.c
sed 's/^X//' >audacity/files/patch-portmixer-px_unix_oss.c <<
'END-of-audacity/files/patch-portmixer-px_unix_oss.c'
X--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig Tue Dec 2 20:06:55 2003
X+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c Tue Dec 2 20:07:09 2003
X@@ -37,6 +37,8 @@
X
X #ifdef __linux__
X #include <linux/soundcard.h>
X+#elif defined(__FreeBSD__)
X+#include <sys/soundcard.h>
X #else
X #include <machine/soundcard.h> /* JH20010905 */
X #endif
END-of-audacity/files/patch-portmixer-px_unix_oss.c
echo x - audacity/Makefile
sed 's/^X//' >audacity/Makefile << 'END-of-audacity/Makefile'
X# New ports collection makefile for: audacity
X# Date created: 21 Jul 2001
X# Whom: Marc van Woerkom
<3d@freebsd.org>
X#
X# $FreeBSD: ports/audio/audacity/Makefile,v 1.32 2006/12/01 07:38:51 pav Exp $
X
XPORTNAME= audacity
XPORTVERSION= 1.2.6
XCATEGORIES= audio
XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR= ${PORTNAME}
XDISTNAME= ${PORTNAME}-src-${PORTVERSION}
X
XMAINTAINER= craig@yekse.gank.org
XCOMMENT= Audacity is a GUI editor for digital audio waveforms
X
XBUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
X
XCONFLICTS= audacity-devel-[0-9]*
X
XWRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
XGNU_CONFIGURE= yes
XUSE_GMAKE= yes
XUSE_X_PREFIX= yes
XUSE_GETTEXT= yes
XUSE_WX= 2.4
X
XMAN1= audacity.1
XMANCOMPRESSED= yes
X
XOPTIONS= ID3TAG "ID3 tag support" off \
X MAD "Mad MP3 audio decoder support" on \
X VORBIS "OGG/Vorbis audio support" on
X
X.include <bsd.port.pre.mk>
X
X.if ${ARCH} == "i386" && ${OSVERSION} >= 501103
XSSE_CFLAGS= -mno-sse -mno-sse2
X.endif
X
XCONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib
${PTHREAD_LIBS}" \
X CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include
${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
X CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS}
${PTHREAD_CFLAGS}"
X
X.if !defined(NOPORTDOCS)
XMAKE_ENV= DOC=yes
X.endif
X
X.if !defined(WITHOUT_MAD)
XCONFIGURE_ARGS+= --with-libmad=system
XLIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad
X.else
XCONFIGURE_ARGS+= --without-libmad
X.endif
X
X.if !defined(WITHOUT_VORBIS)
XCONFIGURE_ARGS+= --with-vorbis=system
XLIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
X.else
XCONFIGURE_ARGS+= --without-vorbis
X.endif
X
X.if defined(WITH_ID3TAG)
XCONFIGURE_ARGS+= --with-id3tag=system
XLIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag
X.else
XCONFIGURE_ARGS+= --without-id3tag
X.endif
X
X.include <bsd.port.post.mk>
END-of-audacity/Makefile
echo x - audacity/distinfo
sed 's/^X//' >audacity/distinfo << 'END-of-audacity/distinfo'
XMD5 (audacity-src-1.2.6.tar.gz) = 5477ddca23592ae06cc3295f91961ec0
XSHA256 (audacity-src-1.2.6.tar.gz) =
47727a2fbdb7ee6e84953af2ba93ea8997ac5c810b0faa58afa337009791a070
XSIZE (audacity-src-1.2.6.tar.gz) = 4882379
END-of-audacity/distinfo
echo x - audacity/pkg-descr
sed 's/^X//' >audacity/pkg-descr << 'END-of-audacity/pkg-descr'
XAudacity is a program that lets you manipulate digital audio
Xwaveforms. In addition to letting you record sounds directly from
Xwithin the program, it imports many sound file formats, including
XWAV, AIFF, AU, IRCAM, MP3, and Ogg Vorbis. It supports all
Xcommon editing operations such as Cut, Copy, and Paste, plus it will
Xmix tracks and let you apply plug-in effects to any part of a sound. It
Xalso has a built-in amplitude envelope editor, a customizable
Xspectrogram mode and a frequency analysis window for audio
Xanalysis applications.
X
XAuthor: Dominic Mazzoni dominic@minorninth.com
XWWW: http://audacity.sourceforge.net
END-of-audacity/pkg-descr
echo x - audacity/pkg-plist
sed 's/^X//' >audacity/pkg-plist << 'END-of-audacity/pkg-plist'
Xbin/audacity
X%%DATADIR%%/nyquist/bug.lsp
X%%DATADIR%%/nyquist/dspprims.lsp
X%%DATADIR%%/nyquist/evalenv.lsp
X%%DATADIR%%/nyquist/follow.lsp
X%%DATADIR%%/nyquist/init.lsp
X%%DATADIR%%/nyquist/misc.lsp
X%%DATADIR%%/nyquist/nyinit.lsp
X%%DATADIR%%/nyquist/nyqmisc.lsp
X%%DATADIR%%/nyquist/nyquist.lsp
X%%DATADIR%%/nyquist/printrec.lsp
X%%DATADIR%%/nyquist/profile.lsp
X%%DATADIR%%/nyquist/seq.lsp
X%%DATADIR%%/nyquist/seqfnint.lsp
X%%DATADIR%%/nyquist/seqmidi.lsp
X%%DATADIR%%/nyquist/sndfnint.lsp
X%%DATADIR%%/nyquist/system.lsp
X%%DATADIR%%/nyquist/test.lsp
X%%DATADIR%%/nyquist/xlinit.lsp
X%%DATADIR%%/plug-ins/SilenceMarker.ny
X%%DATADIR%%/plug-ins/clicktrack.ny
X%%DATADIR%%/plug-ins/crossfadein.ny
X%%DATADIR%%/plug-ins/crossfadeout.ny
X%%DATADIR%%/plug-ins/delay.ny
X%%DATADIR%%/plug-ins/highpass.ny
X%%DATADIR%%/plug-ins/lowpass.ny
X%%DATADIR%%/plug-ins/pluck.ny
X%%DATADIR%%/plug-ins/tremolo.ny
X%%DATADIR%%/audacity-1.2-help.htb
Xshare/locale/ar/LC_MESSAGES/audacity.mo
Xshare/locale/bg/LC_MESSAGES/audacity.mo
Xshare/locale/ca/LC_MESSAGES/audacity.mo
Xshare/locale/cs/LC_MESSAGES/audacity.mo
Xshare/locale/da/LC_MESSAGES/audacity.mo
Xshare/locale/de/LC_MESSAGES/audacity.mo
Xshare/locale/el/LC_MESSAGES/audacity.mo
Xshare/locale/es/LC_MESSAGES/audacity.mo
Xshare/locale/eu/LC_MESSAGES/audacity.mo
Xshare/locale/fi/LC_MESSAGES/audacity.mo
Xshare/locale/fr/LC_MESSAGES/audacity.mo
Xshare/locale/ga/LC_MESSAGES/audacity.mo
Xshare/locale/hu/LC_MESSAGES/audacity.mo
Xshare/locale/it/LC_MESSAGES/audacity.mo
Xshare/locale/ja/LC_MESSAGES/audacity.mo
Xshare/locale/lt/LC_MESSAGES/audacity.mo
Xshare/locale/mk/LC_MESSAGES/audacity.mo
Xshare/locale/nb/LC_MESSAGES/audacity.mo
Xshare/locale/nl/LC_MESSAGES/audacity.mo
Xshare/locale/pl/LC_MESSAGES/audacity.mo
Xshare/locale/pt/LC_MESSAGES/audacity.mo
Xshare/locale/ru/LC_MESSAGES/audacity.mo
Xshare/locale/sl/LC_MESSAGES/audacity.mo
Xshare/locale/sv/LC_MESSAGES/audacity.mo
Xshare/locale/uk/LC_MESSAGES/audacity.mo
Xshare/locale/zh/LC_MESSAGES/audacity.mo
Xshare/locale/zh_TW/LC_MESSAGES/audacity.mo
X@dirrm %%DATADIR%%/plug-ins
X@dirrm %%DATADIR%%/nyquist
X@dirrm %%DATADIR%%
X%%PORTDOCS%%%%DOCSDIR%%/README.txt
X%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
X%%PORTDOCS%%@dirrm %%DOCSDIR%%
END-of-audacity/pkg-plist
exit
--- audacity.shar ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ab581e310612220142o5671b780s49bcfc49fb75b2>