From rodrigc@crodrigues.org  Sun Nov  6 01:04:28 2005
Return-Path: <rodrigc@crodrigues.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 636A416A41F;
	Sun,  6 Nov 2005 01:04:28 +0000 (GMT)
	(envelope-from rodrigc@crodrigues.org)
Received: from sccrmhc11.comcast.net (sccrmhc11.comcast.net [204.127.202.55])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6746843D49;
	Sun,  6 Nov 2005 01:04:27 +0000 (GMT)
	(envelope-from rodrigc@crodrigues.org)
Received: from c-24-147-19-135.hsd1.ma.comcast.net ([24.147.19.135])
          by comcast.net (sccrmhc11) with ESMTP
          id <2005110601042201100mc6nbe>; Sun, 6 Nov 2005 01:04:26 +0000
Received: from c-24-147-19-135.hsd1.ma.comcast.net (localhost.127.in-addr.arpa [127.0.0.1])
	by c-24-147-19-135.hsd1.ma.comcast.net (8.13.4/8.13.1) with ESMTP id jA614Vf8068221;
	Sat, 5 Nov 2005 20:04:31 -0500 (EST)
	(envelope-from rodrigc@c-24-147-19-135.hsd1.ma.comcast.net)
Received: (from rodrigc@localhost)
	by c-24-147-19-135.hsd1.ma.comcast.net (8.13.4/8.13.1/Submit) id jA614UvJ068220;
	Sat, 5 Nov 2005 20:04:30 -0500 (EST)
	(envelope-from rodrigc)
Message-Id: <200511060104.jA614UvJ068220@c-24-147-19-135.hsd1.ma.comcast.net>
Date: Sat, 5 Nov 2005 20:04:30 -0500 (EST)
From: Craig Rodrigues <rodrigc@crodrigues.org>
Reply-To: Craig Rodrigues <rodrigc@crodrigues>
To: FreeBSD-gnats-submit@freebsd.org
Cc: lioux@freebsd.org
Subject: [multimedia/ogle] use /dev/acd0 on FreeBSD 5.x+, not /dev/acd0c
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         88539
>Category:       ports
>Synopsis:       multimedia/ogle: use /dev/acd0 on FreeBSD 5.x+, not /dev/acd0c
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    lioux
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 06 01:10:11 GMT 2005
>Closed-Date:    Fri Nov 18 20:30:28 GMT 2005
>Last-Modified:  Fri Nov 18 20:30:28 GMT 2005
>Originator:     Craig Rodrigues
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dibbler.crodrigues.org 7.0-CURRENT FreeBSD 7.0-CURRENT #22: Sat Oct 29 17:30:04 EDT 2005 root@dibbler.crodrigues.org:/usr/obj/usr/src/sys/MYKERNEL1 i386


	
>Description:
On FreeBSD 5.x and higher, use /dev/acd0 as the default
device, not /dev/acd0c.
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/ogle/Makefile,v
retrieving revision 1.27
diff -u -u -r1.27 Makefile
--- Makefile	25 Dec 2004 11:43:53 -0000	1.27
+++ Makefile	6 Nov 2005 01:00:41 -0000
@@ -35,10 +35,14 @@
 MAN1=	ogle.1
 MAN5=	oglerc.5
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 .ifdef(WITH_DVD_DEVICE)
 	@${REINPLACE_CMD} -E -e "s|(DEFAULT_DVD_DEVICE=\")/dev/acd0c(\")|\1${WITH_DVD_DEVICE}\2|" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.elif ${OSVERSION} >= 500000
+	@${REINPLACE_CMD} -E -e "s|acd0c|acd0|" ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in
 # hack to make ogle work with liba52 + djbfft
@@ -51,7 +55,6 @@
 	@${TOUCH} `${FIND} -E ${WRKSRC} -regex ".*Makefile\.(am|in)"`
 	@${TOUCH} ${WRKSRC}/configure.in ${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
 
 # XXX due to gcc-3.4 (20040706) bug in preprocessing of inline functions,
 # this needs at least -O2 to compile. Fails with -O
@@ -78,7 +81,11 @@
 
 pre-everything::
 .ifndef(WITH_DVD_DEVICE)
+.if ${OSVERSION} >= 500000
+	@${ECHO_MSG} '===> The default DVD device is /dev/acd0'
+.else
 	@${ECHO_MSG} '===> The default DVD device is /dev/acd0c'
+.endif
 	@${ECHO_MSG} "===> You can choose any DVD device at Ogle's command line"
 	@${ECHO_MSG} '===> Define WITH_DVD_DEVICE if you want to change the default'
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lioux 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Nov 6 01:12:14 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=88539 
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Fri Nov 18 20:30:26 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=88539 
>Unformatted:
