summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/audacity/Makefile31
-rw-r--r--audio/audacity/PLIST6
-rw-r--r--audio/audacity/distinfo10
-rw-r--r--audio/audacity/patches/patch-af44
-rw-r--r--audio/audacity/patches/patch-ah6
5 files changed, 50 insertions, 47 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index cf5a786f855..abc61df5822 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/11/13 21:28:27 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2004/11/22 16:36:31 adam Exp $
-DISTNAME= audacity-src-1.2.2
-PKGNAME= audacity-1.2.2
-PKGREVISION= 1
+DISTNAME= audacity-src-1.2.3
+PKGNAME= audacity-1.2.3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
@@ -12,31 +11,33 @@ COMMENT= Audio editor
DEPENDS+= zip>=0.0:../../archivers/zip
-WRKSRC= ${WRKDIR}/audacity-src-1.2.2
+WRKSRC= ${WRKDIR}/audacity-src-1.2.3
USE_BUILDLINK3= yes
-USE_X11= # defined
USE_GNU_TOOLS+= make
-USE_PKGLOCALEDIR= # defined
-
-GNU_CONFIGURE= # defined
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+USE_X11= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-xaudio
CONFIGURE_ARGS+= --with-id3=system
+CONFIGURE_ARGS+= --with-libflac=system
CONFIGURE_ARGS+= --with-libmad=system
-CONFIGURE_ARGS+= --with-vorbis=system
+CONFIGURE_ARGS+= --with-libsndfile=system
CONFIGURE_ARGS+= --with-portaudio=system
-
-USE_LIBTOOL= # defined
+CONFIGURE_ARGS+= --with-vorbis=system
LTCONFIG_OVERRIDE= ${WRKSRC}/lib-src/libsndfile/libtool \
${WRKSRC}/lib-src/libsndfile/ltconfig \
${WRKSRC}/ltconfig
-.include "../../audio/id3lib/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/wxGTK/buildlink3.mk"
-.include "../../audio/portaudio/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/autoconf.mk"
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index edd98c402e0..34a10ca129c 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2004/05/24 18:17:18 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/22 16:36:31 adam Exp $
bin/audacity
man/man1/audacity.1
+share/audacity/audacity-1.2-help.htb
share/audacity/nyquist/bug.lsp
share/audacity/nyquist/dspprims.lsp
share/audacity/nyquist/evalenv.lsp
@@ -29,7 +30,6 @@ share/audacity/plug-ins/pluck.ny
share/audacity/plug-ins/tremolo.ny
share/doc/audacity/LICENSE.txt
share/doc/audacity/README.txt
-share/doc/audacity/audacity-1.2-help.htb
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/audacity.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/audacity.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/audacity.mo
@@ -49,6 +49,8 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/audacity.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/audacity.mo
${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/audacity.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/zh/LC_MESSAGES/audacity.mo
@dirrm share/audacity/nyquist
@dirrm share/audacity/plug-ins
@dirrm share/audacity
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index b594b5c6c10..9d23735c14f 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2004/08/27 12:56:54 drochner Exp $
+$NetBSD: distinfo,v 1.8 2004/11/22 16:36:31 adam Exp $
-SHA1 (audacity-src-1.2.2.tar.gz) = 1bf8e07f54159ece2f7e9ed1a39fc3b3f52e78b7
-Size (audacity-src-1.2.2.tar.gz) = 3603400 bytes
+SHA1 (audacity-src-1.2.3.tar.gz) = 98c3a171c1f5735df7c63baf1fcef52e5c38ceb8
+Size (audacity-src-1.2.3.tar.gz) = 4175943 bytes
SHA1 (patch-aa) = 5494f3fb6035f15a4447556f8cf4a0a2404a2259
SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d
SHA1 (patch-ac) = 792ec327195ce105350a4a4d2d96d1a500bdb118
SHA1 (patch-ad) = 75af90656c6709d5d7f4b166f03a2bf169e3360d
SHA1 (patch-ae) = 8e22a7a8ce064c8877323e44ffd07286fe3ea02f
-SHA1 (patch-af) = 96cb88cdd9669c9429a61df71e726b727ab1eead
-SHA1 (patch-ah) = 5519be7e138fbfc764c8e0f200624a8ab1f0fa10
+SHA1 (patch-af) = 54450e915cabde52e4276196d6eb8da331c8eedd
+SHA1 (patch-ah) = fa0c240f7e20299a6ed26692d443dfb95c0b7eb9
diff --git a/audio/audacity/patches/patch-af b/audio/audacity/patches/patch-af
index 188b70f5460..54470d0f0ca 100644
--- a/audio/audacity/patches/patch-af
+++ b/audio/audacity/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2004/04/20 18:02:16 ben Exp $
+$NetBSD: patch-af,v 1.4 2004/11/22 16:36:31 adam Exp $
---- configure.orig Sat Feb 28 11:19:39 2004
+--- configure.orig 2004-11-18 06:17:29.000000000 +0000
+++ configure
-@@ -5869,7 +5869,8 @@ fi
+@@ -6118,7 +6118,8 @@ fi
subdirs="$subdirs lib-src/portaudio-v19"
@@ -12,24 +12,10 @@ $NetBSD: patch-af,v 1.3 2004/04/20 18:02:16 ben Exp $
CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
-@@ -5941,6 +5942,84 @@ _ACEOF
+@@ -6204,6 +6205,84 @@ _ACEOF
- BUILDLIBS="$BUILDLIBS portaudio/pa_unix_oss/portaudio.a"
- EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio/pa_unix_oss/portaudio.a"
-+
-+ if [ "$use_portmixer" = "yes" ] ; then
-+ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
-+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
-+ fi
-+
-+ if [ "$use_ladspa" = "default" ] ; then
-+ use_ladspa="yes";
-+ fi
-+
-+ AFTERBUILD=""
-+
-+ esac
-+fi
+ esac
+ fi
+if [ "$use_portaudio" = "system" ] ; then
+
+ LIBS="$LIBS -lportaudio"
@@ -94,6 +80,20 @@ $NetBSD: patch-af,v 1.3 2004/04/20 18:02:16 ben Exp $
+ *)
+
+ CONFIGHEADER="configunix.h"
++
++ if [ "$use_portmixer" = "yes" ] ; then
++ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
++ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
++ fi
++
++ if [ "$use_ladspa" = "default" ] ; then
++ use_ladspa="yes";
++ fi
++
++ AFTERBUILD=""
++
++ esac
++fi
+
+ use_precomp="no"
- if [ "$use_portmixer" = "yes" ] ; then
- BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
diff --git a/audio/audacity/patches/patch-ah b/audio/audacity/patches/patch-ah
index c9d9b9bb7a7..e6016862c06 100644
--- a/audio/audacity/patches/patch-ah
+++ b/audio/audacity/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2004/04/20 18:02:16 ben Exp $
+$NetBSD: patch-ah,v 1.4 2004/11/22 16:36:31 adam Exp $
---- Makefile.in.orig Sat Feb 28 11:19:39 2004
+--- Makefile.in.orig 2004-11-18 06:17:29.000000000 +0000
+++ Makefile.in
-@@ -36,9 +36,9 @@ install: audacity
+@@ -37,9 +37,9 @@ install: audacity
# install manpage
$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-23 22:27:24 +0000