5 files changed, 15 insertions, 57 deletions

diff --git a/misc/ringtonetools/Makefile b/misc/ringtonetools/Makefile
index 5a9325384a25..52c6d1a63b6e 100644
--- a/misc/ringtonetools/Makefile
+++ b/misc/ringtonetools/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	ringtonetools
-PORTVERSION=	2.01
+PORTVERSION=	2.09
 CATEGORIES=	misc
-MASTER_SITES=	http://65.108.58.129/ringtonetools/
+MASTER_SITES=	http://www.mikekohn.com/ringtonetools/
 
 MAINTAINER=	mike@mikekohn.net
-COMMENT=	Create ringtones (songs) and logos for mobile phones
+COMMENT=	Create/Convert/Listen to ringtones and logos for mobile phones
 
 RESTRICTED=	no-commercial-use
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/ringtonetools ${PREFIX}/bin
-.for i in face.icon hemglass.mid ionian.rtttl usa.imelody yngwie_trilogy.rtttl
+.for i in face.icon hemglass.mid ionian.rtttl usa.emelody yngwie_trilogy.rtttl
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/samples/${i} ${DATADIR}
 .endfor
@@ -26,4 +26,5 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR}
 .endif
 
+
 .include <bsd.port.mk>
diff --git a/misc/ringtonetools/distinfo b/misc/ringtonetools/distinfo
index 9bf8cc5640c1..314bbea0e8d4 100644
--- a/misc/ringtonetools/distinfo
+++ b/misc/ringtonetools/distinfo
@@ -1 +1 @@
-MD5 (ringtonetools-2.01.tar.gz) = 3408a0a8390a5bfe1b3ae3b1297668c5
+MD5 (ringtonetools-2.09.tar.gz) = 4c6915d87dcb50111e818188b0cf959f
diff --git a/misc/ringtonetools/files/patch-aa b/misc/ringtonetools/files/patch-aa
deleted file mode 100644
index ef20692ddd20..000000000000
--- a/misc/ringtonetools/files/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/Makefile.orig	Sun Oct 27 18:42:09 2002
-+++ src/Makefile	Sun Oct 27 18:42:54 2002
-@@ -1,24 +1,24 @@
- 
- #FLAGS = -DDEBUG
--CC=gcc
-+CC?=cc
- 
- default:
--	$(CC) -c bmp_parse.c $(FLAGS)
--	$(CC) -c fileoutput.c $(FLAGS)
--	$(CC) -c general.c $(FLAGS)
--	$(CC) -c kyocera.c $(FLAGS)
--	$(CC) -c motorola.c -Wall $(FLAGS)
--	$(CC) -c nokia.c -Wall $(FLAGS)
--	$(CC) -c parse_imelody.c -Wall $(FLAGS)
--	$(CC) -c parse_kws.c -Wall $(FLAGS)
--	$(CC) -c parse_logo.c -Wall $(FLAGS)
--	$(CC) -c parse_midi.c -Wall $(FLAGS)
--	$(CC) -c parse_rtttl.c -Wall $(FLAGS)
--	$(CC) -c rtttl.c -Wall $(FLAGS)
--	$(CC) -c samsung.c -Wall $(FLAGS)
--	$(CC) -c wav.c -Wall $(FLAGS)
--	$(CC) -c wav2pdb.c -Wall $(FLAGS)
--	$(CC) -o ringtonetools ringtonetools.c bmp_parse.o fileoutput.o \
-+	$(CC) $(CFLAGS) -c bmp_parse.c $(FLAGS)
-+	$(CC) $(CFLAGS) -c fileoutput.c $(FLAGS)
-+	$(CC) $(CFLAGS) -c general.c $(FLAGS)
-+	$(CC) $(CFLAGS) -c kyocera.c $(FLAGS)
-+	$(CC) $(CFLAGS) -c motorola.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c nokia.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c parse_imelody.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c parse_kws.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c parse_logo.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c parse_midi.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c parse_rtttl.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c rtttl.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c samsung.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c wav.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -c wav2pdb.c -Wall $(FLAGS)
-+	$(CC) $(CFLAGS) -o ringtonetools ringtonetools.c bmp_parse.o fileoutput.o \
- 	         general.o kyocera.o motorola.o nokia.o parse_imelody.o \
- 	         parse_kws.o parse_logo.o  parse_midi.o parse_rtttl.o \
- 	         rtttl.o samsung.o wav.o wav2pdb.o -Wall $(FLAGS)
diff --git a/misc/ringtonetools/pkg-descr b/misc/ringtonetools/pkg-descr
index 777849d82533..8591fd7c2d03 100644
--- a/misc/ringtonetools/pkg-descr
+++ b/misc/ringtonetools/pkg-descr
@@ -1,9 +1,10 @@
-Tools for creating ringtones (the song that plays when your mobile phone
-rings) and logos for mobile phones.
+Create/Convert/Listen to ringtones for mobile phones.
+Ringtone tools support popular file formats such as rtttl, rtx,
+midi, kws, wav, imelody, emelody, ems, and more.  Supported phones 
+include Nokia, Sony/Ericsson, Kyocera, Samsung, Motorola, Siemens,
+and more.
 
-Ringtonetools is known to work with Nokia and Kyocera phones, and support
-for Motorola and Samsung phones is included, too.
+WWW: http://ringtonetools.mikekohn.net/
 
-WWW: http://nakentone.naken.cc/
-
--Michael A. Kohn <mike@mikekohn.net>
+-Michael Kohn
+mike@mikekohn.net
diff --git a/misc/ringtonetools/pkg-plist b/misc/ringtonetools/pkg-plist
index 23b9c7538114..643240e0e241 100644
--- a/misc/ringtonetools/pkg-plist
+++ b/misc/ringtonetools/pkg-plist
@@ -2,7 +2,7 @@ bin/ringtonetools
 share/ringtonetools/face.icon
 share/ringtonetools/hemglass.mid
 share/ringtonetools/ionian.rtttl
-share/ringtonetools/usa.imelody
+share/ringtonetools/usa.emelody
 share/ringtonetools/yngwie_trilogy.rtttl
 @dirrm share/ringtonetools
 %%PORTDOCS%%share/doc/ringtonetools/README