[132818] trunk/dports/multimedia/HandBrake/Portfile

[larryv at macports.org]

Revision: 132818
          https://trac.macports.org/changeset/132818
Author:   larryv at macports.org
Date:     2015-02-11 01:03:06 -0800 (Wed, 11 Feb 2015)
Log Message:
-----------
HandBrake: Don't use python-1.0

The script that wraps configure.py can find and use an appropriate
Python interpreter; we just have to make sure one is installed. (I had
to use "(4|5|6|7)" because base currently rejects brackets in depspecs.)

Modified Paths:
--------------
    trunk/dports/multimedia/HandBrake/Portfile

Modified: trunk/dports/multimedia/HandBrake/Portfile
===================================================================
--- trunk/dports/multimedia/HandBrake/Portfile	2015-02-11 09:03:00 UTC (rev 132817)
+++ trunk/dports/multimedia/HandBrake/Portfile	2015-02-11 09:03:06 UTC (rev 132818)
@@ -2,7 +2,6 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           python 1.0
 
 name                HandBrake
 version             0.9.8
@@ -35,6 +34,7 @@
 depends_build       port:autoconf \
                     port:automake \
                     port:libtool \
+                   {bin:python2(\.(4|5|6|7))?:python27} \
                     port:yasm
 
 
@@ -138,19 +138,6 @@
                     x264-r2146-bcd41db.tar.gz:contrib
 
 
-variant python26 conflicts python27 description {Use Python 2.6} {
-    python.default_version 26
-}
-
-variant python27 conflicts python26 description {Use Python 2.7} {
-    python.default_version 27
-}
-
-if {![variant_isset python26] && ![variant_isset python27]} {
-    default_variants +python27
-}
-
-
 extract.only ${distname}${extract.suffix}
 post-extract {
     file mkdir ${worksrcpath}/download
@@ -183,13 +170,6 @@
     missing-delegate.patch
 
 
-# the Python PortGroup disables configure, we still want to use it, though
-use_configure       yes
-pre-configure {
-    # this needs to be set in a phase, since setting it without a phase will not
-    # give the correct python version selected by the variants
-    configure.cmd   ${python.bin} make/configure.py
-}
 configure.pre_args
 configure.args      --arch=${configure.build_arch} \
                     --curl=false \
@@ -197,7 +177,6 @@
                     --gcc=${configure.cc}
 
 
-build.cmd           [portbuild::build_getmaketype]
 build.dir           ${worksrcpath}/build
 build.target
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150211/680b47d7/attachment.html>