7 files changed, 74 insertions, 23 deletions

diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index fa95073c571b..97fb5711aa3e 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -6,8 +6,7 @@
 #    $MCom: ports/audio/terminatorx/Makefile,v 1.6 2007/08/04 03:51:28 marcus Exp $
 
 PORTNAME=	terminatorx
-PORTVERSION=	3.82
-PORTREVISION=	13
+PORTVERSION=	3.83
 CATEGORIES=	audio
 MASTER_SITES=	http://terminatorx.org/dist/
 DISTNAME=	terminatorX-${PORTVERSION}
@@ -21,26 +20,30 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		lrdf.2:${PORTSDIR}/textproc/liblrdf \
 		jack.0:${PORTSDIR}/audio/jack
 
+OPTIONS=	MPG123 "mpg123 support" on \
+		SOX "sox (.au) support" on \
+		VORBIS "OGG Vorbis support" on \
+		MAD "MPEG Audio Decoder (libmad) support" on
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_BZIP2=	yes
-INSTALLS_OMF=	yes
 USE_XORG=	x11 xext xi xxf86dga ice sm
-USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20 libxml2
+USE_GNOME=	gnomehack gnomehier gtk20 libxml2
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf autoheader
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf
+ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-alsa \
-		--disable-alsamidi
-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
+		--disable-alsamidi \
+		--disable-scheduler
+INSTALLS_OMF=	yes
 
 MAN1=		terminatorX.1
 
-OPTIONS=	MPG123 "mpg123 support" on \
-		SOX "sox (.au) support" on \
-		VORBIS "OGG Vorbis support" on \
-		MAD "MPEG Audio Decoder (libmad) support" on
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
@@ -86,8 +89,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \
 		${PREFIX}/share/mime-info
 .endfor
