svn commit: r389939 - in head/audio/mp3c: . files

[Jason E. Hale]

Author: jhale
Date: Wed Jun 17 16:11:47 2015
New Revision: 389939
URL: https://svnweb.freebsd.org/changeset/ports/389939

Log:
  - Unbreak by moving small unfetchable script to ${FILESDIR}
  
  While here:
  - Add LICENSE
  - Convert to options helpers
  - Fix location of default CDROM device on FreeBSD>=10
  
  PR:		200140
  Submitted by:	Chris Hutchinson <portmaster at bsdforge.com>
  Approved by:	maintainer timeout

Added:
  head/audio/mp3c/files/
  head/audio/mp3c/files/cdrip.sh   (contents, props changed)
Modified:
  head/audio/mp3c/Makefile
  head/audio/mp3c/distinfo

Modified: head/audio/mp3c/Makefile
==============================================================================
--- head/audio/mp3c/Makefile	Wed Jun 17 15:39:30 2015	(r389938)
+++ head/audio/mp3c/Makefile	Wed Jun 17 16:11:47 2015	(r389939)
@@ -3,17 +3,16 @@
 
 PORTNAME=	mp3c
 PORTVERSION=	0.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.wspse.de/linux/wspse/:src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
-		cdrip.sh
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	ftp://ftp.wspse.de/linux/wspse/
 
 MAINTAINER=	joris at vandalon.nl
 COMMENT=	CD to mp3c converter with a console frontend
 
-BROKEN=		Unfetchable
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 RUN_DEPENDS=	mp3info:${PORTSDIR}/audio/mp3info \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
@@ -21,22 +20,25 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=		NLS=""
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000031
+DEFAULT_CDROM_DEVICE=	cd0
 .else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
+DEFAULT_CDROM_DEVICE=	acd0
 .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
+	@${REINPLACE_CMD} -e 's|rcd0d|${DEFAULT_CDROM_DEVICE}|g' \
+		-e 's|/dev/cdrom|/dev/${DEFAULT_CDROM_DEVICE}|g' \
+		${WRKSRC}/src/conf.c
 
 post-install:
-	${INSTALL_SCRIPT} ${DISTDIR}/cdrip.sh ${STAGEDIR}${LOCALBASE}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/cdrip.sh ${STAGEDIR}${LOCALBASE}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/audio/mp3c/distinfo
==============================================================================
--- head/audio/mp3c/distinfo	Wed Jun 17 15:39:30 2015	(r389938)
+++ head/audio/mp3c/distinfo	Wed Jun 17 16:11:47 2015	(r389939)
@@ -1,4 +1,2 @@
 SHA256 (mp3c-0.31.tar.gz) = a2777b55d446737f0c4358b86d3ec39c5e3bcadeb5b6682d1208af928404a311
 SIZE (mp3c-0.31.tar.gz) = 496466
-SHA256 (cdrip.sh) = abdb2b5a18ef78e84cc84227744011a4089c97456c25f7e5824de80dea94f241
-SIZE (cdrip.sh) = 116

Added: head/audio/mp3c/files/cdrip.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/mp3c/files/cdrip.sh	Wed Jun 17 16:11:47 2015	(r389939)
@@ -0,0 +1,7 @@
+#!/bin/sh
+if  [ -f /tmp/mp3 ] ; then
+        rm /tmp/mp3
+fi
+mkfifo /tmp/mp3
+dagrab -v -n 64 -d $1 -f /tmp/mp3 $2 &
+