From 21d43d1f855bf2a72d3e198709ee8a63e929c39e Mon Sep 17 00:00:00 2001
From: danfe <danfe@FreeBSD.org>
Date: Fri, 19 Jul 2013 10:34:40 +0000
Subject: - Update to version 2.26 - Unbreak parallel builds - Really respect
 CC and CFLAGS - Unmute installation commands - Reformat port description text
 and remove old-school attribution

Reported by:	pointyhat-west
---
 misc/ringtonetools/Makefile  | 18 ++++++++++--------
 misc/ringtonetools/distinfo  |  4 ++--
 misc/ringtonetools/pkg-descr | 12 ++++--------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/misc/ringtonetools/Makefile b/misc/ringtonetools/Makefile
index 94debe278912..1055ef31aa51 100644
--- a/misc/ringtonetools/Makefile
+++ b/misc/ringtonetools/Makefile
@@ -2,30 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	ringtonetools
-PORTVERSION=	2.25
+PORTVERSION=	2.26
 CATEGORIES=	misc
 MASTER_SITES=	http://downloads.mikekohn.net/${PORTNAME}/
 
 MAINTAINER=	mike@mikekohn.net
-COMMENT=	Create/Convert/Listen to ringtones and logos for mobile phones
+COMMENT=	Create/convert/listen to ringtones and logos for mobile phones
 
 RESTRICTED=	no-commercial-use
 
-pre-build:
-	@${REINPLACE_CMD} -e 's|^FLAGS|FLAGS?|' ${WRKSRC}/src/Makefile
+MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS}"
 
 .include <bsd.port.options.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|cd src && make|make -C src|' \
+		${WRKSRC}/Makefile
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ringtonetools ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ringtonetools ${PREFIX}/bin
 .for i in face.txt hemglass.mid ionian.rtttl usa.emelody yngwie_trilogy.rtttl
 	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/samples/${i} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/${i} ${DATADIR}
 .endfor
-
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/ringtonetools/distinfo b/misc/ringtonetools/distinfo
index e0d3ea40889c..c9e0a72fe913 100644
--- a/misc/ringtonetools/distinfo
+++ b/misc/ringtonetools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ringtonetools-2.25.tar.gz) = e278dd7ff4e1db8691147a0d98bd40f918f8af4b1b7c3e5ee1bd84b9b575f5f0
-SIZE (ringtonetools-2.25.tar.gz) = 40151
+SHA256 (ringtonetools-2.26.tar.gz) = 609081b7ef41addd0250af38ef0391ec0b696e8a1821a3817113acd80b6b88a1
+SIZE (ringtonetools-2.26.tar.gz) = 40172
diff --git a/misc/ringtonetools/pkg-descr b/misc/ringtonetools/pkg-descr
index 8591fd7c2d03..cdffd9a2ccb4 100644
--- a/misc/ringtonetools/pkg-descr
+++ b/misc/ringtonetools/pkg-descr
@@ -1,10 +1,6 @@
-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.
+Create, convert, and 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.
 
 WWW: http://ringtonetools.mikekohn.net/
-
--Michael Kohn
-mike@mikekohn.net
-- 
cgit