- Update to 0.4.5

PR:		ports/70581
Submitted by:	Lewis Thompson <purple@lewiz.net> (maintainer)

8 files changed, 12 insertions, 124 deletions

diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index efceaac7571a..135c87305a0c 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mmpython
-PORTVERSION=	0.4.4
+PORTVERSION=	0.4.5
 CATEGORIES=	multimedia python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/mmpython/distinfo b/multimedia/mmpython/distinfo
index 02641378f69a..b8777a97661d 100644
--- a/multimedia/mmpython/distinfo
+++ b/multimedia/mmpython/distinfo
@@ -1,2 +1,2 @@
-MD5 (mmpython-0.4.4.tar.gz) = 1f5a4766c4fe04ddd3e4aff825810dce
-SIZE (mmpython-0.4.4.tar.gz) = 119328
+MD5 (mmpython-0.4.5.tar.gz) = 3cf64c47aba02cd79f92bd1345cee87e
+SIZE (mmpython-0.4.5.tar.gz) = 123125
diff --git a/multimedia/mmpython/files/patch-disc_discinfo.py b/multimedia/mmpython/files/patch-disc_discinfo.py
deleted file mode 100644
index 0ccac5a03ad2..000000000000
--- a/multimedia/mmpython/files/patch-disc_discinfo.py
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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')
- 
--        f.seek(0x0000832d)
--        if os.uname()[0] == 'FreeBSD':
--            # why doesn't seeking to 0x0000832d+40 and reading 32 work?
--            # no idea, do it this way
--            label = f.read(72);
--            label = label[40:72]
--        else:    
--            id = f.read(16)
--        f.seek(32808, 0)
--        if os.uname()[0] == 'FreeBSD':
--            # why doesn't seeking to 32808 + 829 and reading 16 work?
--            # no idea, do it this way
--            id = f.read(829);
--            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]
-+        id = id[813:829]
- 
-         if CREATE_MD5_ID:
-             id_md5 = md5.new()
diff --git a/multimedia/mmpython/files/patch-disc_dvdinfo.py b/multimedia/mmpython/files/patch-disc_dvdinfo.py
deleted file mode 100644
index 8639815bc8db..000000000000
--- a/multimedia/mmpython/files/patch-disc_dvdinfo.py
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- disc/dvdinfo.py.orig	Thu Jun 10 20:53:51 2004
-+++ disc/dvdinfo.py	Thu Jun 10 20:55:02 2004
-@@ -115,8 +115,8 @@
- 
-         # brute force reading of the device to find out if it is a DVD
-         f = open(device,'rb')
--        f.seek(32808, 0)
--        buffer = f.read(50000)
-+        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()
-@@ -148,8 +148,8 @@
- 
-     def isDVDiso(self, f):
-         # 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) # 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
deleted file mode 100644
index e8071fbabebc..000000000000
--- a/multimedia/mmpython/files/patch-disc_lsdvd.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- disc/lsdvd.py.orig	Thu Jun 10 20:55:34 2004
-+++ disc/lsdvd.py	Thu Jun 10 20:58:14 2004
-@@ -173,8 +173,8 @@
- 
-         # brute force reading of the device to find out if it is a DVD
-         f = open(device,'rb')
--        f.seek(32808, 0)
--        buffer = f.read(50000)
-+        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
deleted file mode 100644
index d821e2863b44..000000000000
--- a/multimedia/mmpython/files/patch-disc_vcdinfo.py
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- disc/vcdinfo.py.orig	Thu Jun 10 20:56:21 2004
-+++ disc/vcdinfo.py	Thu Jun 10 20:56:59 2004
-@@ -62,9 +62,9 @@
-         
-         # brute force reading of the device to find out if it is a VCD
-         f = open(device,'rb')
--        f.seek(32808, 0)
--        buffer = f.read(50000)
--        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
deleted file mode 100644
index 356a71eb2828..000000000000
--- a/multimedia/mmpython/files/patch-video_vcdinfo.py
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- video/vcdinfo.py.orig	Thu Jun 10 20:58:51 2004
-+++ video/vcdinfo.py	Thu Jun 10 20:59:19 2004
-@@ -85,9 +85,9 @@
-         
-         # brute force reading of the bin to find out if it is a VCD
-         f = open(bin,'rb')
--        f.seek(32808, 0)
--        buffer = f.read(50000)
--        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 a4591afcd985..1cb0dc711214 100644
--- a/multimedia/mmpython/pkg-plist
+++ b/multimedia/mmpython/pkg-plist
@@ -29,6 +29,9 @@ bin/mminfo
 %%PYTHON_SITELIBDIR%%/mmpython/audio/flacinfo.py
 %%PYTHON_SITELIBDIR%%/mmpython/audio/flacinfo.pyc
 %%PYTHON_SITELIBDIR%%/mmpython/audio/flacinfo.pyo
+%%PYTHON_SITELIBDIR%%/mmpython/audio/id3.py
+%%PYTHON_SITELIBDIR%%/mmpython/audio/id3.pyc
+%%PYTHON_SITELIBDIR%%/mmpython/audio/id3.pyo
 %%PYTHON_SITELIBDIR%%/mmpython/audio/m4ainfo.py
 %%PYTHON_SITELIBDIR%%/mmpython/audio/m4ainfo.pyc
 %%PYTHON_SITELIBDIR%%/mmpython/audio/m4ainfo.pyo
@@ -109,6 +112,12 @@ bin/mminfo
 %%PYTHON_SITELIBDIR%%/mmpython/misc/xmlinfo.py
 %%PYTHON_SITELIBDIR%%/mmpython/misc/xmlinfo.pyc
 %%PYTHON_SITELIBDIR%%/mmpython/misc/xmlinfo.pyo
+%%PYTHON_SITELIBDIR%%/mmpython/mpg_search.py
+%%PYTHON_SITELIBDIR%%/mmpython/mpg_search.pyc
+%%PYTHON_SITELIBDIR%%/mmpython/mpg_search.pyo
+%%PYTHON_SITELIBDIR%%/mmpython/stream_search.py
+%%PYTHON_SITELIBDIR%%/mmpython/stream_search.pyc
+%%PYTHON_SITELIBDIR%%/mmpython/stream_search.pyo
 %%PYTHON_SITELIBDIR%%/mmpython/synchronizedobject.py
 %%PYTHON_SITELIBDIR%%/mmpython/synchronizedobject.pyc
 %%PYTHON_SITELIBDIR%%/mmpython/synchronizedobject.pyo