Revision: 105683 https://trac.macports.org/changeset/105683 Author: jmr@macports.org Date: 2013-05-01 15:21:55 -0700 (Wed, 01 May 2013) Log Message: ----------- change warnings in deprecated python portgroups to errors Modified Paths: -------------- trunk/dports/_resources/port1.0/group/python24-1.0.tcl trunk/dports/_resources/port1.0/group/python31-1.0.tcl trunk/dports/_resources/port1.0/group/python32-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/python24-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/python24-1.0.tcl 2013-05-01 22:09:02 UTC (rev 105682) +++ trunk/dports/_resources/port1.0/group/python24-1.0.tcl 2013-05-01 22:21:55 UTC (rev 105683) @@ -32,14 +32,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# This PortGroup is DEPRECATED. Please do not use for new development. -# Please switch existing ports using this to 'PortGroup python 1.0' (which -# supports multiple python versions) at your earliest convenience. - -pre-archivefetch { - ui_warn "The $name port is using the deprecated 'python24'\ -PortGroup, which will be disabled in the near future and eventually removed.\ -The maintainer should switch to the 'python' PortGroup." +pre-fetch { + ui_error "The $name port is using the obsolete 'python24'\ +PortGroup. The maintainer should switch to the 'python' PortGroup." + error "obsolete PortGroup" } set python.branch 2.4 @@ -58,8 +54,6 @@ dist_subdir python -depends_lib port:python24 - # we want the default universal variant added despite not using configure use_configure no universal_variant yes @@ -68,28 +62,6 @@ build.target build options python.add_archflags default python.add_archflags yes -pre-build { - if {${python.add_archflags}} { - if {[variant_exists universal] && [variant_isset universal]} { - build.env-append CFLAGS="${configure.universal_cflags}" \ - OBJCFLAGS="${configure.universal_cflags}" \ - CXXFLAGS="${configure.universal_cxxflags}" \ - LDFLAGS="${configure.universal_ldflags}" - } else { - build.env-append CFLAGS="${configure.cc_archflags}" \ - OBJCFLAGS="${configure.objc_archflags}" \ - CXXFLAGS="${configure.cxx_archflags}" \ - FFLAGS="${configure.f77_archflags}" \ - F90FLAGS="${configure.f90_archflags}" \ - FCFLAGS="${configure.fc_archflags}" \ - LDFLAGS="${configure.ld_archflags}" - } - } -} destroot.cmd ${python.bin} setup.py destroot.destdir --prefix=${prefix} --root=${destroot} - -pre-destroot { - xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/examples -} Modified: trunk/dports/_resources/port1.0/group/python31-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/python31-1.0.tcl 2013-05-01 22:09:02 UTC (rev 105682) +++ trunk/dports/_resources/port1.0/group/python31-1.0.tcl 2013-05-01 22:21:55 UTC (rev 105683) @@ -32,14 +32,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# This PortGroup is DEPRECATED. Please do not use for new development. -# Please switch existing ports using this to 'PortGroup python 1.0' (which -# supports multiple python versions) at your earliest convenience. - -pre-archivefetch { - ui_warn "The $name port is using the deprecated 'python31'\ -PortGroup, which will be disabled in the near future and eventually removed.\ -The maintainer should switch to the 'python' PortGroup." +pre-fetch { + ui_error "The $name port is using the obsolete 'python31'\ +PortGroup. The maintainer should switch to the 'python' PortGroup." + error "obsolete PortGroup" } set python.branch 3.1 @@ -54,8 +50,6 @@ dist_subdir python -depends_lib port:python31 - # we want the default universal variant added despite not using configure use_configure no universal_variant yes @@ -64,41 +58,10 @@ build.target build options python.add_archflags default python.add_archflags yes -pre-build { - if {${python.add_archflags}} { - if {[variant_exists universal] && [variant_isset universal]} { - build.env-append CFLAGS="${configure.universal_cflags}" \ - OBJCFLAGS="${configure.universal_cflags}" \ - CXXFLAGS="${configure.universal_cxxflags}" \ - LDFLAGS="${configure.universal_ldflags}" - } else { - build.env-append CFLAGS="${configure.cc_archflags}" \ - OBJCFLAGS="${configure.objc_archflags}" \ - CXXFLAGS="${configure.cxx_archflags}" \ - FFLAGS="${configure.f77_archflags}" \ - F90FLAGS="${configure.f90_archflags}" \ - FCFLAGS="${configure.fc_archflags}" \ - LDFLAGS="${configure.ld_archflags}" - } - } -} destroot.cmd ${python.bin} setup.py --no-user-cfg destroot.destdir --prefix=${python.prefix} --root=${destroot} -pre-destroot { - xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/examples -} - options python.link_binaries python.link_binaries_suffix default python.link_binaries yes default python.link_binaries_suffix {-${python.branch}} -post-destroot { - if {${python.link_binaries}} { - foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] { - if {[catch {file type "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"}]} { - ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}" - } - } - } -} Modified: trunk/dports/_resources/port1.0/group/python32-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/python32-1.0.tcl 2013-05-01 22:09:02 UTC (rev 105682) +++ trunk/dports/_resources/port1.0/group/python32-1.0.tcl 2013-05-01 22:21:55 UTC (rev 105683) @@ -32,14 +32,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# This PortGroup is DEPRECATED. Please do not use for new development. -# Please switch existing ports using this to 'PortGroup python 1.0' (which -# supports multiple python versions) at your earliest convenience. - -pre-archivefetch { - ui_warn "The $name port is using the deprecated 'python32'\ -PortGroup, which will be disabled in the near future and eventually removed.\ -The maintainer should switch to the 'python' PortGroup." +pre-fetch { + ui_error "The $name port is using the obsolete 'python32'\ +PortGroup. The maintainer should switch to the 'python' PortGroup." + error "obsolete PortGroup" } set python.branch 3.2 @@ -54,8 +50,6 @@ dist_subdir python -depends_lib port:python32 - # we want the default universal variant added despite not using configure use_configure no universal_variant yes @@ -64,41 +58,10 @@ build.target build options python.add_archflags default python.add_archflags yes -pre-build { - if {${python.add_archflags}} { - if {[variant_exists universal] && [variant_isset universal]} { - build.env-append CFLAGS="${configure.universal_cflags}" \ - OBJCFLAGS="${configure.universal_cflags}" \ - CXXFLAGS="${configure.universal_cxxflags}" \ - LDFLAGS="${configure.universal_ldflags}" - } else { - build.env-append CFLAGS="${configure.cc_archflags}" \ - OBJCFLAGS="${configure.objc_archflags}" \ - CXXFLAGS="${configure.cxx_archflags}" \ - FFLAGS="${configure.f77_archflags}" \ - F90FLAGS="${configure.f90_archflags}" \ - FCFLAGS="${configure.fc_archflags}" \ - LDFLAGS="${configure.ld_archflags}" - } - } -} destroot.cmd ${python.bin} setup.py --no-user-cfg destroot.destdir --prefix=${python.prefix} --root=${destroot} -pre-destroot { - xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/examples -} - options python.link_binaries python.link_binaries_suffix default python.link_binaries yes default python.link_binaries_suffix {-${python.branch}} -post-destroot { - if {${python.link_binaries}} { - foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] { - if {[catch {file type "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"}]} { - ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}" - } - } - } -}