From 581a3113fe29519dddbdcf1214491a88ddb83041 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 27 Dec 2007 16:34:19 +0000
Subject: [PATCH] ouch, this old makefile is so bad, it's embarrassing. Okay, I
 was young and stupid...

---
 .../patches/patch-Docs_Html_Availability_html |  6 ++---
 audio/tracker/patches/patch-Docs_readme       |  6 ++---
 audio/tracker/patches/patch-Makefile          | 23 +++++++++++++++----
 .../patches/patch-Modules_Pro_effects_c       |  6 ++---
 audio/tracker/patches/patch-display_c         |  6 ++---
 audio/tracker/patches/patch-handle_options_c  |  6 ++---
 audio/tracker/patches/patch-parse_options_c   |  6 ++---
 7 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/audio/tracker/patches/patch-Docs_Html_Availability_html b/audio/tracker/patches/patch-Docs_Html_Availability_html
index 3e20e9b578e..d463c046b3a 100644
--- a/audio/tracker/patches/patch-Docs_Html_Availability_html
+++ b/audio/tracker/patches/patch-Docs_Html_Availability_html
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Docs_Html_Availability_html,v 1.1 2001/04/10 00:51:59 espie Exp $
+$OpenBSD: patch-Docs_Html_Availability_html,v 1.2 2007/12/27 16:34:19 espie Exp $
 --- Docs/Html/Availability.html.orig	Thu Apr 11 19:21:06 1996
-+++ Docs/Html/Availability.html	Tue Apr 10 02:20:48 2001
-@@ -53,7 +53,7 @@ You can also contact me at the following
++++ Docs/Html/Availability.html	Thu Dec 27 16:51:26 2007
+@@ -53,7 +53,7 @@ You can also contact me at the following e-mail addres
  </P>
  <DL><DT><DD>
  <PRE>
diff --git a/audio/tracker/patches/patch-Docs_readme b/audio/tracker/patches/patch-Docs_readme
index cd6959b68c9..6cff1c14881 100644
--- a/audio/tracker/patches/patch-Docs_readme
+++ b/audio/tracker/patches/patch-Docs_readme
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Docs_readme,v 1.2 2001/07/11 23:39:57 miod Exp $
+$OpenBSD: patch-Docs_readme,v 1.3 2007/12/27 16:34:19 espie Exp $
 --- Docs/readme.orig	Thu Apr 11 19:21:05 1996
-+++ Docs/readme	Tue Apr 10 02:20:48 2001
-@@ -5,6 +5,12 @@ See the accompanying TeXinfo documentati
++++ Docs/readme	Thu Dec 27 16:51:26 2007
+@@ -5,6 +5,12 @@ See the accompanying TeXinfo documentation for more de
  From version 4.29 on, commercial use of tracker is forbidden without
  negotiating an agreement with me first.
  
diff --git a/audio/tracker/patches/patch-Makefile b/audio/tracker/patches/patch-Makefile
index c9dc6998022..d0f3f811cb1 100644
--- a/audio/tracker/patches/patch-Makefile
+++ b/audio/tracker/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.1 2001/04/10 00:51:59 espie Exp $
+$OpenBSD: patch-Makefile,v 1.2 2007/12/27 16:34:19 espie Exp $
 --- Makefile.orig	Tue May  7 17:20:50 1996
-+++ Makefile	Tue Apr 10 02:20:49 2001
++++ Makefile	Thu Dec 27 17:33:14 2007
 @@ -1,5 +1,5 @@
  # Makefile for any machine
 -# - based on my newer makefile and the GREATE
@@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile,v 1.1 2001/04/10 00:51:59 espie Exp $
  CFLAGS_aix = -O
  LIBS_aix = -lm
  AUDIODIR_aix = Aix/
-@@ -250,7 +259,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O 
+@@ -250,12 +259,13 @@ OBJ_SPLITMOD = split$O time$O st_read$O dump_song$O op
  display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
  st_virt$O automaton$O
  
@@ -53,7 +53,13 @@ $OpenBSD: patch-Makefile,v 1.1 2001/04/10 00:51:59 espie Exp $
  
  config.h: $(CONFIG)config.h 
  	rm -f config.h
-@@ -272,9 +281,8 @@ version.c: Makefile
+ 	cp $(CONFIG)config.h config.h
+ 
++${OBJ_TRACKER} ${OBJ_SPLITMOD} ${OBJ_ANALYZER}: defs.h config.h
+ # This Makefile entry probably won't work as is on your system
+ 
+ Docs/tracker.doc: Docs/tracker.texinfo Docs/protracker.fmt
+@@ -272,9 +282,8 @@ version.c: Makefile
  install: 
  	$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
  	$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
@@ -64,3 +70,12 @@ $OpenBSD: patch-Makefile,v 1.1 2001/04/10 00:51:59 espie Exp $
  
  # no manpage available, use the texinfo manual.
  install.man:
