- Use ARCH instead of MACHINE_ARCH

- Add a new mirror site

PR:		ports/122424
Submitted by:	Ganael Laplanche <ganael.laplanche at martymac.com>

- As 5.2-RELEASE is no longer supported, make two conditional patches
  mandatory
- Move patching to post-patch target instead of post-extract, so that we
  can get unmodified vendor version with `make extract'

3 files changed, 5 insertions, 8 deletions

diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile
index 6f57c6c3e27f..3dfdb1d4d9f1 100644
--- a/audio/tclmidi/Makefile
+++ b/audio/tclmidi/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	tclmidi
 PORTVERSION=	3.1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/
+MASTER_SITES=	ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/ \
+		http://ringtail.its.monash.edu.au/pub/midi/PROGRAMS/
 # despite references on the homepage to ftp.xor.com, that server
 # doesn't work - edwin 20021227
 
@@ -32,16 +33,12 @@ MANN=		midiconf.n midievnt.n midifree.n midiget.n midigrep.n \
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64"
-IGNORE=		"ignored due to cast from pointer to integer of different size"
+.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+IGNORE=		ignored due to cast from pointer to integer of different size
 .endif
 
-.if ${OSVERSION} >= 502000
-EXTRA_PATCHES=	${PATCHDIR}/smf.patch ${PATCHDIR}/song.patch
-
-post-extract:
+post-patch:
 	@${CP} -f ${FILESDIR}/strstream.h ${WRKSRC}
-.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/audio/tclmidi/files/smf.patch b/audio/tclmidi/files/patch-smf__Makefile.in
index af1a63d8f89c..af1a63d8f89c 100644
--- a/audio/tclmidi/files/smf.patch
+++ b/audio/tclmidi/files/patch-smf__Makefile.in
diff --git a/audio/tclmidi/files/song.patch b/audio/tclmidi/files/patch-song__Makefile.in
index f4cb59a86ebd..f4cb59a86ebd 100644
--- a/audio/tclmidi/files/song.patch
+++ b/audio/tclmidi/files/patch-song__Makefile.in