6 files changed, 49 insertions, 35 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index bb2527dbb89c..473fcc5880e4 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,18 +19,21 @@ LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=	15
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 501103
+SSE_CFLAGS=	-mno-sse -mno-sse2
+.endif
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
 		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 CONFIGURE_ARGS+=	--with-id3=no
 
-.include <bsd.port.pre.mk>
-
 .if !defined(NOPORTDOCS)
 MAKE_ENV=	DOC=yes
 .endif
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index b0df6d7eea73..d7e71e102999 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,2 +1,2 @@
-MD5 (audacity-src-1.2.1.tar.bz2) = 8914538a3edb6f88e2f70fb2fec3790f
-SIZE (audacity-src-1.2.1.tar.bz2) = 2742327
+MD5 (audacity-src-1.2.3.tar.gz) = dbfc1b401420aa694753d35acb5a8a28
+SIZE (audacity-src-1.2.3.tar.gz) = 4175943
diff --git a/audio/audacity/files/patch-Makefile.in b/audio/audacity/files/patch-Makefile.in
index c441c03b455e..b60ff9e8b2c5 100644
--- a/audio/audacity/files/patch-Makefile.in
+++ b/audio/audacity/files/patch-Makefile.in
@@ -1,14 +1,11 @@
---- 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)
- 
+--- Makefile.in.orig	Tue Nov 30 21:49:32 2004
++++ Makefile.in	Tue Nov 30 21:50:05 2004
+@@ -31,9 +31,11 @@
+ 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)
+ 	-test -f audacity-1.2-help.htb && $(INSTALL) -m 644 audacity-1.2-help.htb \
+ 		$(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/audacity-1.2-help.htb
 +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
diff --git a/audio/audacity/files/patch-portaudio-pa_unix.c b/audio/audacity/files/patch-portaudio-pa_unix.c
new file mode 100644
index 000000000000..ff3c8ca818fd
--- /dev/null
+++ b/audio/audacity/files/patch-portaudio-pa_unix.c
@@ -0,0 +1,29 @@
+--- lib-src/portaudio/pa_unix_oss/pa_unix.c.orig	Tue Nov 30 21:18:35 2004
++++ lib-src/portaudio/pa_unix_oss/pa_unix.c	Tue Nov 30 21:33:58 2004
+@@ -422,7 +422,7 @@
+     maxPri = sched_get_priority_max(SCHEDULER_POLICY);
+     if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;
+ 
+-    if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
++    if (pthread_setschedparam(pahsc->pahsc_WatchDogThread, SCHEDULER_POLICY, &schp) != 0)
+     {
+         ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
+         goto killAudio;
+@@ -465,7 +465,7 @@
+ lowerAudio:
+     {
+         struct sched_param    schat = { 0 };
+-        if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)
++        if( pthread_setschedparam(pahsc->pahsc_AudioThread, SCHED_OTHER, &schat) != 0)
+         {
+             ERR_RPT(("PaHost_WatchDogProc: failed to lower audio priority. errno = %d\n", errno ));
+             /* Fall through into killing audio thread. */
+@@ -585,7 +585,7 @@
+                                   sched_get_priority_min(SCHEDULER_POLICY)) / 2;
+     schp.sched_priority = pahsc->pahsc_AudioPriority;
+ 
+-    if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
++    if (pthread_setschedparam(pahsc->pahsc_AudioThread, SCHEDULER_POLICY, &schp) != 0)
+     {
+         DBUG(("PortAudio: only superuser can use real-time priority.\n"));
+     }
diff --git a/audio/audacity/files/patch-soundtouch-Makefile.in b/audio/audacity/files/patch-soundtouch-Makefile.in
deleted file mode 100644
index 16b5d8b492f0..000000000000
--- a/audio/audacity/files/patch-soundtouch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist
index 9d2be6cd7d95..fdb473b161d6 100644
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@@ -25,6 +25,7 @@ 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/audacity/audacity-1.2-help.htb
 share/locale/bg/LC_MESSAGES/audacity.mo
 share/locale/ca/LC_MESSAGES/audacity.mo
 share/locale/cs/LC_MESSAGES/audacity.mo
@@ -44,10 +45,11 @@ share/locale/pt/LC_MESSAGES/audacity.mo
 share/locale/ru/LC_MESSAGES/audacity.mo
 share/locale/sl/LC_MESSAGES/audacity.mo
 share/locale/sv/LC_MESSAGES/audacity.mo
+share/locale/uk/LC_MESSAGES/audacity.mo
+share/locale/zh/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%%