+	@${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gnome-support/terminatorX.desktop \
-		${PREFIX}/share/gnome/apps/Multimedia
+		${PREFIX}/share/applications
 	@${MKDIR} ${PREFIX}/share/gnome/help/terminatorX/C
 	${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/terminatorX-manual.xml \
 		${PREFIX}/share/gnome/help/terminatorX/C/terminatorX.xml
diff --git a/audio/terminatorx/distinfo b/audio/terminatorx/distinfo
index dd51a177cabb..c6fd675ae61c 100644
--- a/audio/terminatorx/distinfo
+++ b/audio/terminatorx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (terminatorX-3.82.tar.bz2) = dad251021d6fab5a47eff8fde7afdfd18f97d2f5b940a90686a0fed580a04bd9
-SIZE (terminatorX-3.82.tar.bz2) = 395755
+SHA256 (terminatorX-3.83.tar.bz2) = 9d9a01036be03f2b36b8471538063c8b082bdbf717e7e5467c549d723e9f3d72
+SIZE (terminatorX-3.83.tar.bz2) = 449234
diff --git a/audio/terminatorx/files/patch-src__tX_mastergui.cc b/audio/terminatorx/files/patch-src__tX_mastergui.cc
new file mode 100644
index 000000000000..eb889529c199
--- /dev/null
+++ b/audio/terminatorx/files/patch-src__tX_mastergui.cc
@@ -0,0 +1,20 @@
+--- src/tX_mastergui.cc.orig	2011-01-31 06:01:32.000000000 +0900
++++ src/tX_mastergui.cc	2011-03-24 11:38:00.000000000 +0900
+@@ -273,7 +273,7 @@
+ GtkSignalFunc new_tables() {
+ 	GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
+ 		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+-		"Are you sure you want to loose all turntables and events?");
++		"Are you sure you want to lose all turntables and events?");
+ 	
+ 	int res=gtk_dialog_run(GTK_DIALOG(dialog));
+ 	gtk_widget_destroy(dialog);
+@@ -894,7 +894,7 @@
+ 	if (globals.quit_confirm) {
+ 		GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
+ 		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+-		"Exit terminatorX and loose all unsaved data?");
++		"Exit terminatorX and lose all unsaved data?");
+ 		
+ 		int res=gtk_dialog_run(GTK_DIALOG(dialog));
+ 		gtk_widget_destroy(dialog);
diff --git a/audio/terminatorx/files/patch-src__tX_mouse.cc b/audio/terminatorx/files/patch-src__tX_mouse.cc
new file mode 100644
index 000000000000..a2fec9e93450
--- /dev/null
+++ b/audio/terminatorx/files/patch-src__tX_mouse.cc
@@ -0,0 +1,12 @@
+--- src/tX_mouse.cc.orig	2011-01-31 06:01:32.000000000 +0900
++++ src/tX_mouse.cc	2011-04-02 11:56:20.000000000 +0900
+@@ -47,7 +47,8 @@
+ #include "tX_global.h"
+ #include "tX_engine.h"
+ #include "tX_vtt.h"
+-#include <stdlib.h>
++#include <cstdlib>
++#include <cmath>
+ 
+ #define TX_MOUSE_SPEED_NORMAL 0.05
+ #define TX_MOUSE_SPEED_WARP 250000
diff --git a/audio/terminatorx/files/patch-src__tX_mouse.h b/audio/terminatorx/files/patch-src__tX_mouse.h
new file mode 100644
index 000000000000..d86d25ccd1cd
--- /dev/null
+++ b/audio/terminatorx/files/patch-src__tX_mouse.h
@@ -0,0 +1,11 @@
+--- src/tX_mouse.h.orig	2011-01-31 06:01:32.000000000 +0900
++++ src/tX_mouse.h	2011-03-18 02:55:38.000000000 +0900
+@@ -34,7 +34,7 @@
+ #include <X11/extensions/XInput.h>
+ #include <X11/keysym.h>
+ #include <glib.h>
+-#include <gdk/gdk.h>
++#include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ 
+ /* Use old gdk keys if the new ones are not yet defined */
diff --git a/audio/terminatorx/pkg-descr b/audio/terminatorx/pkg-descr
index f0a3f9c48a16..ac1e1e62b299 100644
--- a/audio/terminatorx/pkg-descr
+++ b/audio/terminatorx/pkg-descr
@@ -1,5 +1,8 @@
-terminatorX is a realtime audio synthesizer that allows you to "scratch" on digitally sampled audio data (*.wav, *.au, *.mp3, etc.) the way hiphop-DJs scratch on vinyl records. 
+terminatorX is a realtime audio synthesizer that allows you to "scratch"
+on digitally sampled audio data (*.wav, *.au, *.mp3, etc.) the way
+hiphop-DJs scratch on vinyl records.
 
-It features multiple turntables, realtime effects (built-in as well as LADSPA plugin effects), a sequencer and an easy-to-use gtk+ GUI.
+It features multiple turntables, realtime effects (built-in as well as
+LADSPA plugin effects), a sequencer and an easy-to-use gtk+ GUI.
 
-WWW: http://www.terminatorx.org
+WWW: http://www.terminatorx.org/
diff --git a/audio/terminatorx/pkg-plist b/audio/terminatorx/pkg-plist
index 1b64bfbd895a..20d8cb2ee391 100644
--- a/audio/terminatorx/pkg-plist
+++ b/audio/terminatorx/pkg-plist
@@ -1,7 +1,7 @@
 bin/terminatorX
-share/gnome/apps/Multimedia/terminatorX.desktop
-share/gnome/help/terminatorX/C/terminatorX.xml
+share/applications/terminatorX.desktop
 share/gnome/help/terminatorX/C/figures/signalflow.png
+share/gnome/help/terminatorX/C/terminatorX.xml
 share/mime-info/terminatorX.keys
 share/mime-info/terminatorX.mime
 share/omf/terminatorX/terminatorX-C.omf
@@ -11,3 +11,4 @@ share/pixmaps/terminatorX-mime.png
 @dirrm share/gnome/help/terminatorX/C/figures
 @dirrm share/gnome/help/terminatorX/C
 @dirrm share/gnome/help/terminatorX
+@dirrmtry share/applications