[72572] trunk/dports/python
michaelld at macports.org
michaelld at macports.org
Thu Oct 21 05:15:34 PDT 2010
Revision: 72572
http://trac.macports.org/changeset/72572
Author: michaelld at macports.org
Date: 2010-10-21 05:15:31 -0700 (Thu, 21 Oct 2010)
Log Message:
-----------
Changes to use qt4 portgroup.
Adding myself as joint openmaintainer of py26 and py27 versions.
Modified Paths:
--------------
trunk/dports/python/py-pyqt4/Portfile
trunk/dports/python/py25-pyqt4/Portfile
trunk/dports/python/py26-pyqt4/Portfile
trunk/dports/python/py27-pyqt4/Portfile
trunk/dports/python/py31-pyqt4/Portfile
Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile 2010-10-21 12:13:18 UTC (rev 72571)
+++ trunk/dports/python/py-pyqt4/Portfile 2010-10-21 12:15:31 UTC (rev 72572)
@@ -2,9 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
name py-pyqt4
version 4.7.7
+revision 1
platforms macosx
categories python devel
maintainers gmail.com:tim.stoop
@@ -23,14 +25,12 @@
sha1 e07f851b54fa5cf6ec3e146f07b1c234c5069ca3 \
rmd160 fe1a01ce93a012224a4c590b56dc3bfa8fcdbe74
-depends_lib port:py-sip port:qt4-mac
+depends_lib-append port:py-sip
#patchfiles patch-configure.py
-set qt_dir ${prefix}/libexec/qt4-mac
-
pre-configure {
- file copy -force ${qt_dir}/mkspecs/macx-g++/qmake.conf \
+ file copy -force ${qt_mkspecs_dir}/macx-g++/qmake.conf \
${worksrcpath}/qmake.conf
reinplace "s|-bundle|-bundle -flat_namespace -undefined suppress|" \
@@ -38,7 +38,7 @@
}
configure.cmd "${prefix}/bin/python2.4 configure.py \
- -g -q ${qt_dir}/bin/qmake \
+ -g -q ${qt_qmake_cmd} \
--confirm-license"
configure.pre_args
configure.post_args LFLAGS="-F${prefix}/Library/Frameworks -L${prefix}/lib"
Modified: trunk/dports/python/py25-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py25-pyqt4/Portfile 2010-10-21 12:13:18 UTC (rev 72571)
+++ trunk/dports/python/py25-pyqt4/Portfile 2010-10-21 12:15:31 UTC (rev 72572)
@@ -2,9 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
name py25-pyqt4
version 4.7.7
+revision 1
categories python devel
platforms macosx
maintainers nomaintainer
@@ -24,10 +26,9 @@
sha1 e07f851b54fa5cf6ec3e146f07b1c234c5069ca3 \
rmd160 fe1a01ce93a012224a4c590b56dc3bfa8fcdbe74
-depends_lib port:py25-sip port:qt4-mac
+depends_lib-append port:py25-sip
set pyversion 2.5
-set qt_dir ${prefix}/libexec/qt4-mac
# The patch file alters configure.py so that the qtdesigner plugin can link.
# - it ensures that both LFLAGS are included and that the relevant version framework is linked
@@ -37,7 +38,7 @@
}
pre-configure {
- file copy -force ${qt_dir}/mkspecs/macx-g++/qmake.conf \
+ file copy -force ${qt_mkspecs_dir}/macx-g++/qmake.conf \
${worksrcpath}/qmake.conf
reinplace "s|-bundle|-bundle -flat_namespace -undefined suppress|" \
@@ -45,7 +46,7 @@
}
configure.cmd "${prefix}/bin/python2.5 configure.py \
- -g -q ${qt_dir}/bin/qmake \
+ -g -q ${qt_qmake_cmd} \
--confirm-license"
configure.pre_args
configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib"
@@ -76,7 +77,7 @@
# Cures an isolated case
system "cd ${worksrcpath}/designer && \
- ${qt_dir}/bin/qmake -spec ${qt_dir}/mkspecs/macx-g++ -macx \
+ ${qt_qmake_cmd} -spec ${qt_mkspecs_dir}/macx-g++ -macx \
-o Makefile python.pro"
}
}
Modified: trunk/dports/python/py26-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py26-pyqt4/Portfile 2010-10-21 12:13:18 UTC (rev 72571)
+++ trunk/dports/python/py26-pyqt4/Portfile 2010-10-21 12:15:31 UTC (rev 72572)
@@ -2,12 +2,14 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
name py26-pyqt4
version 4.7.7
+revision 1
categories python devel
platforms macosx
-maintainers nomaintainer
+maintainers michaelld openmaintainer
description PyQt4 is a set of Python bindings for the Qt4 toolkit
long_description \
PyQt4 is a set of Python bindings for the Qt4 toolkit. The \
@@ -24,10 +26,9 @@
sha1 e07f851b54fa5cf6ec3e146f07b1c234c5069ca3 \
rmd160 fe1a01ce93a012224a4c590b56dc3bfa8fcdbe74
-depends_lib port:py26-sip port:qt4-mac
+depends_lib-append port:py26-sip
set pyversion 2.6
-set qt_dir ${prefix}/libexec/qt4-mac
# The patch file alters configure.py so that the qtdesigner plugin can link.
# - it ensures that both LFLAGS are included and that the relevant version framework is linked
@@ -37,7 +38,7 @@
}
pre-configure {
- file copy -force ${qt_dir}/mkspecs/macx-g++/qmake.conf \
+ file copy -force ${qt_mkspecs_dir}/macx-g++/qmake.conf \
${worksrcpath}/qmake.conf
reinplace "s|-bundle|-bundle -flat_namespace -undefined suppress|" \
@@ -45,7 +46,7 @@
}
configure.cmd "${prefix}/bin/python2.6 configure.py \
- -q ${qt_dir}/bin/qmake \
+ -q ${qt_qmake_cmd} \
--confirm-license"
configure.pre_args
configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib"
@@ -76,7 +77,7 @@
# Cures an isolated case
system "cd ${worksrcpath}/designer && \
- ${qt_dir}/bin/qmake -spec ${qt_dir}/mkspecs/macx-g++ -macx \
+ ${qt_qmake_cmd} -spec ${qt_mkspecs_dir}/macx-g++ -macx \
-o Makefile python.pro"
}
}
Modified: trunk/dports/python/py27-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py27-pyqt4/Portfile 2010-10-21 12:13:18 UTC (rev 72571)
+++ trunk/dports/python/py27-pyqt4/Portfile 2010-10-21 12:15:31 UTC (rev 72572)
@@ -2,12 +2,14 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
name py27-pyqt4
version 4.7.7
+revision 1
categories python devel
platforms macosx
-maintainers nomaintainer
+maintainers michaelld openmaintainer
description PyQt4 is a set of Python bindings for the Qt4 toolkit
long_description \
PyQt4 is a set of Python bindings for the Qt4 toolkit. The \
@@ -24,10 +26,9 @@
sha1 e07f851b54fa5cf6ec3e146f07b1c234c5069ca3 \
rmd160 fe1a01ce93a012224a4c590b56dc3bfa8fcdbe74
-depends_lib port:py27-sip port:qt4-mac
+depends_lib-append port:py27-sip
set pyversion 2.7
-set qt_dir ${prefix}/libexec/qt4-mac
# The patch file alters configure.py so that the qtdesigner plugin can link.
# - it ensures that both LFLAGS are included and that the relevant version framework is linked
@@ -37,7 +38,7 @@
}
pre-configure {
- file copy -force ${qt_dir}/mkspecs/macx-g++/qmake.conf \
+ file copy -force ${qt_mkspecs_dir}/macx-g++/qmake.conf \
${worksrcpath}/qmake.conf
reinplace "s|-bundle|-bundle -flat_namespace -undefined suppress|" \
@@ -45,7 +46,7 @@
}
configure.cmd "${prefix}/bin/python2.7 configure.py \
- -q ${qt_dir}/bin/qmake \
+ -q ${qt_qmake_cmd} \
--confirm-license"
configure.pre_args
configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib"
@@ -76,7 +77,7 @@
# Cures an isolated case
system "cd ${worksrcpath}/designer && \
- ${qt_dir}/bin/qmake -spec ${qt_dir}/mkspecs/macx-g++ -macx \
+ ${qt_qmake_cmd} -spec ${qt_mkspecs_dir}/macx-g++ -macx \
-o Makefile python.pro"
}
}
Modified: trunk/dports/python/py31-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py31-pyqt4/Portfile 2010-10-21 12:13:18 UTC (rev 72571)
+++ trunk/dports/python/py31-pyqt4/Portfile 2010-10-21 12:15:31 UTC (rev 72572)
@@ -2,9 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup qt4 1.0
name py31-pyqt4
version 4.7.7
+revision 1
categories python devel
platforms macosx
maintainers nomaintainer
@@ -24,10 +26,9 @@
sha1 e07f851b54fa5cf6ec3e146f07b1c234c5069ca3 \
rmd160 fe1a01ce93a012224a4c590b56dc3bfa8fcdbe74
-depends_lib port:py31-sip port:qt4-mac
+depends_lib-append port:py31-sip
set pyversion 3.1
-set qt_dir ${prefix}/libexec/qt4-mac
# The patch file alters configure.py so that the qtdesigner plugin can link.
# - it ensures that both LFLAGS are included and that the relevant version framework is linked
@@ -37,7 +38,7 @@
}
pre-configure {
- file copy -force ${qt_dir}/mkspecs/macx-g++/qmake.conf \
+ file copy -force ${qt_mkspecs_dir}/macx-g++/qmake.conf \
${worksrcpath}/qmake.conf
reinplace "s|-bundle|-bundle -flat_namespace -undefined suppress|" \
@@ -45,7 +46,7 @@
}
configure.cmd "${prefix}/bin/python${pyversion} configure.py \
- -q ${qt_dir}/bin/qmake \
+ -q ${qt_qmake_cmd} \
--confirm-license"
configure.pre_args
configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib"
@@ -76,7 +77,7 @@
# Cures an isolated case
system "cd ${worksrcpath}/designer && \
- ${qt_dir}/bin/qmake -spec ${qt_dir}/mkspecs/macx-g++ -macx \
+ ${qt_qmake_cmd} -spec ${qt_mkspecs_dir}/macx-g++ -macx \
-o Makefile python.pro"
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101021/52d5f061/attachment.html>
More information about the macports-changes
mailing list