diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 635fdd98b57d..ac91de4f97ee 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -16,23 +16,28 @@ COMMENT=	MOD player
 
 RESTRICTED=	"Non-redistributable beta"
 
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/tracker
 INSTALL_TARGET=	install install.info
+MAKE_ARGS=	CC="${CC}" PREFIX="${PREFIX}" \
+		MACHINE=freebsd COMPRESSION_FILE="${PREFIX}/etc/compression_methods" \
+		CFLAGS="${CFLAGS} -funroll-loops -finline-functions"
+
 INFO=		tracker
+PLIST_FILES=	bin/randomize bin/tracker etc/compression_methods
+PORTDOCS=	*
 
 post-patch:
-	@${SED} -e 's,machine/soundcard.h,sys/soundcard.h,' < \
-		${WRKSRC}/Arch/PCux/audio.c > ${WRKSRC}/Arch/PCux/audio.c.new
-	@${MV} ${WRKSRC}/Arch/PCux/audio.c.new ${WRKSRC}/Arch/PCux/audio.c
+	@${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
+		${WRKSRC}/Arch/PCux/audio.c
 
 post-install:
 	@install-info ${PREFIX}/info/tracker.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/tracker
+	@${MKDIR} ${PREFIX}/share/doc/tracker/html
 .for docfile in FAQ readme tracker.doc
 	${INSTALL_DATA} ${WRKSRC}/Docs/${docfile} ${PREFIX}/share/doc/tracker
 .endfor
-	@${MKDIR} ${PREFIX}/share/doc/tracker/html
 	${INSTALL_DATA} ${WRKSRC}/Docs/Html/* ${PREFIX}/share/doc/tracker/html
 .endif
 
diff --git a/audio/tracker/files/patch-aa b/audio/tracker/files/patch-aa
index 76856a0b144d..a96a661150f5 100644
--- a/audio/tracker/files/patch-aa
+++ b/audio/tracker/files/patch-aa
@@ -1,61 +1,5 @@
 --- Makefile.orig	Tue May  7 10:20:50 1996
 +++ Makefile	Wed Sep  3 19:55:42 2003
-@@ -10,17 +10,17 @@
- #  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
-+MACHINE = freebsd
- VERSION = 5.3
- #VPATH=..
- 
- # The name of your C compiler. For most machines this will be
- # either 'cc' or 'gcc'.
--CC = gcc
-+CC ?= gcc
- 
- OPTS=-c 
- 
--PREFIX=/users/algo/espie/pub
-+PREFIX?=/users/algo/espie/pub
- # Destination directory for tracker binaries and manpage.
- #
- # If you don't wish to use the 'make install' and 'make install.man'
-@@ -30,7 +30,7 @@
- INFO_DIR = $(PREFIX)/info
- 
- # Where to put the compression methods description
--COMPRESSION_FILE=$(PREFIX)/lib/compression_methods
-+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,14 +166,14 @@
- UI_linux = Unix/
- SHELL_linux = /bin/sh
- 
--CFLAGS_freebsd = -O2 -funroll-loops -finline-functions -fno-strength-reduce
-+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 = /bin/sh
-+SHELL_freebsd = ${SH}
- 
- CFLAGS_aix = -O
- LIBS_aix = -lm
-@@ -220,7 +220,7 @@
- UI_sbos2 = OS2/./
- SHELL_sbos2 = /bin/sh
- 
--CFLAGS = $(CFLAGS_${MACHINE})
-+CFLAGS += $(CFLAGS_${MACHINE})
- COPTS = $(OPTS) $(CFLAGS)
- LIBS = $(LIBS_${MACHINE})
- CONFIG = Arch/$(CONFIG_${MACHINE})
 @@ -250,7 +250,7 @@
  display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
  st_virt$O automaton$O
diff --git a/audio/tracker/pkg-plist b/audio/tracker/pkg-plist
deleted file mode 100644
index a8f4c3ae97b8..000000000000
--- a/audio/tracker/pkg-plist
+++ /dev/null
@@ -1,84 +0,0 @@
-bin/randomize
-bin/tracker
-etc/compression_methods
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/html/Accessing_Aminet_on_the_Internet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Accessing_Aminet_without_Internet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Aix.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Amiga.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Amiga_audio_hardware.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Amiga_implementation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Architecture_dependent_problems.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Arpeggio.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Availability.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Background_information.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Base_effects.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Concept_Index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Configure_tracker.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Copyright_status_and_disclaimer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Credits.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Cut_note.html
-%%PORTDOCS%%%%DOCSDIR%%/html/DECstation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Decoding_pattern_information.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Delay_note.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Delay_pattern.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Far_jump.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Finding_a_specific_file.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fine_portamento_down.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fine_portamento_up.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fine_volume_slide_down.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fine_volume_slide_up.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Generic_problems.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Glissando_control.html
-%%PORTDOCS%%%%DOCSDIR%%/html/HP$2fUX.html
-%%PORTDOCS%%%%DOCSDIR%%/html/History.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Installation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Invert_loop.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Linux$2fFreeBSD.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Loop_pattern.html
-%%PORTDOCS%%%%DOCSDIR%%/html/MM1$2fOS9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Mirror_sites_of_Aminet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/NAS.html
-%%PORTDOCS%%%%DOCSDIR%%/html/NeXtStep.html
-%%PORTDOCS%%%%DOCSDIR%%/html/NextStep.html
-%%PORTDOCS%%%%DOCSDIR%%/html/OS$2f2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Pattern_break.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Performance_issues.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Portamento_down.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Portamento_up.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Porting_tracker.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Protracker_extended_effects.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Protracker_finetunes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Registration.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Reporting_bugs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Resampling_details.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Retrig_note.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Sample_numbers_and_note_periods.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Set_filter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Set_finetune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Set_sample_offset.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Set_tempo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Set_tremolo_waveform.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Set_vibrato_waveform.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Set_volume.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Silicon_Graphics.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Slide_volume.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Soundtracker_and_Protracker_tempo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Sparc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Technical_Information.html
-%%PORTDOCS%%%%DOCSDIR%%/html/The_Protracker_file_format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/The_Protracker_format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Tone_portamento.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Tone_portamento_$2b_Volume_slide.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Top.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Tracker_memory_consumption.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Tremolo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Usage.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Vibrato.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Vibrato_$2b_Volume_slide.html
-%%PORTDOCS%%%%DOCSDIR%%/html/aminet.html
-%%PORTDOCS%%%%DOCSDIR%%/readme
-%%PORTDOCS%%%%DOCSDIR%%/tracker.doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%