[57279] trunk/dports/python/py25-pyqt4/Portfile

[macsforever2000 at macports.org]

Revision: 57279
          http://trac.macports.org/changeset/57279
Author:   macsforever2000 at macports.org
Date:     2009-09-08 08:24:19 -0700 (Tue, 08 Sep 2009)
Log Message:
-----------
Remove conflicting file with py25-pyqwt.

Modified Paths:
--------------
    trunk/dports/python/py25-pyqt4/Portfile

Modified: trunk/dports/python/py25-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py25-pyqt4/Portfile	2009-09-08 15:23:39 UTC (rev 57278)
+++ trunk/dports/python/py25-pyqt4/Portfile	2009-09-08 15:24:19 UTC (rev 57279)
@@ -4,6 +4,7 @@
 
 name		py25-pyqt4
 version		4.5.4
+revision    1
 platforms	macosx
 categories	python devel
 maintainers     saispo openmaintainer
@@ -55,6 +56,9 @@
 		LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT NEWS README \
 		THANKS \
 		${destroot}${prefix}/share/doc/${name}
+	# Remove conflict with qwt52 port. This should be removed from pyqt4 in the next version 
+	# after 4.5.4, so this line will not be necessary. 
+	delete ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/PyQt4/uic/widget-plugins/qwt.py
 
     # Workaround for python25 framework bug (#16334)
 	move ${destroot}${frameworks_dir}/Python.framework/Versions/2.5/lib/python2.5 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090908/5ee5acf4/attachment.html>