- Fix build on non-i386 arch

- Fix pathname issue when WITH_GNOME is defined
- Fix ja.po

PR:		ports/62152
Submitted by:	Ports Fury

4 files changed, 171 insertions, 0 deletions

diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index b16685918492..c094f8d7e615 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -34,6 +34,10 @@ DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
+.if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM)
+CONFIGURE_ARGS+=	--disable-asm
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's| install-exec-local||g'
diff --git a/audio/soundtracker/files/patch-app::Makefile.in b/audio/soundtracker/files/patch-app::Makefile.in
new file mode 100644
index 000000000000..6a9fc7bb5e7b
--- /dev/null
+++ b/audio/soundtracker/files/patch-app::Makefile.in
@@ -0,0 +1,15 @@
+--- app/Makefile.in.orig	Mon Jan 12 01:21:51 2004
++++ app/Makefile.in	Thu Jan 29 19:28:09 2004
+@@ -230,9 +230,9 @@
+ 
+ stdir = $(datadir)/soundtracker
+ 
+-#INCLUDES = -DDATADIR=\"$(stdir)\" \
+-#	-DLOCALEDIR=\"$(prefix)/share/locale\"
+-INCLUDES = -DLOCALEDIR=\"$(prefix)/share/locale\"
++INCLUDES = -DDATADIR=\"$(stdir)\" \
++	-DLOCALEDIR=\"$(prefix)/share/locale\"
++#INCLUDES = -DLOCALEDIR=\"$(prefix)/share/locale\"
+ subdir = app
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/audio/soundtracker/files/patch-app::gui.c b/audio/soundtracker/files/patch-app::gui.c
new file mode 100644
index 000000000000..0d5d9f192fbe
--- /dev/null
+++ b/audio/soundtracker/files/patch-app::gui.c
@@ -0,0 +1,88 @@
+--- app/gui.c.orig	Sun Jan 11 22:46:26 2004
++++ app/gui.c	Thu Jan 29 19:29:45 2004
+@@ -1724,7 +1724,7 @@
+     /* Show splash screen if enabled and image available. */
+ 
+ #ifndef NO_GDK_PIXBUF
+-    gui_splash_logo = gdk_pixbuf_new_from_file(PREFIX"/share/soundtracker/soundtracker_splash.png");
++    gui_splash_logo = gdk_pixbuf_new_from_file(DATADIR"/soundtracker_splash.png");
+     if(gui_splash_logo) {
+ 	thing = gtk_hseparator_new();
+ 	gtk_widget_show(thing);
+@@ -1925,7 +1925,7 @@
+ 
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/play.xpm");
++	DATADIR"/play.xpm");
+     pmw = gtk_pixmap_new(pm, mask);
+     pbutton = thing = gtk_button_new();
+     gtk_container_add(GTK_CONTAINER(thing), pmw);
+@@ -1937,7 +1937,7 @@
+ 
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/play_cur.xpm");
++	DATADIR"/play_cur.xpm");
+     pmw = gtk_pixmap_new(pm, mask);
+     thing = gtk_button_new();
+     gtk_container_add(GTK_CONTAINER(thing), pmw);
+@@ -1949,7 +1949,7 @@
+ 
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/stop.xpm");
++	DATADIR"/stop.xpm");
+     pmw = gtk_pixmap_new(pm, mask);
+     thing = gtk_button_new();
+     gtk_container_add(GTK_CONTAINER(thing), pmw);
+@@ -1975,7 +1975,7 @@
+ 		       
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/lock.xpm");
++	DATADIR"/lock.xpm");
+     pmw = gtk_pixmap_new(pm, mask);
+     toggle_lock_editpat = thing = gtk_toggle_button_new();
+     gtk_container_add(GTK_CONTAINER(thing), pmw);
+@@ -2033,13 +2033,13 @@
+     vbox = gtk_vbox_new(FALSE, 0);
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/sharp.xpm");
++	DATADIR"/sharp.xpm");
+     alt[0] = gtk_pixmap_new(pm, mask);
+     gtk_box_pack_start(GTK_BOX(vbox), alt[0], FALSE, FALSE, 0);
+     
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/flat.xpm");
++	DATADIR"/flat.xpm");
+     alt[1] = gtk_pixmap_new(pm, mask);
+     gtk_widget_show(alt[gui_settings.sharp ? 0 : 1]);
+     gtk_box_pack_start(GTK_BOX(vbox), alt[1], FALSE, FALSE, 0);
+@@ -2102,13 +2102,13 @@
+     vbox = gtk_vbox_new(FALSE, 0);
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/downarrow.xpm");
++	DATADIR"/downarrow.xpm");
+     arrow[0] = gtk_pixmap_new(pm, mask);
+     gtk_box_pack_start(GTK_BOX(vbox), arrow[0], FALSE, FALSE, 0);
+     
+     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
+ 	&mask, &style->bg[GTK_STATE_NORMAL],
+-	PREFIX"/share/soundtracker/rightarrow.xpm");
++	DATADIR"/rightarrow.xpm");
+     arrow[1] = gtk_pixmap_new(pm, mask);
+     gtk_box_pack_start(GTK_BOX(vbox), arrow[1], FALSE, FALSE, 0);
+     gtk_widget_show(arrow[gui_settings.advance_cursor_in_fx_columns ? 1 : 0]);
+@@ -2129,7 +2129,7 @@
+     gtk_widget_show(thing);
+ 
+ #ifndef NO_GDK_PIXBUF
+-    scopegroup = SCOPE_GROUP(scope_group_new(gdk_pixbuf_new_from_file(PREFIX"/share/soundtracker/muted.png")));
++    scopegroup = SCOPE_GROUP(scope_group_new(gdk_pixbuf_new_from_file(DATADIR"/muted.png")));
+ #else
+     scopegroup = SCOPE_GROUP(scope_group_new());
+ #endif
diff --git a/audio/soundtracker/files/patch-po::ja.po b/audio/soundtracker/files/patch-po::ja.po
new file mode 100644
index 000000000000..bf432fc77cf4
--- /dev/null
+++ b/audio/soundtracker/files/patch-po::ja.po
@@ -0,0 +1,64 @@
+--- po/ja.po.orig	Mon Jan 12 02:50:07 2004
++++ po/ja.po	Thu Jan 29 18:44:40 2004
+@@ -2,13 +2,13 @@
+ # Copyright (C) 1998-2000 Michael Krause <m.krause@tu-harburg.de>.
+ # Translators: Atsushi Yamagata <yamagata@plathome.co.jp>, 1999, 2000.
+ #              Yuuki NINOMIYA <gm@smn.enjoy.ne.jp>, 1999, 2000.
+-#              Junichi Uekawa <dancer@debian.org>, 2002, 2003.
++#              Junichi Uekawa <dancer@debian.org>, 2002, 2003, 2004.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: SoundTracker 0.3.10\n"
+ "POT-Creation-Date: 2004-01-11 17:20+0100\n"
+-"PO-Revision-Date: 2003-08-05 06:54+0900\n"
++"PO-Revision-Date: 2004-01-12 12:13+0900\n"
+ "Last-Translator: Junichi Uekawa <dancer@debian.org>\n"
+ "Language-Team: Debian Japanese project <debian-japanese@lists.debian.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -549,6 +549,8 @@
+ "Odd pattern rows contain data which will be lost after shrinking.\n"
+ "Do you want to continue anyway?"
+ msgstr ""
++"奇数のパターンの列は縮小すると失われます．\n"
++"続行しますか？"
+ 
+ #: app/gui.c:497
+ msgid ""
+@@ -556,6 +558,8 @@
+ "Some data at the end of the pattern will be lost.Do you want to continue "
+ "anyway?"
+ msgstr ""
++"拡張するにはパターンは長すぎます．\n"
++"パターンの最後のデータが一部失われる事になります．続行しますか？"
+ 
+ #. No file was actually selected.
+ #: app/gui.c:546 app/instrument-editor.c:212 app/sample-editor.c:1685
+@@ -1040,9 +1044,8 @@
+ msgstr "オクターブ下げる"
+ 
+ #: app/menubar.c:520
+-#, fuzzy
+ msgid "P_aste"
+-msgstr "貼付"
++msgstr "貼付(_a)"
+ 
+ #: app/menubar.c:525
+ msgid "_Jazz Edit Mode"
+@@ -1089,14 +1092,12 @@
+ msgstr "パターンを読み込み(_o)"
+ 
+ #: app/menubar.c:590
+-#, fuzzy
+ msgid "Sh_rink Current Pattern"
+-msgstr "現在のパターン"
++msgstr "現在のパターンを縮小(_r)"
+ 
+ #: app/menubar.c:592
+-#, fuzzy
+ msgid "_Expand Current Pattern"
+-msgstr "現在のパターンを保存(_S)"
++msgstr "現在のパターンを拡張(_E)"
+ 
+ #: app/menubar.c:599
+ msgid "_Load XI..."