4 files changed, 227 insertions, 129 deletions

diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 52be1a787397..f59db866da57 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,35 +1,32 @@
-# New ports collection makefile for:    tracker
-# Version required:     5.3
-# Date created:         2 Oct 1994
-# Whom:                 swallace
+# New ports collection makefile for:	tracker
+# Version required:	5.3
+# Date created:		2 Oct 1994
+# Whom:			swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       tracker-5.3
-CATEGORIES=     audio
-MASTER_SITES=   ftp://ftp.uni-trier.de/pub/unix/audio/tracker/
-EXTRACT_SUFX=   .tgz
+DISTNAME=	tracker-5.3
+CATEGORIES=	audio
+MASTER_SITES=	ftp://ftp.uni-trier.de/pub/unix/audio/tracker/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=     ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-RESTRICTED=     "Non-redistributable beta"
+RESTRICTED=	"Non-redistributable beta"
 
-WRKSRC=         ${WRKDIR}/tracker
-USE_GMAKE=      yes
-MAKE_FLAGS=     MACHINE=freebsd CC=$(CC) INSTALL="$(INSTALL)" \
-		INST_BIN_OPT="-c -s -m $(BINMODE) -o $(BINOWN) -g $(BINGRP)" \
-		INST_MAN_OPT="-c -m 644 -o $(BINOWN) -g $(BINGRP)" \
-		COMPRESSION_FILE=$(PREFIX)/etc/compression_methods \
-		-f
+WRKSRC=		${WRKDIR}/tracker
+INSTALL_TARGET=	install install.info
 
 post-install:
