ports/88539: [multimedia/ogle] use /dev/acd0 on FreeBSD 5.x+, not /dev/acd0c

[Craig Rodrigues]

>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:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 06 01:10:11 GMT 2005
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: