[101894] trunk/dports/python

[jmr at macports.org]

Revision: 101894
          https://trac.macports.org/changeset/101894
Author:   jmr at macports.org
Date:     2013-01-20 22:17:24 -0800 (Sun, 20 Jan 2013)
Log Message:
-----------
py*-id3lib: unify

Modified Paths:
--------------
    trunk/dports/python/py-id3lib/Portfile
    trunk/dports/python/py-id3lib/files/patch-setup.py.diff

Added Paths:
-----------
    trunk/dports/python/py-id3lib/files/patch-pyid3lib.py.diff

Removed Paths:
-------------
    trunk/dports/python/py25-id3lib/
    trunk/dports/python/py26-id3lib/
    trunk/dports/python/py27-id3lib/

Modified: trunk/dports/python/py-id3lib/Portfile
===================================================================
--- trunk/dports/python/py-id3lib/Portfile	2013-01-21 06:09:07 UTC (rev 101893)
+++ trunk/dports/python/py-id3lib/Portfile	2013-01-21 06:17:24 UTC (rev 101894)
@@ -1,14 +1,14 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup python24 1.0
+PortGroup python 1.0
 
 name			py-id3lib
 version			0.5.1
-revision		0
 categories		python audio
+license			LGPL-2.1
 platforms		darwin
-maintainers		liqui.org:rjkroege
+maintainers		liqui.org:rjkroege maubi.net:waterson openmaintainer
 description		Python module for reading and writing id3v2 tags
 long_description	${description}
 
@@ -17,7 +17,13 @@
 distname		pyid3lib-${version}
 checksums		md5 5fd37a7dda7c540f665ca5d428a28f5e
 
+python.versions	24 25 26 27
 
-depends_lib-append	lib:libid3:id3lib lib:libz:zlib
+if {$subport != $name} {
+    depends_lib-append	port:id3lib port:zlib
 
-patchfiles		patch-setup.py.diff
+    patchfiles		patch-setup.py.diff patch-pyid3lib.py.diff
+    post-patch {
+        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/setup.py
+    }
+}

Copied: trunk/dports/python/py-id3lib/files/patch-pyid3lib.py.diff (from rev 101882, trunk/dports/python/py27-id3lib/files/patch-pyid3lib.py.diff)
===================================================================
--- trunk/dports/python/py-id3lib/files/patch-pyid3lib.py.diff	                        (rev 0)
+++ trunk/dports/python/py-id3lib/files/patch-pyid3lib.py.diff	2013-01-21 06:17:24 UTC (rev 101894)
@@ -0,0 +1,30 @@
+--- pyid3lib.cc~	2003-02-16 15:50:20.000000000 -0800
++++ pyid3lib.cc	2008-03-21 14:27:32.000000000 -0700
+@@ -80,13 +80,13 @@
+ 
+ 
+ static PySequenceMethods tag_as_sequence = {
+-    (inquiry)id3_length,
++    (lenfunc)id3_length,
+     NULL,
+     NULL,
+-    (intargfunc)id3_item,
+-    (intintargfunc)id3_slice,
+-    (intobjargproc)id3_ass_item,
+-    (intintobjargproc)id3_ass_slice,
++    (ssizeargfunc)id3_item,
++    (ssizessizeargfunc)id3_slice,
++    (ssizeobjargproc)id3_ass_item,
++    (ssizessizeobjargproc)id3_ass_slice,
+     (objobjproc)id3_contains,
+     NULL,
+     NULL,
+@@ -824,7 +824,7 @@
+ static ID3_Frame* frame_from_dict( ID3_FrameID fid, PyObject* dict )
+ {
+     char* data;
+-    int size;
++    Py_ssize_t size;
+     
+     ID3_Field* field;
+     ID3_FieldID flid;

Modified: trunk/dports/python/py-id3lib/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-id3lib/files/patch-setup.py.diff	2013-01-21 06:09:07 UTC (rev 101893)
+++ trunk/dports/python/py-id3lib/files/patch-setup.py.diff	2013-01-21 06:17:24 UTC (rev 101894)
@@ -6,8 +6,8 @@
                                   ['pyid3lib.cc'],
 -                                 libraries=['stdc++','id3','z'] )]
 +                                 libraries=['stdc++','id3','z'],
-+                                 include_dirs = [ "/opt/local/include/" ],
-+                                 library_dirs=[ "/opt/local/lib/" ],  )]
++                                 include_dirs = [ "@@PREFIX@@/include/" ],
++                                 library_dirs=[ "@@PREFIX@@/lib/" ],  )]
         )
  
         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130120/fbbeff58/attachment-0001.html>