-	cd ${WRKSRC}/Docs && \
-	makeinfo --no-split tracker.texinfo -o tracker.info && \
-	${GZIP_CMD} tracker.info && \
-	$(INSTALL_MAN) tracker.info.gz ${PREFIX}/info && \
-	${RM} -f tracker.info.gz *.orig
-	-${MKDIR} ${PREFIX}/share/doc/tracker
-	${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
+	@install-info ${PREFIX}/info/tracker.info ${PREFIX}/info/dir
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/tracker
+.for file in FAQ readme tracker.doc
+	${INSTALL_DATA} ${WRKSRC}/Docs/${file} ${PREFIX}/share/doc/tracker
+.endfor
+	@${MKDIR} ${PREFIX}/share/doc/tracker/html
+	${INSTALL_DATA} ${WRKSRC}/Docs/Html/* ${PREFIX}/share/doc/tracker/html
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/tracker/files/patch-aa b/audio/tracker/files/patch-aa
index 470698aacd7f..c1451d18ab48 100644
--- a/audio/tracker/files/patch-aa
+++ b/audio/tracker/files/patch-aa
@@ -1,7 +1,17 @@
-*** Makefile.orig	Tue May  7 19:20:50 1996
---- Makefile	Tue Nov 12 06:56:18 1996
+*** Makefile.orig	Wed May  8 00:20:50 1996
+--- Makefile	Wed Dec 29 06:05:14 1999
 ***************
-*** 20,26 ****
+*** 10,26 ****
+  #  hpalib, hplow, hp3, dec, solaris, sparc, linux, freebsd, sgi, 
+  #  soundblaster, aix, next, MM1, NAS, sbos2, SVR4
+  # gmake needed to handle this file in FreeBSD
+! MACHINE = sparc
+  VERSION = 5.3
+  #VPATH=..
+  
+  # The name of your C compiler. For most machines this will be
+  # either 'cc' or 'gcc'.
+! CC = gcc
   
   OPTS=-c 
   
@@ -9,7 +19,17 @@
   # Destination directory for tracker binaries and manpage.
   #
   # If you don't wish to use the 'make install' and 'make install.man'
---- 20,26 ----
+--- 10,26 ----
+  #  hpalib, hplow, hp3, dec, solaris, sparc, linux, freebsd, sgi, 
+  #  soundblaster, aix, next, MM1, NAS, sbos2, SVR4
+  # gmake needed to handle this file in FreeBSD
+! MACHINE = freebsd
+  VERSION = 5.3
+  #VPATH=..
+  
+  # The name of your C compiler. For most machines this will be
+  # either 'cc' or 'gcc'.
+! CC ?= gcc
   
   OPTS=-c 
   
@@ -18,7 +38,24 @@
   #
   # If you don't wish to use the 'make install' and 'make install.man'
 ***************
-*** 166,172 ****
+*** 30,36 ****
+  INFO_DIR = $(PREFIX)/info
+  
+  # Where to put the compression methods description
+! COMPRESSION_FILE=$(PREFIX)/lib/compression_methods
+  
+  # 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
+--- 30,36 ----
+  INFO_DIR = $(PREFIX)/info
+  
+  # Where to put the compression methods description
+! COMPRESSION_FILE=$(PREFIX)/etc/compression_methods
+  
+  # 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
+***************
+*** 166,179 ****
   UI_linux = Unix/
   SHELL_linux = /bin/sh
   
@@ -26,14 +63,45 @@
   LIBS_freebsd = -lm
   AUDIODIR_freebsd=PCux/
   CONFIG_freebsd = PCux/freebsd_
---- 166,172 ----
+  O_freebsd = .o
+  EXE_freebsd = 
+  UI_freebsd = Unix/
+! SHELL_freebsd = /bin/sh
+  
+  CFLAGS_aix = -O
+  LIBS_aix = -lm
+--- 166,179 ----
   UI_linux = Unix/
   SHELL_linux = /bin/sh
   
-! CFLAGS_freebsd = -O2 -funroll-loops -finline-functions
+! CFLAGS_freebsd = -funroll-loops -finline-functions
   LIBS_freebsd = -lm
   AUDIODIR_freebsd=PCux/
   CONFIG_freebsd = PCux/freebsd_
+  O_freebsd = .o
+  EXE_freebsd = 
+  UI_freebsd = Unix/
+! SHELL_freebsd = ${SH}
+  
+  CFLAGS_aix = -O
+  LIBS_aix = -lm
+***************
+*** 220,226 ****
+  UI_sbos2 = OS2/./
+  SHELL_sbos2 = /bin/sh
+  
+! CFLAGS = $(CFLAGS_${MACHINE})
+  COPTS = $(OPTS) $(CFLAGS)
+  LIBS = $(LIBS_${MACHINE})
+  CONFIG = Arch/$(CONFIG_${MACHINE})
+--- 220,226 ----
+  UI_sbos2 = OS2/./
+  SHELL_sbos2 = /bin/sh
+  
+! CFLAGS += $(CFLAGS_${MACHINE})
+  COPTS = $(OPTS) $(CFLAGS)
+  LIBS = $(LIBS_${MACHINE})
+  CONFIG = Arch/$(CONFIG_${MACHINE})
 ***************
 *** 250,256 ****
   display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
@@ -47,27 +115,48 @@
   display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
   st_virt$O automaton$O
   
-! all:    tracker${EXE} randomize${EXE}
+! all:    tracker${EXE} randomize${EXE} Docs/tracker.info
   
   config.h: $(CONFIG)config.h 
   	rm -f config.h
 ***************
-*** 272,280 ****
+*** 270,280 ****
+  	echo >version.c char \*VERSION=\"${VERSION}\"\;
+  
   install: 
-  	$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
-  	$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
-- 	$(INSTALL) $(INST_BIN_OPT) splitmod $(BIN_DIR)
+! 	$(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}
   
   # no manpage available, use the texinfo manual.
   install.man:
---- 272,279 ----
+--- 270,279 ----
+  	echo >version.c char \*VERSION=\"${VERSION}\"\;
+  
   install: 
-  	$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
-  	$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
+! 	${BSD_INSTALL_PROGRAM} tracker $(BIN_DIR)
+! 	${BSD_INSTALL_PROGRAM} randomize $(BIN_DIR)
   	[ -f ${COMPRESSION_FILE} ] || \
-! 		$(INSTALL) $(INST_MAN_OPT) Lib/compression_methods ${COMPRESSION_FILE}
+! 		${BSD_INSTALL_MAN} Lib/compression_methods ${COMPRESSION_FILE}
   
   # no manpage available, use the texinfo manual.
   install.man:
+***************
+*** 285,291 ****
+  install.info: Docs/tracker.info
+  	(cd Docs; \
+            for f in tracker.info tracker.info-* ; do \
+!             $(INSTALL) $(INST_INFO_OPT) $$f $(INFO_DIR)/$$f; \
+            done)
+  
+  devel: 
+--- 284,290 ----
+  install.info: Docs/tracker.info
+  	(cd Docs; \
+            for f in tracker.info tracker.info-* ; do \
+!             ${BSD_INSTALL_DATA} $$f $(INFO_DIR)/$$f; \
+            done)
+  
+  devel: 
diff --git a/audio/tracker/files/patch-ab b/audio/tracker/files/patch-ab
index 6d56391fa6bf..93f2a856058c 100644
--- a/audio/tracker/files/patch-ab
+++ b/audio/tracker/files/patch-ab
@@ -1,5 +1,17 @@
-*** Docs/tracker.texinfo.orig	Thu Apr 11 21:21:05 1996
---- Docs/tracker.texinfo	Tue Nov 12 07:08:17 1996
+*** Docs/tracker.texinfo.orig	Fri Apr 12 02:21:05 1996
+--- Docs/tracker.texinfo	Wed Dec 29 05:52:39 1999
+***************
+*** 3,8 ****
+--- 3,11 ----
+  @setfilename tracker.info
+  @set VERSION 4.44
+  @settitle Tracker @value{VERSION} 
++ @direntry
++ * Tracker: (tracker).		SoundTracker player.
++ @end direntry
+  @c End of header
+  @set EMAIL Marc.Espie@@ens.fr
+  @set POSTAL Marc Espie@*60 rue du 4 septembre@*87100 Limoges@*France
 ***************
 *** 979,992 ****
   * Other Architectures: Porting tracker.
@@ -16,7 +28,7 @@
   @subsection Amiga
   
   There is currently one Amiga version running under AmigaDos. 
---- 979,992 ----
+--- 982,995 ----
   * Other Architectures: Porting tracker.
   @end menu
   
diff --git a/audio/tracker/pkg-plist b/audio/tracker/pkg-plist
index a135d8f1d11e..f389a8f82038 100644
--- a/audio/tracker/pkg-plist
+++ b/audio/tracker/pkg-plist
@@ -1,90 +1,90 @@
-bin/tracker
 bin/randomize
+bin/tracker
 etc/compression_methods
-info/tracker.info.gz
-share/doc/tracker/Html/Aix.html
-share/doc/tracker/Html/Introduction.html
-share/doc/tracker/Html/Availability.html
-share/doc/tracker/Html/Registration.html
-share/doc/tracker/Html/Reporting_bugs.html
-share/doc/tracker/Html/History.html
-share/doc/tracker/Html/Installation.html
-share/doc/tracker/Html/Configure_tracker.html
-share/doc/tracker/Html/Generic_problems.html
-share/doc/tracker/Html/Architecture_dependent_problems.html
-share/doc/tracker/Html/Performance_issues.html
-share/doc/tracker/Html/Amiga.html
-share/doc/tracker/Html/DECstation.html
-share/doc/tracker/Html/HP$2fUX.html
-share/doc/tracker/Html/Linux$2fFreeBSD.html
-share/doc/tracker/Html/MM1$2fOS9.html
-share/doc/tracker/Html/NeXtStep.html
-share/doc/tracker/Html/OS$2f2.html
-share/doc/tracker/Html/Silicon_Graphics.html
-share/doc/tracker/Html/Sparc.html
-share/doc/tracker/Html/Usage.html
-share/doc/tracker/Html/Technical_Information.html
-share/doc/tracker/Html/Tracker_memory_consumption.html
-share/doc/tracker/Html/The_Protracker_format.html
-share/doc/tracker/Html/The_Protracker_file_format.html
-share/doc/tracker/Html/Decoding_pattern_information.html
-share/doc/tracker/Html/Soundtracker_and_Protracker_tempo.html
-share/doc/tracker/Html/Protracker_finetunes.html
-share/doc/tracker/Html/Sample_numbers_and_note_periods.html
-share/doc/tracker/Html/Base_effects.html
-share/doc/tracker/Html/Arpeggio.html
-share/doc/tracker/Html/Portamento_up.html
-share/doc/tracker/Html/Portamento_down.html
-share/doc/tracker/Html/Tone_portamento.html
-share/doc/tracker/Html/Vibrato.html
-share/doc/tracker/Html/Tone_portamento_$2b_Volume_slide.html
-share/doc/tracker/Html/Vibrato_$2b_Volume_slide.html
-share/doc/tracker/Html/Tremolo.html
-share/doc/tracker/Html/Set_sample_offset.html
-share/doc/tracker/Html/Slide_volume.html
-share/doc/tracker/Html/Far_jump.html
-share/doc/tracker/Html/Set_volume.html
-share/doc/tracker/Html/Pattern_break.html
-share/doc/tracker/Html/Set_tempo.html
-share/doc/tracker/Html/Protracker_extended_effects.html
-share/doc/tracker/Html/Set_filter.html
-share/doc/tracker/Html/Fine_portamento_up.html
-share/doc/tracker/Html/Fine_portamento_down.html
-share/doc/tracker/Html/Glissando_control.html
-share/doc/tracker/Html/Set_vibrato_waveform.html
-share/doc/tracker/Html/Set_finetune.html
-share/doc/tracker/Html/Loop_pattern.html
-share/doc/tracker/Html/Set_tremolo_waveform.html
-share/doc/tracker/Html/Retrig_note.html
-share/doc/tracker/Html/Fine_volume_slide_up.html
-share/doc/tracker/Html/Fine_volume_slide_down.html
-share/doc/tracker/Html/Cut_note.html
-share/doc/tracker/Html/Delay_note.html
-share/doc/tracker/Html/Delay_pattern.html
-share/doc/tracker/Html/Invert_loop.html
-share/doc/tracker/Html/Amiga_audio_hardware.html
-share/doc/tracker/Html/Resampling_details.html
-share/doc/tracker/Html/Amiga_implementation.html
-share/doc/tracker/Html/aminet.html
-share/doc/tracker/Html/Credits.html
-share/doc/tracker/Html/Finding_a_specific_file.html
-share/doc/tracker/Html/Mirror_sites_of_Aminet.html
-share/doc/tracker/Html/Accessing_Aminet_on_the_Internet.html
-share/doc/tracker/Html/Accessing_Aminet_without_Internet.html
-share/doc/tracker/Html/Copyright_status_and_disclaimer.html
-share/doc/tracker/Html/Background_information.html
-share/doc/tracker/Html/Concept_Index.html
-share/doc/tracker/Html/NAS.html
-share/doc/tracker/Html/Porting_tracker.html
-share/doc/tracker/Html/NextStep.html
-share/doc/tracker/Html/Top.html
-share/doc/tracker/tracker.texinfo
-share/doc/tracker/tracker.readme
-share/doc/tracker/tracker.guide
-share/doc/tracker/tracker.doc
-share/doc/tracker/splitmod.readme
-share/doc/tracker/readme
-share/doc/tracker/protracker.fmt
+@unexec install-info %D/info/tracker.info %D/info/dir
+info/tracker.info
+info/tracker.info-1
+info/tracker.info-2
+info/tracker.info-3
+@exec install-info --delete %D/info/tracker.info %D/info/dir
 share/doc/tracker/FAQ
-@dirrm share/doc/tracker/Html
+share/doc/tracker/html/Accessing_Aminet_on_the_Internet.html
+share/doc/tracker/html/Accessing_Aminet_without_Internet.html
+share/doc/tracker/html/Aix.html
+share/doc/tracker/html/Amiga.html
+share/doc/tracker/html/Amiga_audio_hardware.html
+share/doc/tracker/html/Amiga_implementation.html
+share/doc/tracker/html/Architecture_dependent_problems.html
+share/doc/tracker/html/Arpeggio.html
+share/doc/tracker/html/Availability.html
+share/doc/tracker/html/Background_information.html
+share/doc/tracker/html/Base_effects.html
+share/doc/tracker/html/Concept_Index.html
+share/doc/tracker/html/Configure_tracker.html
+share/doc/tracker/html/Copyright_status_and_disclaimer.html
+share/doc/tracker/html/Credits.html
+share/doc/tracker/html/Cut_note.html
+share/doc/tracker/html/DECstation.html
+share/doc/tracker/html/Decoding_pattern_information.html
+share/doc/tracker/html/Delay_note.html
+share/doc/tracker/html/Delay_pattern.html
+share/doc/tracker/html/Far_jump.html
+share/doc/tracker/html/Finding_a_specific_file.html
+share/doc/tracker/html/Fine_portamento_down.html
+share/doc/tracker/html/Fine_portamento_up.html
+share/doc/tracker/html/Fine_volume_slide_down.html
+share/doc/tracker/html/Fine_volume_slide_up.html
+share/doc/tracker/html/Generic_problems.html
+share/doc/tracker/html/Glissando_control.html
+share/doc/tracker/html/HP$2fUX.html
+share/doc/tracker/html/History.html
+share/doc/tracker/html/Installation.html
+share/doc/tracker/html/Introduction.html
+share/doc/tracker/html/Invert_loop.html
+share/doc/tracker/html/Linux$2fFreeBSD.html
+share/doc/tracker/html/Loop_pattern.html
+share/doc/tracker/html/MM1$2fOS9.html
+share/doc/tracker/html/Mirror_sites_of_Aminet.html
+share/doc/tracker/html/NAS.html
+share/doc/tracker/html/NeXtStep.html
+share/doc/tracker/html/NextStep.html
+share/doc/tracker/html/OS$2f2.html
+share/doc/tracker/html/Pattern_break.html
+share/doc/tracker/html/Performance_issues.html
+share/doc/tracker/html/Portamento_down.html
+share/doc/tracker/html/Portamento_up.html
+share/doc/tracker/html/Porting_tracker.html
+share/doc/tracker/html/Protracker_extended_effects.html
+share/doc/tracker/html/Protracker_finetunes.html
+share/doc/tracker/html/Registration.html
+share/doc/tracker/html/Reporting_bugs.html
+share/doc/tracker/html/Resampling_details.html
+share/doc/tracker/html/Retrig_note.html
+share/doc/tracker/html/Sample_numbers_and_note_periods.html
+share/doc/tracker/html/Set_filter.html
+share/doc/tracker/html/Set_finetune.html
+share/doc/tracker/html/Set_sample_offset.html
+share/doc/tracker/html/Set_tempo.html
+share/doc/tracker/html/Set_tremolo_waveform.html
+share/doc/tracker/html/Set_vibrato_waveform.html
+share/doc/tracker/html/Set_volume.html
+share/doc/tracker/html/Silicon_Graphics.html
+share/doc/tracker/html/Slide_volume.html
+share/doc/tracker/html/Soundtracker_and_Protracker_tempo.html
+share/doc/tracker/html/Sparc.html
+share/doc/tracker/html/Technical_Information.html
+share/doc/tracker/html/The_Protracker_file_format.html
+share/doc/tracker/html/The_Protracker_format.html
+share/doc/tracker/html/Tone_portamento.html
+share/doc/tracker/html/Tone_portamento_$2b_Volume_slide.html
+share/doc/tracker/html/Top.html
+share/doc/tracker/html/Tracker_memory_consumption.html
+share/doc/tracker/html/Tremolo.html
+share/doc/tracker/html/Usage.html
+share/doc/tracker/html/Vibrato.html
+share/doc/tracker/html/Vibrato_$2b_Volume_slide.html
+share/doc/tracker/html/aminet.html
+share/doc/tracker/readme
+share/doc/tracker/tracker.doc
+@dirrm share/doc/tracker/html
 @dirrm share/doc/tracker