Bug 73885

Hi Martin,

> 	Sun Aug 17 12:00:34 2003
> +++ dekagen/files/patch-dekagen	Fri Nov 12 22:32:42 2004
> @@ -6,7 +6,7 @@
>   XMCDLIB=''			# $XMCD_LIBDIR
>  -DEVICE='/dev/cdrom'		# device used for ripping
>  +# Adapted DEVICE to a reasonabe FreeBSD default. Martin Kraft.
> -+DEVICE='/dev/acd0c'		# device used for ripping
> ++DEVICE='/dev/acd0'		# device used for ripping
>   NCONVENT='artist-name_of_song.mp3'
>   SELEC='1'			# MP3/Ogg naming convention
>   WHOLE='no'			# rip whole CD ('yes' or 'no')
>

/dev/ac0c is still used on 4.x, take a look at 
ports/multimedia/lsdvd/Makefile
for an example how to get around this

Michael

Comment 2 Michael Johnson 2004-11-12 23:26:53 UTC

Responsible Changed
From-To: freebsd-ports-bugs->ahze

Grab

Comment 3 Michael Johnson 2004-11-12 23:58:26 UTC

State Changed
From-To: open->feedback

Asked Maintainer for feedback

Dear Michael,

On Fri, Nov 12, 2004 at 05:14:22PM -0500, Michael Johnson wrote:
> 
> /dev/ac0c is still used on 4.x, take a look at 
> ports/multimedia/lsdvd/Makefile
> for an example how to get around this

Thank you for the hint.

Thus, my second suggestion for the port upgrade of dekagen:


diff -ruN dekagen-1.0.1/Makefile dekagen/Makefile
--- dekagen-1.0.1/Makefile	Mon Aug  9 19:35:10 2004
+++ dekagen/Makefile	Sat Nov 13 20:01:06 2004
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   dekagen
-# Date created:        12 August 2003
+# Date created:        12 November 2004
 # Whom:                Martin Kraft <martin.kraft@fal.de>
 #
 # $FreeBSD: ports/audio/dekagen/Makefile,v 1.3 2004/02/06 13:10:46 trevor Exp $
 #
 
 PORTNAME=	dekagen
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/linux/apps/sound/convert/
 
@@ -33,8 +33,24 @@
 MAN1=		dekagen.1
 MANCOMPRESSED=	yes
 PLIST_FILES=	bin/dekagen
+USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
+
+.if defined(CD_DEVICE)
+DEFAULT_CD_DEVICE=${CD_DEVICE}
+.else
+.if ${OSVERSION} < 500000
+DEFAULT_CD_DEVICE=/dev/acd0c
+.else
+DEFAULT_CD_DEVICE=/dev/acd0
+.endif
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+	's|/dev/cdrom|${DEFAULT_CD_DEVICE}|' \
+	${WRKSRC}/dekagen
 
 NO_BUILD=	Shell Script
 do-install:
diff -ruN dekagen-1.0.1/distinfo dekagen/distinfo
--- dekagen-1.0.1/distinfo	Mon Aug  9 19:35:10 2004
+++ dekagen/distinfo	Mon Nov  8 23:09:18 2004
@@ -1,2 +1,2 @@
-MD5 (dekagen-1.0.1.tar.gz) = 0c2f8db38fa4a9ea0827be75fb4cf762
-SIZE (dekagen-1.0.1.tar.gz) = 26774
+MD5 (dekagen-1.0.2.tar.gz) = e40bcac8985d83b38eeb07cd311ebe2e
+SIZE (dekagen-1.0.2.tar.gz) = 27055
diff -ruN dekagen-1.0.1/files/patch-dekagen dekagen/files/patch-dekagen
--- dekagen-1.0.1/files/patch-dekagen	Sun Aug 17 12:00:34 2003
+++ dekagen/files/patch-dekagen	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
---- dekagen.orig	Sat Jul 19 13:00:19 2003
-+++ dekagen	Tue Aug 12 23:02:30 2003
-@@ -42,7 +42,8 @@
- BITRATE='128'			# MP3/Ogg nominal encoding bitrate (KBits)
- METHOD='manual'			# 'manual' or 'cddb'
- XMCDLIB=''			# $XMCD_LIBDIR
--DEVICE='/dev/cdrom'		# device used for ripping
-+# Adapted DEVICE to a reasonabe FreeBSD default. Martin Kraft.
-+DEVICE='/dev/acd0c'		# device used for ripping
- NCONVENT='artist-name_of_song.mp3'
- SELEC='1'			# MP3/Ogg naming convention
- WHOLE='no'			# rip whole CD ('yes' or 'no')


Note:

Delete the file files/patch-dekagen as well as the directory files.
Can README.html be releted and rebuilt automatically?

Martin Kraft

On Sat, Nov 13, 2004 at 02:39:51PM -0500, Michael Johnson wrote:
> 
> I changed CD_DEVICE to WTIH_CDROM_DEVICE to conform with other ports
> that use the same knob.
> 
> Do you approve these changes?

Yes, of course.

Thanks, Martin Kraft

Comment 6 Michael Johnson 2004-11-14 05:58:52 UTC

State Changed
From-To: feedback->closed

Committed, Thanks!