+@@ -293,7 +302,7 @@ devel: 
+ 	cp tracker $(BIN_DIR)/dtracker
+ #-	cp splitmod $(BIN_DIR)/splitmod
+ 
+-tracker${EXE}: config.h ${OBJ_TRACKER}
++tracker${EXE}: ${OBJ_TRACKER}
+ 	${CC} -o tracker${EXE} ${CFLAGS} ${OBJ_TRACKER} ${LIBS}
+ 
+ dtracker${EXE}: ${OBJ_TRACKER}
diff --git a/audio/tracker/patches/patch-Modules_Pro_effects_c b/audio/tracker/patches/patch-Modules_Pro_effects_c
index d7216582e56..44a643e1cb0 100644
--- a/audio/tracker/patches/patch-Modules_Pro_effects_c
+++ b/audio/tracker/patches/patch-Modules_Pro_effects_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Modules_Pro_effects_c,v 1.1 2001/04/10 00:52:00 espie Exp $
+$OpenBSD: patch-Modules_Pro_effects_c,v 1.2 2007/12/27 16:34:19 espie Exp $
 --- Modules/Pro/effects.c.orig	Sat Apr 13 19:16:54 1996
-+++ Modules/Pro/effects.c	Tue Apr 10 02:20:49 2001
-@@ -207,8 +207,9 @@ LOCAL void do_vibrato(struct channel *ch
++++ Modules/Pro/effects.c	Thu Dec 27 16:51:26 2007
+@@ -207,8 +207,9 @@ LOCAL void do_vibrato(struct channel *ch)
        /* temporary update of only the step value,
         * note that we do not change the saved pitch.
         */
diff --git a/audio/tracker/patches/patch-display_c b/audio/tracker/patches/patch-display_c
index 6e9dc3cda09..24d5dec868c 100644
--- a/audio/tracker/patches/patch-display_c
+++ b/audio/tracker/patches/patch-display_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-display_c,v 1.1 2001/04/10 00:52:01 espie Exp $
+$OpenBSD: patch-display_c,v 1.2 2007/12/27 16:34:19 espie Exp $
 --- display.c.orig	Mon May  6 16:28:52 1996
-+++ display.c	Tue Apr 10 02:20:49 2001
-@@ -543,7 +543,14 @@ LOCAL void disp_offset(unsigned samp, un
++++ display.c	Thu Dec 27 16:51:26 2007
+@@ -543,7 +543,14 @@ LOCAL void disp_offset(unsigned samp, unsigned para, n
  		copy3(note2name(note));
  		copy4(" off");
  		if (ch->samp->length)
diff --git a/audio/tracker/patches/patch-handle_options_c b/audio/tracker/patches/patch-handle_options_c
index 9f213442a48..a2ec67c8b11 100644
--- a/audio/tracker/patches/patch-handle_options_c
+++ b/audio/tracker/patches/patch-handle_options_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-handle_options_c,v 1.1 2001/04/10 00:52:01 espie Exp $
+$OpenBSD: patch-handle_options_c,v 1.2 2007/12/27 16:34:19 espie Exp $
 --- handle_options.c.orig	Tue May  7 17:22:08 1996
-+++ handle_options.c	Tue Apr 10 02:29:16 2001
++++ handle_options.c	Thu Dec 27 16:51:26 2007
 @@ -52,6 +52,7 @@
  #include "tags.h"
  #include "prefs.h"
@@ -9,7 +9,7 @@ $OpenBSD: patch-handle_options_c,v 1.1 2001/04/10 00:52:01 espie Exp $
  
  #ifdef VOLUME_CONTROL
  #ifdef __hpux
-@@ -235,7 +236,9 @@ void handle_options(int argc, char *argv
+@@ -235,7 +236,9 @@ void handle_options(int argc, char *argv[])
  		print_usage();
  		end_all(0);
  		}
diff --git a/audio/tracker/patches/patch-parse_options_c b/audio/tracker/patches/patch-parse_options_c
index 87f885c9d35..007f0619326 100644
--- a/audio/tracker/patches/patch-parse_options_c
+++ b/audio/tracker/patches/patch-parse_options_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-parse_options_c,v 1.1 2001/04/10 00:52:01 espie Exp $
+$OpenBSD: patch-parse_options_c,v 1.2 2007/12/27 16:34:19 espie Exp $
 --- parse_options.c.orig	Tue May  7 00:48:28 1996
-+++ parse_options.c	Tue Apr 10 02:20:49 2001
-@@ -238,10 +238,11 @@ LOCAL int do_option(char *text, char *ar
++++ parse_options.c	Thu Dec 27 16:51:26 2007
+@@ -238,10 +238,11 @@ LOCAL int do_option(char *text, char *arg)
  				switch(type)
  					{
  				case 's':