On Sat, Jul 28, 2007 at 01:37:52PM -0400, Nick Guenther wrote: > I'm interested in getting into tracking-music (a-la the old DOS > fasttracker) but it keeps crashing on me. I'm using the plain version > (not -esd and not -esd-gnome). Is it just the files I'm trying to > play, or is this thing generally unstable. In that case, which tracker > should I use instead?
It is indeed unstable. Try this update to the port. BTW, if anyone
can tell me which options to ``cvs diff'' produces a diff that
removes the files that are gone, I'm interested to hear.
I've got ``diff -Nup'' in ~/.cvsrc, but that doesn't do the trick.
If Wilbern doesn't want to maintain this one, I can take over.
Juha
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/soundtracker/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 1 Aug 2006 12:13:28 -0000 1.12
+++ Makefile 29 Jul 2007 15:44:16 -0000
@@ -3,9 +3,8 @@
COMMENT= "Music tracking tool for X11"
-VERSION= 0.6.6
+VERSION= 0.6.8
DISTNAME= soundtracker-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES= audio
HOMEPAGE= http://www.soundtracker.org/
@@ -16,14 +15,14 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext Xi c glib gmodule m pthread
+WANTLIB= gmodule gthread glib Xi tiff jpeg png z m
V=v0.6
-MASTER_SITES= http://www.soundtracker.org/dl/$V/ \
- http://mirror.csoft.org/soundtracker/
+MASTER_SITES= http://www.soundtracker.org/dl/$V/
LIB_DEPENDS= gtk.>=1.2,gdk.>=1.2::x11/gtk+ \
- audiofile::devel/libaudiofile
+ sndfile.>=1::audio/libsndfile \
+ gdk_pixbuf.>=2::graphics/gdk-pixbuf
MODULES= gettext
@@ -31,22 +30,21 @@ FLAVORS= gnome esd
FLAVOR?=
USE_X11= Yes
-AUTOCONF_VERSION= 2.52
+AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS= --with-audiofile-prefix=${LOCALBASE} \
+CONFIGURE_ARGS= --with-gdk-pixbuf-prefix=${LOCALBASE} \
--disable-alsa \
--disable-sgi \
+ --disable-sdl \
--disable-oss
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.if ${FLAVOR:L:Mgnome}
-LIB_DEPENDS+=
gnome.>=36,gnomesupport,gnomeui.>=46,art_lgpl.>=4::x11/gnome/libs \
- gdk_pixbuf::graphics/gdk-pixbuf
-CONFIGURE_ARGS+=--with-gdk-pixbuf-prefix=${LOCALBASE}
-WANTLIB+= ICE SM gdk_imlib jpeg png tiff ungif z
+LIB_DEPENDS+=
gnome.>=36,gnomesupport,gnomeui.>=46,art_lgpl.>=4::x11/gnome/libs
+WANTLIB+= ICE SM gdk_imlib ungif
.else
-CONFIGURE_ARGS+=--disable-gnome --disable-splash
+CONFIGURE_ARGS+= --disable-gnome --disable-splash
.endif
.if ${FLAVOR:L:Mesd}
@@ -61,13 +59,6 @@ CONFIGURE_ARGS+= --disable-assembler
DOCS= FAQ NEWS README \
doc/xi.txt doc/xm.txt
-
-post-configure:
- cd ${WRKSRC}/po && cp -f Makefile.in Makefile
-
-post-extract:
- @ln -s ${FILESDIR}/sun-input.c ${WRKSRC}/app/drivers
- @ln -s ${FILESDIR}/sun-output.c ${WRKSRC}/app/drivers
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/soundtracker
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/soundtracker/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 5 Apr 2007 15:37:44 -0000 1.4
+++ distinfo 29 Jul 2007 15:44:16 -0000
@@ -1,5 +1,5 @@
-MD5 (soundtracker-0.6.6.tar.gz) = YBSwbJmagqIn5NG6Q64CbA==
-RMD160 (soundtracker-0.6.6.tar.gz) = 4d5HzZ8ISYFMzFSFxsOwf1tGS2s=
-SHA1 (soundtracker-0.6.6.tar.gz) = sH6wlgMUaZbzhPBg9ZTZxRbJM6w=
-SHA256 (soundtracker-0.6.6.tar.gz) =
gHp5MQgd0U76JzjTc9btmqjPH7SwV9nroBXDIZG434A=
-SIZE (soundtracker-0.6.6.tar.gz) = 673631
+MD5 (soundtracker-0.6.8.tar.gz) = Hlou9oniFJM+U/aHs6GZuw==
+RMD160 (soundtracker-0.6.8.tar.gz) = uGv4YBPl0pWeGo27GaklXBFraNA=
+SHA1 (soundtracker-0.6.8.tar.gz) = JVyHzb4sy3Fdn5egZ35FlLeQlZU=
+SHA256 (soundtracker-0.6.8.tar.gz) =
A7LywO26SEV+xheLChDt/jSBJUESk2cVYDoh9jiCL1A=
+SIZE (soundtracker-0.6.8.tar.gz) = 1016718
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/audio/soundtracker/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 30 May 2002 09:08:28 -0000 1.1
+++ patches/patch-Makefile_in 29 Jul 2007 15:44:16 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/05/30 09:08:28 wcobb Exp $
---- Makefile.in.orig Mon May 20 13:50:54 2002
-+++ Makefile.in Tue May 21 19:12:41 2002
-@@ -97,7 +97,7 @@ VERSION = @VERSION@
- gnomepath = @gnomepath@
- sedpath = @sedpath@
+--- Makefile.in.orig Sun Jul 29 13:13:10 2007
++++ Makefile.in Sun Jul 29 13:13:18 2007
+@@ -180,7 +180,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
--SUBDIRS = intl po doc app
-+SUBDIRS = intl po app
-
- EXTRA_DIST = TODO FAQ ABOUT-NLS soundtracker.spec soundtracker.desktop
soundtracker_splash.png
+-SUBDIRS = po doc app
++SUBDIRS = po app
+ EXTRA_DIST = config.rpath m4/ChangeLog TODO FAQ ABOUT-NLS soundtracker.spec \
+ soundtracker.desktop \
Index: patches/patch-app_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/soundtracker/patches/patch-app_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-app_Makefile_in
--- patches/patch-app_Makefile_in 30 May 2002 09:08:28 -0000 1.2
+++ patches/patch-app_Makefile_in 29 Jul 2007 15:44:16 -0000
@@ -1,29 +1,43 @@
$OpenBSD: patch-app_Makefile_in,v 1.2 2002/05/30 09:08:28 wcobb Exp $
---- app/Makefile.in.orig Mon May 20 13:51:13 2002
-+++ app/Makefile.in Tue May 21 19:22:46 2002
-@@ -436,7 +436,7 @@ check-am: all-am
- check: check-recursive
- installcheck-am:
- installcheck: installcheck-recursive
+--- app/Makefile.in.orig Sun Jul 29 13:14:11 2007
++++ app/Makefile.in Sun Jul 29 13:14:33 2007
+@@ -665,7 +665,7 @@ info-am:
+
+ install-data-am:
+
-install-exec-am: install-binPROGRAMS install-exec-local
+install-exec-am: install-binPROGRAMS
- install-exec: install-exec-recursive
- install-data-am:
-@@ -499,23 +499,12 @@ dvi-recursive mostlyclean-recursive dist
- maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
- distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
- dvi-am dvi check check-am installcheck-am installcheck \
--install-exec-local install-exec-am install-exec install-data-am \
-+install-exec-am install-exec install-data-am \
- install-data install-am install uninstall-am uninstall all-redirect \
- all-am all installdirs-am installdirs mostlyclean-generic \
- distclean-generic clean-generic maintainer-clean-generic clean \
- mostlyclean distclean maintainer-clean
+ install-info: install-info-recursive
+
+@@ -701,7 +701,7 @@ uninstall-info: uninstall-info-recursive
+ dvi-recursive info info-am info-recursive install install-am \
+ install-binPROGRAMS install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+- install-exec-local install-exec-recursive install-info \
++ install-exec-recursive install-info \
+ install-info-am install-info-recursive install-man \
+ install-recursive install-strip installcheck installcheck-am \
+ installdirs installdirs-am installdirs-recursive \
+@@ -713,29 +713,6 @@ uninstall-info: uninstall-info-recursive
+ uninstall-info-recursive uninstall-recursive
+
--
-install-exec-local:
-- chown root.root $(bindir)/soundtracker
+- case `uname` in \
+- OpenBSD) \
+- chown root.wheel $(bindir)/soundtracker; \
+- ;; \
+- NetBSD) \
+- chown root.wheel $(bindir)/soundtracker; \
+- ;; \
+- Darwin) \
+- chown root:admin $(bindir)/soundtracker; \
+- ;; \
+- *) \
+- chown root:root $(bindir)/soundtracker; \
+- ;; \
+- esac
- chmod +s $(bindir)/soundtracker
- @echo ""
- @echo "***"
@@ -32,6 +46,6 @@ $OpenBSD: patch-app_Makefile_in,v 1.2 20
- @echo "*** if this is a multi-user machine. See file INSTALL."
- @echo "***"
- @echo ""
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-app_gui_c
===================================================================
RCS file: /cvs/ports/audio/soundtracker/patches/patch-app_gui_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-app_gui_c
--- patches/patch-app_gui_c 25 Aug 2003 20:59:10 -0000 1.3
+++ patches/patch-app_gui_c 29 Jul 2007 15:44:16 -0000
@@ -1,89 +1,7 @@
-$OpenBSD: patch-app_gui_c,v 1.3 2003/08/25 20:59:10 avsm Exp $
---- app/gui.c.orig 2002-05-20 06:06:48.000000000 -0700
-+++ app/gui.c 2003-08-25 19:58:55.000000000 -0700
-@@ -227,8 +227,6 @@ gui_save_wav_callback (gint reply,
- write(audio_ctlpipe, &i, sizeof(i));
- write(audio_ctlpipe, &l, sizeof(l));
- write(audio_ctlpipe, data, l + 1);
--
-- gui_set_current_pattern(xm->pattern_order_table[0]);
- wait_for_player();
- }
- }
-@@ -474,7 +472,7 @@ keyevent (GtkWidget *widget,
- sample_editor_handle_keys,
- modinfo_page_handle_keys,
- };
-- gboolean pressed = (gboolean)data;
-+ gboolean pressed = (gboolean)GPOINTER_TO_INT(data);
- gboolean handled = FALSE;
- gboolean entry_focus = GTK_IS_ENTRY(GTK_WINDOW(mainwindow)->focus_widget);
-
-@@ -529,7 +527,7 @@ static void
- playlist_position_changed (Playlist *p,
- int newpos)
- {
-- if(gui_playing_mode) {
-+ if(gui_playing_mode != 0) {
- // This will only be executed when the user changes the song position
manually
- gui_mixer_set_songpos(newpos);
- event_waiter_start(audio_songpos_ew);
-@@ -577,8 +575,18 @@ gui_editpat_changed (GtkSpinButton *spin
- {
- int n = gtk_spin_button_get_value_as_int(spin);
-
-- if(n != editing_pat)
-+ if(n != editing_pat) {
- gui_set_current_pattern(n);
-+
-+ /* If we are in 'playing pattern' mode and asynchronous
-+ * editing is disabled, make the audio thread jump to the new
-+ * pattern, too. I think it would be cool to have this for
-+ * 'playing song' mode, too, but then modifications in
-+ * gui_update_player_pos() will be necessary. */
-+ if(gui_playing_mode == PLAYING_PATTERN && !ASYNCEDIT) {
-+ gui_mixer_set_pattern(n);
-+ }
-+ }
- }
-
- static void
-@@ -870,8 +878,6 @@ play_song (void)
- write(audio_ctlpipe, &i, sizeof(i));
- write(audio_ctlpipe, &sp, sizeof(sp));
- write(audio_ctlpipe, &pp, sizeof(pp));
--
-- gui_set_current_pattern(xm->pattern_order_table[sp]);
- wait_for_player();
- }
-
-@@ -1037,10 +1043,6 @@ gui_set_current_pattern (int p)
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_editpat), p);
- gui_update_pattern_data();
-
-- if(!GUI_ENABLED && !ASYNCEDIT) {
-- gui_mixer_set_pattern(p);
-- }
--
- xm_set_modified(m);
- }
-
-@@ -1064,13 +1066,12 @@ offset_current_pattern (int offset)
- int nv;
-
- nv = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_editpat)) +
offset;
--
- if(nv < 0)
- nv = 0;
- else if(nv > 255)
- nv = 255;
-
-- gui_set_current_pattern(nv);
-+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_editpat), nv);
- }
-
- void
-@@ -1255,7 +1256,7 @@ gui_splash_set_label (const gchar *text,
+$OpenBSD$
+--- app/gui.c.orig Sun Jul 29 17:54:43 2007
++++ app/gui.c Sun Jul 29 17:55:15 2007
+@@ -1688,7 +1688,7 @@ gui_splash_set_label (const gchar *text,
char buf[256];
strcpy(buf, "SoundTracker v" VERSION " - ");
Index: patches/patch-app_main_c
===================================================================
RCS file: /cvs/ports/audio/soundtracker/patches/patch-app_main_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-app_main_c
--- patches/patch-app_main_c 30 May 2002 09:08:28 -0000 1.2
+++ patches/patch-app_main_c 29 Jul 2007 15:44:16 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-app_main_c,v 1.2 2002/05/30 09:08:28 wcobb Exp $
---- app/main.c.orig Sun Feb 17 11:02:22 2002
-+++ app/main.c Tue May 21 21:10:04 2002
-@@ -47,18 +47,6 @@
+--- app/main.c.orig Sun Jul 29 13:26:43 2007
++++ app/main.c Sun Jul 29 13:28:22 2007
+@@ -48,18 +48,6 @@
XM *xm = NULL;
int pipea[2], pipeb[2];
@@ -20,41 +20,7 @@ $OpenBSD: patch-app_main_c,v 1.2 2002/05
int
main (int argc,
char *argv[])
-@@ -80,6 +68,9 @@ main (int argc,
- #ifdef DRIVER_SGI
- driver_out_irix,
- #endif
-+#ifdef DRIVER_SUN
-+ driver_out_sun, driver_in_sun,
-+#endif
- #ifndef NO_AUDIOFILE
- // driver_out_file,
- #endif
-@@ -92,7 +83,9 @@ main (int argc,
- mixer_kbfloat,
- mixer_integer32;
-
-+#ifndef __OpenBSD__
- g_thread_init(NULL);
-+#endif
-
- if(pipe(pipea) || pipe(pipeb)) {
- fprintf(stderr, "Cränk. Can't pipe().\n");
-@@ -178,6 +171,13 @@ main (int argc,
- &driver_out_irix);
- #endif
-
-+#ifdef DRIVER_SUN
-+ drivers[DRIVER_OUTPUT] = g_list_append(drivers[DRIVER_OUTPUT],
-+ &driver_out_sun);
-+ drivers[DRIVER_INPUT] = g_list_append(drivers[DRIVER_INPUT],
-+ &driver_in_sun);
-+#endif
-+
- #ifdef _WIN32
- drivers[DRIVER_OUTPUT] = g_list_append(drivers[DRIVER_OUTPUT],
- &driver_out_dsound);
-@@ -215,8 +215,6 @@ main (int argc,
+@@ -242,8 +230,6 @@ main (int argc,
midi_load_config();
midi_init();
#endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/soundtracker/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 14 Sep 2004 23:16:55 -0000 1.5
+++ pkg/PLIST 29 Jul 2007 15:44:16 -0000
@@ -6,16 +6,34 @@ share/doc/soundtracker/NEWS
share/doc/soundtracker/README
share/doc/soundtracker/xi.txt
share/doc/soundtracker/xm.txt
+share/locale/da/LC_MESSAGES/soundtracker.mo
share/locale/de/LC_MESSAGES/soundtracker.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/soundtracker.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/soundtracker.mo
share/locale/es/LC_MESSAGES/soundtracker.mo
share/locale/fr/LC_MESSAGES/soundtracker.mo
share/locale/gl/LC_MESSAGES/soundtracker.mo
+share/locale/hr/LC_MESSAGES/soundtracker.mo
share/locale/it/LC_MESSAGES/soundtracker.mo
share/locale/ja/LC_MESSAGES/soundtracker.mo
+share/locale/no/LC_MESSAGES/soundtracker.mo
share/locale/pl/LC_MESSAGES/soundtracker.mo
share/locale/ru/LC_MESSAGES/soundtracker.mo
+share/locale/rw/LC_MESSAGES/soundtracker.mo
+share/locale/sk/LC_MESSAGES/soundtracker.mo
share/locale/sl/LC_MESSAGES/soundtracker.mo
share/locale/sv/LC_MESSAGES/soundtracker.mo
+share/locale/tr/LC_MESSAGES/soundtracker.mo
+share/locale/vi/LC_MESSAGES/soundtracker.mo
share/soundtracker/
+share/soundtracker/downarrow.xpm
+share/soundtracker/flat.xpm
+share/soundtracker/lock.xpm
+share/soundtracker/muted.png
+share/soundtracker/play.xpm
+share/soundtracker/play_cur.xpm
+share/soundtracker/rightarrow.xpm
+share/soundtracker/sharp.xpm
share/soundtracker/soundtracker_splash.png
+share/soundtracker/stop.xpm
%%gnome%%
soundtracker.tar.gz
Description: application/tar-gz
