Upgrade 4.35->4.36

1 files changed, 39 insertions, 40 deletions

diff --git a/audio/tracker/files/patch-aa b/audio/tracker/files/patch-aa
index c0991c3e8502..b01b27b1a24e 100644
--- a/audio/tracker/files/patch-aa
+++ b/audio/tracker/files/patch-aa
@@ -1,7 +1,7 @@
-*** Makefile.orig	Sun Jul  2 21:47:44 1995
---- Makefile	Sun Aug 20 02:25:56 1995
+*** Makefile.orig	Sun Aug 27 22:48:39 1995
+--- Makefile	Wed Aug 30 19:36:13 1995
 ***************
-*** 32,38 ****
+*** 29,35 ****
   MAN_DIR = $(PREFIX)/man
   
   # Where to put the compression methods description
@@ -9,7 +9,7 @@
   
   # How to install the binaries and manpage. If you have a unix system,
   # use the GNU install program if you have it, otherwise try 'cp'. For
---- 32,38 ----
+--- 29,35 ----
   MAN_DIR = $(PREFIX)/man
   
   # Where to put the compression methods description
@@ -18,7 +18,7 @@
   # How to install the binaries and manpage. If you have a unix system,
   # use the GNU install program if you have it, otherwise try 'cp'. For
 ***************
-*** 53,60 ****
+*** 50,57 ****
   #
   # If you don't wish to use the 'make install' and 'make install.man'
   # commands, you can ignore these.
@@ -27,7 +27,7 @@
   ###############################################################################
   #
   # C compiler flags and libraries for each machine.
---- 53,62 ----
+--- 50,59 ----
   #
   # If you don't wish to use the 'make install' and 'make install.man'
   # commands, you can ignore these.
@@ -39,51 +39,50 @@
   #
   # C compiler flags and libraries for each machine.
 ***************
-*** 122,128 ****
-  AUDIODIR_linux=PCux/
-  CONFIG_linux = PCux/linux_
+*** 236,242 ****
+  display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
+  st_virt$O
   
-! CFLAGS_freebsd = -O2 -funroll-loops -finline-functions
-  LIBS_freebsd = -lm
-  AUDIODIR_freebsd=PCux/
-  CONFIG_freebsd = PCux/freebsd_
---- 124,130 ----
-  AUDIODIR_linux=PCux/
-  CONFIG_linux = PCux/linux_
-  
-! CFLAGS_freebsd = -O2 -fno-strength-reduce -funroll-loops -finline-functions
-  LIBS_freebsd = -lm
-  AUDIODIR_freebsd=PCux/
-  CONFIG_freebsd = PCux/freebsd_
-***************
-*** 161,169 ****
-  prefs.o autoinit.o ${UI}ui.o display.o empty.o color.o version.o
-  
-  OBJ_SPLITMOD = split.o tools.o st_read.o dump_song.o open.o notes.o \
-! display.o prefs.o autoinit.o $(UI)ui.o empty.o color.o version.o
-  
-! all:	version.c config.h tracker randomize tcheck splitmod
+! all:    version.c config.h tracker${EXE} randomize${EXE} splitmod${EXE}
   
   config.h: $(CONFIG)config.h Makefile
   	rm -f config.h
---- 163,172 ----
-  prefs.o autoinit.o ${UI}ui.o display.o empty.o color.o version.o
+--- 238,244 ----
+  display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
+  st_virt$O
   
-  OBJ_SPLITMOD = split.o tools.o st_read.o dump_song.o open.o notes.o \
-! display.o prefs.o autoinit.o $(UI)ui.o empty.o color.o version.o \
-! st_virt.o
-  
-! all:    version.c config.h tracker randomize splitmod
+! all:    version.c config.h tracker${EXE} randomize${EXE}
   
   config.h: $(CONFIG)config.h Makefile
   	rm -f config.h
 ***************
-*** 175,181 ****
+*** 248,261 ****
+  install: 
+  	$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
+  	$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
+- 	$(INSTALL) $(INST_BIN_OPT) splitmod $(BIN_DIR)
+  	[ -f ${COMPRESSION_FILE} ] || \
+  		$(INSTALL) $(INST_MAN_OPT) compression_methods ${COMPRESSION_FILE}
+  
+  install.man:
+  	$(INSTALL) $(INST_MAN_OPT) man/tracker.1 $(MAN_DIR)/man1/tracker.1
+  
+! 
+  
+  devel: 
+  	-rm -f $(BIN_DIR)/dtracker #$(BIN_DIR)/splitmod
+--- 250,263 ----
   install: 
   	$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
   	$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
-- 	$(INSTALL) $(INST_BIN_OPT) tcheck $(BIN_DIR)
-  	$(INSTALL) $(INST_BIN_OPT) splitmod $(BIN_DIR)
   	[ -f ${COMPRESSION_FILE} ] || \
   		$(INSTALL) $(INST_MAN_OPT) compression_methods ${COMPRESSION_FILE}
---- 178,183 ----
+  
+  install.man:
+  	$(INSTALL) $(INST_MAN_OPT) man/tracker.1 $(MAN_DIR)/man1/tracker.1
+  
+! install.info:
+! 	gzip < Docs/tracker.guide > $(PREFIX)/info/tracker.info.gz
+  
+  devel: 
+  	-rm -f $(BIN_DIR)/dtracker #$(BIN_DIR)/splitmod