Date: Tue, 2 Mar 2004 21:42:42 -0600 From: Craig Boston <craig@yekse.gank.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63673: [maintainer update] Audacity 1.2.0 Message-ID: <200403022142.43742.craig@yekse.gank.org> Resent-Message-ID: <200403030350.i233oKTH074437@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63673
>Category: ports
>Synopsis: [maintainer update] Audacity 1.2.0
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 02 19:50:19 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Craig Boston
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
Uncertainty, LLC
>Environment:
System: FreeBSD darth-laptop 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Thu Feb
26 16:43:01 CST 2004
root@darth-laptop:/mnt/compile/obj/mnt/compile/src/sys/DARTH-LAPTOP i386
>Description:
Audacity 1.2.0 has been released
>How-To-Repeat:
n/a
>Fix:
A few minor changes since 1.2.0pre3. Tested on 5.2.1-REL, 4.9-REL,
and -STABLE.
Files removed:
files/patch-audioarts.c
files/patch::Help.cpp
files/patch::Help.h
--- audacity-1.2.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/audacity/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 4 Feb 2004 05:18:24 -0000 1.14
+++ Makefile 3 Mar 2004 03:17:40 -0000
@@ -5,59 +5,58 @@
# $FreeBSD: ports/audio/audacity/Makefile,v 1.14 2004/02/04 05:18:24 marcus
Exp $
PORTNAME= audacity
-PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTVERSION= 1.2.0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-src-${PORTVERSION}-2
-EXTRACT_SUFX= .tgz
+DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= craig@yekse.gank.org
COMMENT= Audacity is a GUI editor for digital audio waveforms
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
- mad.2:${PORTSDIR}/audio/mad
-
-CONFLICTS= audacity-1.2*
+LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-AUDACITY_HELP_DIR= ${PREFIX}/share/doc/audacity
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- CFLAGS="-DAUDACITY_HELP_DIR=${AUDACITY_HELP_DIR} ${PTHREAD_CFLAGS}" \
+USE_LIBTOOL= yes
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
-CONFIGURE_ARGS+= --with-id3=no --with-libmad=yes
+CONFIGURE_ARGS+= --with-id3=no
.include <bsd.port.pre.mk>
-.if defined(WITH_ARTS)
-LIB_DEPENDS+= qtmcop.1:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+= --with-arts-soundserver=yes
+.if !defined(NOPORTDOCS)
+MAKE_ENV= DOC=yes
+.endif
+
+.if !defined(WITHOUT_MAD)
+CONFIGURE_ARGS+= --with-libmad=system
+LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad
+.else
+CONFIGURE_ARGS+= --without-libmad
.endif
.if !defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+= --with-vorbis
+CONFIGURE_ARGS+= --with-vorbis=system
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
+.else
+CONFIGURE_ARGS+= --without-vorbis
.endif
pre-everything::
+.if !defined(WITHOUT_MAD)
+ @${ECHO_MSG} "You can disable support for libmad (MP3) by defining
WITHOUT_MAD."
+.endif
.if !defined(WITHOUT_VORBIS)
@${ECHO_MSG} "You can disable support for vorbis by defining
WITHOUT_VORBIS."
.endif
-.if !defined(WITH_ARTS)
- @${ECHO_MSG} "You can use artsd instead of OSS for output by defining
WITH_ARTS."
-.endif
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/audacity ${PREFIX}/bin/audacity
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/audacity
- ${INSTALL_DATA} ${WRKSRC}/audacity-help.htb ${WRKSRC}/README.txt
${WRKSRC}/LICENSE.txt ${PREFIX}/share/doc/audacity/
-.endif
+MAN1= audacity.1
+MANCOMPRESSED= yes
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/audacity/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 7 Aug 2002 03:41:30 -0000 1.2
+++ distinfo 3 Mar 2004 03:17:37 -0000
@@ -1 +1,2 @@
-MD5 (audacity-src-1.0.0-2.tgz) = 221573db91b48d521a55c7432189df80
+MD5 (audacity-src-1.2.0.tar.gz) = 2cc3dca5327954b876f47124ab6f3586
+SIZE (audacity-src-1.2.0.tar.gz) = 3341562
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/audacity/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist 21 Oct 2003 11:23:56 -0000 1.3
+++ pkg-plist 3 Mar 2004 03:34:38 -0000
@@ -1,5 +1,46 @@
bin/audacity
-%%PORTDOCS%%%%DOCSDIR%%/audacity-help.htb
+share/audacity/nyquist/bug.lsp
+share/audacity/nyquist/dspprims.lsp
+share/audacity/nyquist/evalenv.lsp
+share/audacity/nyquist/follow.lsp
+share/audacity/nyquist/init.lsp
+share/audacity/nyquist/misc.lsp
+share/audacity/nyquist/nyinit.lsp
+share/audacity/nyquist/nyqmisc.lsp
+share/audacity/nyquist/nyquist.lsp
+share/audacity/nyquist/printrec.lsp
+share/audacity/nyquist/profile.lsp
+share/audacity/nyquist/seq.lsp
+share/audacity/nyquist/seqfnint.lsp
+share/audacity/nyquist/seqmidi.lsp
+share/audacity/nyquist/sndfnint.lsp
+share/audacity/nyquist/system.lsp
+share/audacity/nyquist/test.lsp
+share/audacity/nyquist/xlinit.lsp
+share/audacity/plug-ins/clicktrack.ny
+share/audacity/plug-ins/crossfadein.ny
+share/audacity/plug-ins/crossfadeout.ny
+share/audacity/plug-ins/delay.ny
+share/audacity/plug-ins/highpass.ny
+share/audacity/plug-ins/lowpass.ny
+share/audacity/plug-ins/pluck.ny
+share/audacity/plug-ins/tremolo.ny
+share/locale/bg/LC_MESSAGES/audacity.mo
+share/locale/ca/LC_MESSAGES/audacity.mo
+share/locale/cs/LC_MESSAGES/audacity.mo
+share/locale/da/LC_MESSAGES/audacity.mo
+share/locale/de/LC_MESSAGES/audacity.mo
+share/locale/es/LC_MESSAGES/audacity.mo
+share/locale/it/LC_MESSAGES/audacity.mo
+share/locale/mk/LC_MESSAGES/audacity.mo
+share/locale/nl/LC_MESSAGES/audacity.mo
+share/locale/pt/LC_MESSAGES/audacity.mo
+share/locale/ru/LC_MESSAGES/audacity.mo
+share/locale/sv/LC_MESSAGES/audacity.mo
+@dirrm share/audacity/plug-ins
+@dirrm share/audacity/nyquist
+@dirrm share/audacity
+%%PORTDOCS%%%%DOCSDIR%%/audacity-1.2-help.htb
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,17 @@
+--- Makefile.in.orig Tue Dec 2 22:43:47 2003
++++ Makefile.in Tue Dec 2 22:46:38 2003
+@@ -27,12 +27,14 @@
+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME)
+
++ifeq ($(DOC),yes)
+ # install docs
+ $(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
+ -test -f audacity-1.2-help.htb && $(INSTALL) -m 644 audacity-1.2-help.htb \
+ $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/audacity-1.2-help.htb
+ $(INSTALL) -m 644 README.txt
$(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt
+ $(INSTALL) -m 644 LICENSE.txt
$(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt
++endif
+
+ # install manpage
+ $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
Index: files/patch-audioarts.c
===================================================================
RCS file: files/patch-audioarts.c
diff -N files/patch-audioarts.c
--- files/patch-audioarts.c 29 May 2002 18:30:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- snd/audioarts.c.orig Wed May 29 19:10:43 2002
-+++ snd/audioarts.c Wed May 29 19:10:51 2002
-@@ -11,7 +11,7 @@
-
- #include <sys/time.h>
-
--#include <kde/artsc/artsc.h>
-+#include <artsc/artsc.h>
-
- /* snd includes */
-
Index: files/patch-libnyquist-Makefile.in
===================================================================
RCS file: files/patch-libnyquist-Makefile.in
diff -N files/patch-libnyquist-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-libnyquist-Makefile.in 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,36 @@
+--- lib-src/libnyquist/Makefile.in.orig Tue Dec 2 19:32:18 2003
++++ lib-src/libnyquist/Makefile.in Tue Dec 2 19:32:42 2003
+@@ -465,13 +465,13 @@
+ cc -c cmt/userio.c -o cmt/userio.o $(CFLAGS)
+
+ misc/intgen: misc/intgen.c
+- cd misc; make intgen
++ cd misc; $(MAKE) intgen
+
+ misc/unpacker: misc/unpacker.c misc/convert.c
+- cd misc; make unpacker
++ cd misc; $(MAKE) unpacker
+
+ misc/packer: misc/packer.c misc/convert.c
+- cd misc; make packer
++ cd misc; $(MAKE) packer
+
+ nyqsrc/sndfnintptrs.h: $(NYQHDRS) snd/snd.h misc/intgen
+ $(INTGEN) nyqsrc/sndfnint $(NYQHDRS)
+@@ -481,14 +481,14 @@
+
+ clean:
+ rm -f libnyquist.a
+- cd misc; make clean
++ cd misc; $(MAKE) clean
+ rm -f $(OBJECTS)
+ # Note that these files are machine-generated:
+ rm -f nyqsrc/sndfnintptrs.h nyqsrc/sndfnint.c nyqsrc/sndfnintdefs.h
+ rm -f nyqsrc/seqfnintptrs.h nyqsrc/seqfnint.c nyqsrc/seqfnintdefs.h
+
+ cleaner: clean
+- cd misc; make cleaner
++ cd misc; $(MAKE) cleaner
+ rm -f *.backup */*.backup
+ rm -f *~ */*.*~
+ rm -f *.save */*.save
Index: files/patch-libnyquist-switches.h
===================================================================
RCS file: files/patch-libnyquist-switches.h
diff -N files/patch-libnyquist-switches.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-libnyquist-switches.h 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,11 @@
+--- lib-src/libnyquist/sys/switches.h.orig Tue Dec 2 19:14:40 2003
++++ lib-src/libnyquist/sys/switches.h Tue Dec 2 19:16:20 2003
+@@ -39,7 +39,7 @@
+ */
+ #define nyquist_printf printf
+
+-#if __APPLE__ && __GNUC__ /* Mac OS X */
++#if (__FreeBSD__ || __APPLE__) && __GNUC__ /* Mac OS X */
+ #define NEED_ULONG 1
+ #else
+ #include <sys/types.h>
Index: files/patch-libnyquist-term.c
===================================================================
RCS file: files/patch-libnyquist-term.c
diff -N files/patch-libnyquist-term.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-libnyquist-term.c 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,11 @@
+--- lib-src/libnyquist/sys/term.c.orig Tue Dec 2 19:17:30 2003
++++ lib-src/libnyquist/sys/term.c Tue Dec 2 19:17:51 2003
+@@ -40,7 +40,7 @@
+ #else
+
+ #include <termios.h>
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <asm/ioctls.h>
+ #endif
+ #include <signal.h>
Index: files/patch-libresample-Makefile.in
===================================================================
RCS file: files/patch-libresample-Makefile.in
diff -N files/patch-libresample-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-libresample-Makefile.in 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,11 @@
+--- lib-src/libresample/Makefile.in.orig Tue Dec 2 19:46:02 2003
++++ lib-src/libresample/Makefile.in Tue Dec 2 19:46:25 2003
+@@ -6,7 +6,7 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -Wall
+
+-LIBS = @LIBS@ -lm
++LIBS = @LDFLAGS@ @LIBS@ -lm
+
+ AR = @AR@
+ RANLIB = @RANLIB@
Index: files/patch-portaudio-pa_unix.h
===================================================================
RCS file: files/patch-portaudio-pa_unix.h
diff -N files/patch-portaudio-pa_unix.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-portaudio-pa_unix.h 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,11 @@
+--- lib-src/portaudio/pa_unix_oss/pa_unix.h.orig Tue Dec 2 19:56:56 2003
++++ lib-src/portaudio/pa_unix_oss/pa_unix.h Tue Dec 2 19:58:33 2003
+@@ -82,7 +82,7 @@
+ #define MAX_TIMEOUT_MSEC (1000)
+
+ /************************************************* Definitions ********/
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+ #define DEVICE_NAME_BASE "/dev/dsp"
+ #else
+ #define DEVICE_NAME_BASE "/dev/audio"
Index: files/patch-portaudio-pa_unix_oss.c
===================================================================
RCS file: files/patch-portaudio-pa_unix_oss.c
diff -N files/patch-portaudio-pa_unix_oss.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-portaudio-pa_unix_oss.c 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,11 @@
+--- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c.orig Tue Dec 2 19:57:13 2003
++++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c Tue Dec 2 19:57:47 2003
+@@ -42,6 +42,8 @@
+
+ #ifdef __linux__
+ #include <linux/soundcard.h>
++#elif defined(__FreeBSD__)
++#include <sys/soundcard.h>
+ #else
+ #include <machine/soundcard.h> /* JH20010905 */
+ #endif
Index: files/patch-portmixer-px_unix_oss.c
===================================================================
RCS file: files/patch-portmixer-px_unix_oss.c
diff -N files/patch-portmixer-px_unix_oss.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-portmixer-px_unix_oss.c 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,11 @@
+--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig Tue Dec 2 20:06:55 2003
++++ lib-src/portmixer/px_unix_oss/px_unix_oss.c Tue Dec 2 20:07:09 2003
+@@ -37,6 +37,8 @@
+
+ #ifdef __linux__
+ #include <linux/soundcard.h>
++#elif defined(__FreeBSD__)
++#include <sys/soundcard.h>
+ #else
+ #include <machine/soundcard.h> /* JH20010905 */
+ #endif
Index: files/patch-soundtouch-Makefile.in
===================================================================
RCS file: files/patch-soundtouch-Makefile.in
diff -N files/patch-soundtouch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-soundtouch-Makefile.in 3 Mar 2004 03:17:49 -0000
@@ -0,0 +1,16 @@
+--- lib-src/soundtouch/Makefile.in.orig Tue Dec 2 19:01:28 2003
++++ lib-src/soundtouch/Makefile.in Tue Dec 2 19:03:17 2003
+@@ -1,10 +1,10 @@
+ all:
+- cd src && make
++ cd src && $(MAKE)
+
+ clean:
+ rm -f *~ *.a config.cache config.log config.status core*
+- cd src && make clean
++ cd src && $(MAKE) clean
+
+ distclean: clean
+ rm -f Makefile
+- cd src && make dist
++ cd src && $(MAKE) dist
Index: files/patch::Help.cpp
===================================================================
RCS file: files/patch::Help.cpp
diff -N files/patch::Help.cpp
--- files/patch::Help.cpp 29 May 2002 18:30:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- Help.cpp.orig Mon Sep 17 16:50:58 2001
-+++ Help.cpp Mon Sep 17 16:53:11 2001
-@@ -61,7 +61,7 @@
- void InitHelp(wxWindow * parent)
- {
- if (!gHelp) {
-- wxString defaultLoc = wxGetCwd() + wxFILE_SEP_PATH +
"audacity-help.htb";
-+ wxString defaultLoc = AUDACITY_HELP_DIR + wxFILE_SEP_PATH +
"audacity-help.htb";
-
- wxString helpFilePath =
- gPrefs->Read("/Help/HelpFilePath", defaultLoc);
Index: files/patch::Help.h
===================================================================
RCS file: files/patch::Help.h
diff -N files/patch::Help.h
--- files/patch::Help.h 29 May 2002 18:30:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- Help.h.orig Mon Sep 17 16:52:09 2001
-+++ Help.h Mon Sep 17 16:52:53 2001
-@@ -11,6 +11,10 @@
- #ifndef __AUDACITY_HELP__
- #define __AUDACITY_HELP__
-
-+#ifndef AUDACITY_HELP_DIR
-+#define AUDACITY_HELP_DIR /usr/X11R6/share/audacity
-+#endif
-+
- void InitHelp(wxWindow * parent);
- void ShowHelp(wxWindow * parent);
- void ShowHelp(wxWindow * parent, wxString topic);
--- audacity-1.2.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403022142.43742.craig>