- Update to 0.31.

- Some Makefile changes in favor to use USE_CDRTOOLS and USE_GETTEXT.

PR:		ports/138323
Submitted by:	Sylvio Cesar <scjamorim@bsd.com.br>
Approved by:	maintainer timeout (more than 2 weeks)

3 files changed, 18 insertions, 59 deletions

diff --git a/audio/mp3c/Makefile b/audio/mp3c/Makefile
index b82d999c37ce..b60ee4d948e8 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mp3c
-PORTVERSION=	0.27
-PORTREVISION=	1
+PORTVERSION=	0.31
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.wspse.de/linux/wspse/:src
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \
@@ -17,16 +16,27 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	joris@vandalon.nl
 COMMENT=	A CD to mp3c converter with a console frontend
 
-RUN_DEPENDS=	dagrab:${PORTSDIR}/audio/dagrab \
-		gogo:${PORTSDIR}/audio/gogo \
-		id3tool:${PORTSDIR}/audio/id3tool
+RUN_DEPENDS=	mp3info:${PORTSDIR}/audio/mp3info
 
+USE_CDRTOOLS=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 
 MAN1=		mp3c.1
 MANCOMPRESSED=	no
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|rcd0d|acd0|g' ${WRKSRC}/src/conf.c
+	@${REINPLACE_CMD} -e 's|/dev/cdrom|/dev/acd0|g' ${WRKSRC}/src/conf.c
+
 post-install:
 	${INSTALL_SCRIPT} ${DISTDIR}/cdrip.sh ${LOCALBASE}/bin
 
diff --git a/audio/mp3c/distinfo b/audio/mp3c/distinfo
index f0a931dbecaf..4e0047294deb 100644
--- a/audio/mp3c/distinfo
+++ b/audio/mp3c/distinfo
@@ -1,6 +1,6 @@
-MD5 (mp3c-0.27.tar.gz) = 6afabf4c266effa498cd0bd7d25063c9
-SHA256 (mp3c-0.27.tar.gz) = 7f1b67199b587b7feee1347b180df005379e9898bfa75547641a3afa174876c9
-SIZE (mp3c-0.27.tar.gz) = 423772
+MD5 (mp3c-0.31.tar.gz) = 086dceea3b6c5468c4d79958a4c08c20
+SHA256 (mp3c-0.31.tar.gz) = a2777b55d446737f0c4358b86d3ec39c5e3bcadeb5b6682d1208af928404a311
+SIZE (mp3c-0.31.tar.gz) = 496466
 MD5 (cdrip.sh) = f124ab1fbf4a6714457f9b238e80945e
 SHA256 (cdrip.sh) = abdb2b5a18ef78e84cc84227744011a4089c97456c25f7e5824de80dea94f241
 SIZE (cdrip.sh) = 116
diff --git a/audio/mp3c/files/patch-zz b/audio/mp3c/files/patch-zz
deleted file mode 100644
index 9643199cf1c9..000000000000
--- a/audio/mp3c/files/patch-zz
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/conf.c.orig	Wed Jun 27 19:01:29 2001
-+++ src/conf.c	Thu Jul 11 15:06:19 2002
-@@ -34,12 +34,12 @@
- #include <sys/param.h>
- #endif /* HAVE_SYS_PARAM_H */
- 
--#define FN_PATTERN      "%7-%8.mp3"    /* pattern for filename: %1 = artist,
-+#define FN_PATTERN      "%7-%2.mp3"    /* pattern for filename: %1 = artist,
- 					  %2 = title, %3 = album, %4 = genre,
- 					  %5 = year, %6 = track, %7 = track (with leading zeros)
- 					  %8 = cddb-id
- 				       	*/
--#define FN_PATTERN_MIX  "%3/%1-%2.mp3"
-+#define FN_PATTERN_MIX  "%7-%2.mp3"
- #define DEF_CDDB_SERVER "freedb.freedb.org:8880"
- 
- #ifdef CONF_CDDB_PATH
-@@ -49,18 +49,18 @@
- #endif   /* CONF_CDDB_PATH */
- 
- #if (defined(BSD) && BSD >= 199306)
--#define DEF_CDROM_DEV	"/dev/rcd0d"
-+#define DEF_CDROM_DEV	"/dev/acd0c"
- #else
--#define DEF_CDROM_DEV   "/dev/cdrom"
-+#define DEF_CDROM_DEV   "/dev/acd0c"
- #endif /* !(defined(BSD) && BSD >= 199306) */
- #define DEF_TMP_FILE    "/tmp/WSPse-MP3Creat.wav"
- #define DEF_MP3_DIR     "./"      /* default dir for mp3s */
- #define DEF_M3U_DIR     "0"       /* default dir for m3us */
- #define DEF_MP3_INFO    "id3tool -r \"%1\" -t \"%2\" -a \"%3\" -y \"%5\" -g %4 -n \"%6\" \"%7\""
--#define DEF_CD_RIP_NF   "cdparanoia -d \"%1\" %2 \"%3\""
--#define DEF_CD_RIP_OF   "cdparanoia -d \"%1\" %2 -"
--#define DEF_MP3_ENC_NF  "mp3enc \"%1\" \"%2\""
--#define DEF_MP3_ENC_OF  "mp3enc - \"%1\""
-+#define DEF_CD_RIP_NF   "dagrab -o 6 -n 32 -d %1 -f %3 %2"
-+#define DEF_CD_RIP_OF   "cdrip.sh %1 %2"
-+#define DEF_MP3_ENC_NF  "gogo  %1 %2"
-+#define DEF_MP3_ENC_OF  "gogo /tmp/mp3 \"%1\" -b 160"
- #define DEF_FRM_MULTI   214
- #define DEF_M3U_PATTERN "%1-%3.m3u"    /* pattern for m3u-playlist: %1 = artist,
- 				i	  %2 = songtitle, %3 = album */
-@@ -165,7 +165,7 @@
-   fn_toupper          = TRUE;
-   fn_mode             = 1;
-   mp3_frame_mult      = DEF_FRM_MULTI;
--  def_on_fly          = FALSE;
-+  def_on_fly          = TRUE;
-   eased_char_hand     = FALSE;
-   replace_slash_ch    = '-';
-   rip_enc_ordered     = FALSE;