Attachment #99271 for bug #138323

View | Details | Raw Unified | Return to bug 138323
Collapse All | Expand All




#

PORTNAME=	mp3c
PORTVERSION=	0.31
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	ftp://ftp.wspse.de/linux/wspse/:src
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \

MAINTAINER=	joris@vandalon.nl
COMMENT=	A CD to mp3c converter with a console frontend

RUN_DEPENDS=	mp3info:${PORTSDIR}/audio/mp3info
		gogo:${PORTSDIR}/audio/gogo \
		id3tool:${PORTSDIR}/audio/id3tool

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


Lines 1-6 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (mp3c-0.27.tar.gz) = 6afabf4c266effa498cd0bd7d25063c9	1	MD5 (mp3c-0.31.tar.gz) = 086dceea3b6c5468c4d79958a4c08c20
2	SHA256 (mp3c-0.27.tar.gz) = 7f1b67199b587b7feee1347b180df005379e9898bfa75547641a3afa174876c9	2	SHA256 (mp3c-0.31.tar.gz) = a2777b55d446737f0c4358b86d3ec39c5e3bcadeb5b6682d1208af928404a311
3	SIZE (mp3c-0.27.tar.gz) = 423772	3	SIZE (mp3c-0.31.tar.gz) = 496466
4	MD5 (cdrip.sh) = f124ab1fbf4a6714457f9b238e80945e	4	MD5 (cdrip.sh) = f124ab1fbf4a6714457f9b238e80945e
5	SHA256 (cdrip.sh) = abdb2b5a18ef78e84cc84227744011a4089c97456c25f7e5824de80dea94f241	5	SHA256 (cdrip.sh) = abdb2b5a18ef78e84cc84227744011a4089c97456c25f7e5824de80dea94f241
6	SIZE (cdrip.sh) = 116	6	SIZE (cdrip.sh) = 116




--- 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;

Return to bug 138323

Lines 6-13 Link Here

(-)Makefile (-5 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= mp3c	8	PORTNAME= mp3c
9	PORTVERSION= 0.27	9	PORTVERSION= 0.31
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ftp://ftp.wspse.de/linux/wspse/:src	11	MASTER_SITES= ftp://ftp.wspse.de/linux/wspse/:src
13	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \	12	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \
Lines 17-32 Link Here
17	MAINTAINER= joris@vandalon.nl	16	MAINTAINER= joris@vandalon.nl
18	COMMENT= A CD to mp3c converter with a console frontend	17	COMMENT= A CD to mp3c converter with a console frontend
19		18
20	RUN_DEPENDS= dagrab:${PORTSDIR}/audio/dagrab \	19	RUN_DEPENDS= mp3info:${PORTSDIR}/audio/mp3info
21	gogo:${PORTSDIR}/audio/gogo \
22	id3tool:${PORTSDIR}/audio/id3tool
23		20
		21	USE_CDRTOOLS= yes
24	HAS_CONFIGURE= yes	22	HAS_CONFIGURE= yes
25	CONFIGURE_ARGS= "--prefix=${PREFIX}"	23	CONFIGURE_ARGS= "--prefix=${PREFIX}"
26		24
27	MAN1= mp3c.1	25	MAN1= mp3c.1
28	MANCOMPRESSED= no	26	MANCOMPRESSED= no
29		27
		28	.if defined(WITHOUT_NLS)
		29	CONFIGURE_ARGS+= --disable-nls
		30	PLIST_SUB+= NLS="@comment "
		31	.else
		32	USE_GETTEXT= yes
		33	PLIST_SUB+= NLS=""
		34	.endif
		35
		36	post-patch:
		37	@${REINPLACE_CMD} -e 's\|rcd0d\|acd0\|g' ${WRKSRC}/src/conf.c
		38	@${REINPLACE_CMD} -e 's\|/dev/cdrom\|/dev/acd0\|g' ${WRKSRC}/src/conf.c
		39
30	post-install:	40	post-install:
31	${INSTALL_SCRIPT} ${DISTDIR}/cdrip.sh ${LOCALBASE}/bin	41	${INSTALL_SCRIPT} ${DISTDIR}/cdrip.sh ${LOCALBASE}/bin
32		42

Removed Link Here

(-)files/patch-zz (-51 lines)
1	--- src/conf.c.orig Wed Jun 27 19:01:29 2001
2	+++ src/conf.c Thu Jul 11 15:06:19 2002
3	@@ -34,12 +34,12 @@
4	#include <sys/param.h>
5	#endif /* HAVE_SYS_PARAM_H */
6
7	-#define FN_PATTERN "%7-%8.mp3" /* pattern for filename: %1 = artist,
8	+#define FN_PATTERN "%7-%2.mp3" /* pattern for filename: %1 = artist,
9	%2 = title, %3 = album, %4 = genre,
10	%5 = year, %6 = track, %7 = track (with leading zeros)
11	%8 = cddb-id
12	*/
13	-#define FN_PATTERN_MIX "%3/%1-%2.mp3"
14	+#define FN_PATTERN_MIX "%7-%2.mp3"
15	#define DEF_CDDB_SERVER "freedb.freedb.org:8880"
16
17	#ifdef CONF_CDDB_PATH
18	@@ -49,18 +49,18 @@
19	#endif /* CONF_CDDB_PATH */
20
21	#if (defined(BSD) && BSD >= 199306)
22	-#define DEF_CDROM_DEV "/dev/rcd0d"
23	+#define DEF_CDROM_DEV "/dev/acd0c"
24	#else
25	-#define DEF_CDROM_DEV "/dev/cdrom"
26	+#define DEF_CDROM_DEV "/dev/acd0c"
27	#endif /* !(defined(BSD) && BSD >= 199306) */
28	#define DEF_TMP_FILE "/tmp/WSPse-MP3Creat.wav"
29	#define DEF_MP3_DIR "./" /* default dir for mp3s */
30	#define DEF_M3U_DIR "0" /* default dir for m3us */
31	#define DEF_MP3_INFO "id3tool -r \"%1\" -t \"%2\" -a \"%3\" -y \"%5\" -g %4 -n \"%6\" \"%7\""
32	-#define DEF_CD_RIP_NF "cdparanoia -d \"%1\" %2 \"%3\""
33	-#define DEF_CD_RIP_OF "cdparanoia -d \"%1\" %2 -"
34	-#define DEF_MP3_ENC_NF "mp3enc \"%1\" \"%2\""
35	-#define DEF_MP3_ENC_OF "mp3enc - \"%1\""
36	+#define DEF_CD_RIP_NF "dagrab -o 6 -n 32 -d %1 -f %3 %2"
37	+#define DEF_CD_RIP_OF "cdrip.sh %1 %2"
38	+#define DEF_MP3_ENC_NF "gogo %1 %2"
39	+#define DEF_MP3_ENC_OF "gogo /tmp/mp3 \"%1\" -b 160"
40	#define DEF_FRM_MULTI 214
41	#define DEF_M3U_PATTERN "%1-%3.m3u" /* pattern for m3u-playlist: %1 = artist,
42	i %2 = songtitle, %3 = album */
43	@@ -165,7 +165,7 @@
44	fn_toupper = TRUE;
45	fn_mode = 1;
46	mp3_frame_mult = DEF_FRM_MULTI;
47	- def_on_fly = FALSE;
48	+ def_on_fly = TRUE;
49	eased_char_hand = FALSE;
50	replace_slash_ch = '-';
51	rip_enc_ordered = FALSE;