- Workaround Python ioctl() wrapper deficiency different way so Freevo

do not attempts to read media every other second.
- Move pkg-message into files/pkg-message.in [1]

PR:		95226 [1]
Approved by:	maintainer

multimedia/freevo/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	freevo
 PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freevo
@@ -17,6 +17,7 @@ COMMENT=	Open source digital jukebox
 
 NO_BUILD=	yes
 SUB_LIST+=	PORTVERSION=${PORTVERSION}
+SUB_FILES=	pkg-message
 
 RUN_DEPENDS=	aumix:${PORTSDIR}/audio/aumix \
 		${PYTHON_SITELIBDIR}/pyosd/__init__.py:${PORTSDIR}/misc/py-osd \

multimedia/freevo/files/patch-src-plugins-rom_drives.py

@@ -1,23 +1,11 @@
---- src/plugins/rom_drives.py.orig	Sun Jan 23 20:40:19 2005
-+++ src/plugins/rom_drives.py	Tue Sep 20 20:26:48 2005
-@@ -415,9 +415,19 @@
-                     data = array.array('c', '\000'*4096)
-                     (address, length) = data.buffer_info()
-                     buf = pack('BBHP', CD_MSF_FORMAT, 0, length, address)
--                    s = ioctl(fd, CDIOREADTOCENTRYS, buf)
-+                    #s = ioctl(fd, CDIOREADTOCENTRYS, buf)
-+
-+                    # Above s = ioctl(... doesn't seem to work.
-+                    # Instead let's try and read from the disc, if it
-+                    # succeeds then there must be a disc in the drive.
-+                    # Nasty but it seems to work...
-+                    fd2 = open(media.devicename, 'rb')
-+                    fd2.seek(32768)
-+                    fd2.read(1)
-+                    fd2.close()
-                     s = CDS_DISC_OK
-                 except:
-+                    fd2.close()
-                     s = CDS_NO_DISC
-             else:
-                 s = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)
+--- src/plugins/rom_drives.py.orig	Sun Oct 16 18:18:49 2005
++++ src/plugins/rom_drives.py	Sun Feb 26 17:59:30 2006
+@@ -70,7 +70,7 @@
+         # FreeBSD ioctls - there is no CDROM.py...
+         CDIOCEJECT = 0x20006318
+         CDIOCCLOSE = 0x2000631c
+-        CDIOREADTOCENTRYS = 0xc0086305
++        CDIOREADTOCENTRYS = -1073192187
+         CD_LBA_FORMAT = 1
+         CD_MSF_FORMAT = 2
+         CDS_NO_DISC = 1

multimedia/freevo/files/pkg-message.in

@@ -1,7 +1,7 @@
 ***********************************************************************
 
   Freevo is now installed.  It might be a good idea to read the docs
-  in %%PREFIX%%/share/doc/freevo-1.5.4
+  in %%PREFIX%%/share/doc/freevo-%%PORTVERSION%%
 
   By default Freevo is configured with a single VFS in /var/db/cache.
   You can use this by adding users to the freevo group.