7 files changed, 35 insertions, 19 deletions

diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 8baa85a764b8..14dfbc19389c 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mmpython
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 # The mmpython folks keep changing their release naming scheme.
 #DISTNAME=	mmpython_${PORTVERSION:C/\./-/}
 
-MAINTAINER=	lars.eggert@gmx.net
+MAINTAINER=	purple@lewiz.net
 COMMENT=	Retrieves metadata from mp3, ogg, avi, jpg and other formats
 
 LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
@@ -27,5 +28,9 @@ RUN_DEPENDS=	lsdvd:${PORTSDIR}/multimedia/lsdvd
 #USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|gcc -ldvdread|gcc -L${LOCALBASE}/lib -ldvdread|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/multimedia/mmpython/files/patch-disc_discinfo.py b/multimedia/mmpython/files/patch-disc_discinfo.py
index 237958ec15af..0ccac5a03ad2 100644
--- a/multimedia/mmpython/files/patch-disc_discinfo.py
+++ b/multimedia/mmpython/files/patch-disc_discinfo.py
@@ -1,9 +1,17 @@
-
-$FreeBSD$
-
---- disc/discinfo.py.orig	Thu Jun 10 20:51:51 2004
-+++ disc/discinfo.py	Thu Jun 10 20:52:32 2004
-@@ -223,22 +223,10 @@
+--- disc/discinfo.py	Sun Feb  8 17:44:05 2004
++++ disc/discinfo.py	Thu Jun 17 00:04:48 2004
+@@ -191,7 +191,9 @@
+     
+     fd = open(device, 'rb')
+     try:
+-    	fd.seek(0x0000832d)
++	fd.seek(32768) # 2048 multiple boundary for FreeBSD
++	# FreeBSD doesn't return IOError unless we try and read:
++	fd.read(1)
+     except IOError:
+     	fd.close()
+ 	return 3
+@@ -223,22 +225,12 @@
      else:
          f = open(device,'rb')
  
@@ -23,6 +31,8 @@ $FreeBSD$
 -            id = id[813:829]
 -        else:
 -            label = f.read(32)
++        # FreeBSD can only seek to 2048 multiple boundaries.
++        # Below works on Linux and FreeBSD:
 +        f.seek(32768)
 +        id = f.read(829)
 +        label = id[40:72]
diff --git a/multimedia/mmpython/files/patch-disc_dvdinfo.py b/multimedia/mmpython/files/patch-disc_dvdinfo.py
index a69022a3bb61..8639815bc8db 100644
--- a/multimedia/mmpython/files/patch-disc_dvdinfo.py
+++ b/multimedia/mmpython/files/patch-disc_dvdinfo.py
@@ -9,8 +9,8 @@ $FreeBSD$
          f = open(device,'rb')
 -        f.seek(32808, 0)
 -        buffer = f.read(50000)
-+        f.seek(32768, 0)
-+        buffer = f.read(50040)
++        f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple boundary.
++        buffer = f.read(50040) # Read 40 more to compensate for above seek.
  
          if buffer.find('UDF') == -1:
              f.close()
@@ -20,8 +20,8 @@ $FreeBSD$
          # brute force reading of the device to find out if it is a DVD
 -        f.seek(32808, 0)
 -        buffer = f.read(50000)
-+        f.seek(32768, 0)
-+        buffer = f.read(50040)
++        f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple boundary.
++        buffer = f.read(50040) # Read 40 more to compensate for above seek.
  
          if buffer.find('UDF') == -1:
              return 0
diff --git a/multimedia/mmpython/files/patch-disc_lsdvd.py b/multimedia/mmpython/files/patch-disc_lsdvd.py
index bc3a1e49d6ac..e8071fbabebc 100644
--- a/multimedia/mmpython/files/patch-disc_lsdvd.py
+++ b/multimedia/mmpython/files/patch-disc_lsdvd.py
@@ -9,8 +9,8 @@ $FreeBSD$
          f = open(device,'rb')
 -        f.seek(32808, 0)
 -        buffer = f.read(50000)
-+        f.seek(32768, 0)
-+        buffer = f.read(50040)
++        f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple boundary.
++        buffer = f.read(50040) # Read 40 more to compensate for above seek.
  
          if buffer.find('UDF') == -1:
              f.close()
diff --git a/multimedia/mmpython/files/patch-disc_vcdinfo.py b/multimedia/mmpython/files/patch-disc_vcdinfo.py
index f691de2d1338..d821e2863b44 100644
--- a/multimedia/mmpython/files/patch-disc_vcdinfo.py
+++ b/multimedia/mmpython/files/patch-disc_vcdinfo.py
@@ -10,9 +10,9 @@ $FreeBSD$
 -        f.seek(32808, 0)
 -        buffer = f.read(50000)
 -        f.close()
-+	f.seek(32768, 0)
-+        buffer = f.read(50040)
-+	f.close()
++        f.seek(32768, 0) # FreeBSD requires seeking to a 2048 multiple boundary.
++        buffer = f.read(50040) # Read 40 more to compensate for above seek.
++        f.close()
  
          if buffer.find('SVCD') > 0 and buffer.find('TRACKS.SVD') > 0 and \
                 buffer.find('ENTRIES.SVD') > 0:
diff --git a/multimedia/mmpython/files/patch-video_vcdinfo.py b/multimedia/mmpython/files/patch-video_vcdinfo.py
index 767f466bffce..356a71eb2828 100644
--- a/multimedia/mmpython/files/patch-video_vcdinfo.py
+++ b/multimedia/mmpython/files/patch-video_vcdinfo.py
@@ -10,9 +10,9 @@ $FreeBSD$
 -        f.seek(32808, 0)
 -        buffer = f.read(50000)
 -        f.close()
-+        f.seek(32768, 0)
-+        buffer = f.read(50040)
-+	f.close()
++        f.seek(32768, 0) # FreeBSD requires seeking to 2048 multiple boundary.
++        buffer = f.read(50040) # Read 40 more to compensate for above seek.
++        f.close()
  
          if buffer.find('SVCD') > 0 and buffer.find('TRACKS.SVD') > 0 and \
                 buffer.find('ENTRIES.SVD') > 0:
diff --git a/multimedia/mmpython/pkg-plist b/multimedia/mmpython/pkg-plist
index fb322de1f246..a4591afcd985 100644
--- a/multimedia/mmpython/pkg-plist
+++ b/multimedia/mmpython/pkg-plist
@@ -66,6 +66,7 @@ bin/mminfo
 %%PYTHON_SITELIBDIR%%/mmpython/disc/dvdinfo.py
 %%PYTHON_SITELIBDIR%%/mmpython/disc/dvdinfo.pyc
 %%PYTHON_SITELIBDIR%%/mmpython/disc/dvdinfo.pyo
+%%PYTHON_SITELIBDIR%%/mmpython/disc/ifoparser.so
 %%PYTHON_SITELIBDIR%%/mmpython/disc/lsdvd.py
 %%PYTHON_SITELIBDIR%%/mmpython/disc/lsdvd.pyc
 %%PYTHON_SITELIBDIR%%/mmpython/disc/lsdvd.pyo