January 2012 - macports-changes - lists.macosforge.org

[89429] trunk/base/ChangeLog
by raimue＠macports.org 28 Jan '12

28 Jan '12

Revision: 89429 http://trac.macports.org/changeset/89429 Author: raimue(a)macports.org Date: 2012-01-28 11:46:13 -0800 (Sat, 28 Jan 2012) Log Message: ----------- Update ChangeLog for subversion property checks in port lint Modified Paths: -------------- trunk/base/ChangeLog Modified: trunk/base/ChangeLog =================================================================== --- trunk/base/ChangeLog 2012-01-28 19:42:22 UTC (rev 89428) +++ trunk/base/ChangeLog 2012-01-28 19:46:13 UTC (rev 89429) @@ -5,6 +5,9 @@ Unreleased changes: + - port lint now checks for incorrect subversion properties on Portfile. + (raimue in r89428) + - port livecheck regex finds multiple matches on the same line (raimue in r88031)

1 0

[89428] trunk/base/src/port1.0/portlint.tcl
by raimue＠macports.org 28 Jan '12

28 Jan '12

Revision: 89428 http://trac.macports.org/changeset/89428 Author: raimue(a)macports.org Date: 2012-01-28 11:42:22 -0800 (Sat, 28 Jan 2012) Log Message: ----------- port1.0/portlint.tcl: Check for incorrect svn properties Modified Paths: -------------- trunk/base/src/port1.0/portlint.tcl Modified: trunk/base/src/port1.0/portlint.tcl =================================================================== --- trunk/base/src/port1.0/portlint.tcl 2012-01-28 19:05:43 UTC (rev 89427) +++ trunk/base/src/port1.0/portlint.tcl 2012-01-28 19:42:22 UTC (rev 89428) @@ -606,8 +606,35 @@ ui_debug "Version: $version" ui_debug "Revision: $revision" ui_debug "Archs: $portarch" + ################################################################### + set svn_cmd "" + catch {set svn_cmd [findBinary svn]} + if {$svn_cmd != "" && ([file exists $portpath/.svn] || ![catch {exec $svn_cmd info $portpath > /dev/null 2>@1}])} { + ui_debug "Checking svn properties" + if [catch {exec $svn_cmd propget svn:keywords $portfile 2>@1} output] { + ui_warn "Unable to check for svn:keywords property: $output" + } else { + ui_debug "Property svn:keywords is \"$output\", should be \"Id\"" + if {$output != "Id"} { + ui_error "Missing subversion property on Portfile, please execute: svn ps svn:keywords Id Portfile" + incr errors + } + } + if [catch {exec $svn_cmd propget svn:eol-style $portfile 2>@1} output] { + ui_warn "Unable to check for svn:eol-style property: $output" + } else { + ui_debug "Property svn:eol-style is \"$output\", should be \"native\"" + if {$output != "native"} { + ui_error "Missing subversion property on Portfile, please execute: svn ps svn:eol-tyle native Portfile" + incr errors + } + } + } + + ################################################################### + ui_notice "$UI_PREFIX [format [msgcat::mc "%d errors and %d warnings found."] $errors $warnings]" return {$errors > 0}

1 0

[89427] users/pixilla/dports
by pixilla＠macports.org 28 Jan '12

28 Jan '12

Revision: 89427 http://trac.macports.org/changeset/89427 Author: pixilla(a)macports.org Date: 2012-01-28 11:05:43 -0800 (Sat, 28 Jan 2012) Log Message: ----------- users/pixilla: - Simplify PortGroup as per Ryans suggestions. Added Paths: ----------- users/pixilla/dports/_resources/ users/pixilla/dports/_resources/port1.0/ users/pixilla/dports/_resources/port1.0/group/ users/pixilla/dports/_resources/port1.0/group/php5pear-1.0.tcl Added: users/pixilla/dports/_resources/port1.0/group/php5pear-1.0.tcl =================================================================== --- users/pixilla/dports/_resources/port1.0/group/php5pear-1.0.tcl (rev 0) +++ users/pixilla/dports/_resources/port1.0/group/php5pear-1.0.tcl 2012-01-28 19:05:43 UTC (rev 89427) @@ -0,0 +1,242 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: php5pear-1.0.tcl 87321 2011-11-17 02:10:46Z pixilla(a)macports.org $ +# +# Copyright (c) 2011 The MacPorts Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of The MacPorts Project nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# This PortGroup automatically sets up the standard environment for installing +# a PHP PEAR class. +# +# Usage: +# +# PortGroup php5pear 1.0 +# php5pear.setup package version channel +# +# where package is the name of the PEAR package (e.g. AUTH), version is its +# version, and channel is the channel hosting the package (default: pear.php.net) +# + +# Args placed before the php or pear commands. +options php5pear.env +default php5pear.env { + "TZ=UTC \ + HOME=${php5pear.installer} \ + PHP_PEAR_INSTALL_DIR=${php5pear.installer}/pear \ + PHP_PEAR_BIN_DIR=${php5pear.installer}/bin \ + PHP_PEAR_PHP_BIN=${php5pear.cmd-php} \ + PHP_PEAR_CFG_DIR=${php5pear.installer}/pear/cfg \ + PHP_PEAR_DOC_DIR=${php5pear.installer}/pear/docs \ + PHP_PEAR_DATA_DIR=${php5pear.installer}/pear/data \ + PHP_PEAR_WWW_DIR=${php5pear.installer}/pear/www \ + PHP_PEAR_TEST_DIR=${php5pear.installer}/pear/tests \ + PHP_PEAR_SYSCONF_DIR=${php5pear.installer}" +} + +# Args placed after php or pear commands. +options php5pear.configure.pre_args +default php5pear.configure.pre_args { + "-c ${php5pear.installer}/pear.conf \ + -C ${php5pear.installer}/pear.conf" +} + +# Where we instruct pear to install our package. +options php5pear.destroot +default php5pear.destroot {${worksrcpath}/packagingroot} + +# Where the pear installer is installed for each port. +options php5pear.installer +default php5pear.installer {${worksrcpath}/installer} + +# Where we expand our source files. +options php5pear.sourceroot +default php5pear.sourceroot {${worksrcpath}/packagesource} + +# The base paths for our pear.conf. +options php5pear.instpath +default php5pear.instpath {${prefix}/lib/php} +options php5pear.pearpath +default php5pear.pearpath {${php5pear.instpath}/pear} + +# The pear command we will use. +options php5pear.cmd-pear +default php5pear.cmd-pear {${php5pear.installer}/bin/pear} + +# The phar file that contains our pear installer. +options php5pear.cmd-phar +default php5pear.cmd-phar {${prefix}/lib/php/pear/install-pear-nozlib.phar} + +# The php binary we will use. +options php5pear.cmd-php +default php5pear.cmd-php {${prefix}/bin/php} + +# The pear channel for our package. +options php5pear.channel + +# The name of the package xml file inside the pear package archive. +options php5pear.packagexml +default php5pear.packagexml {[lindex [exec tar -tzf ${php5pear.packagefile} | grep package.*\.xml] 0]} + +# Package name. +options php5pear.package + +# Package file. +options php5pear.packagefile +default php5pear.packagefile {"${distpath}/[lindex $distfiles 0]"} + +proc php5pear.setup {package_name package_version {package_channel "pear.php.net"}} { + global name extract.suffix version + global php5pear.env php5pear.cmd-pear php5pear.destroot php5pear.sourceroot + global php5pear.channel php5pear.package php5pear.packagexml + + # The pear name for the package. + php5pear.package ${package_name} + # The pear channel for the package. + php5pear.channel ${package_channel} + + name pear-${php5pear.package} + version ${package_version} + categories php + distname ${php5pear.package}-${version} + extract.suffix .tgz + homepage http://${php5pear.channel}/package/${php5pear.package} + master_sites http://${php5pear.channel}/get + dist_subdir pear + supported_archs noarch + use_parallel_build yes + depends_lib path:bin/phpize:php5 port:php5-pear + + # List of ports that pear-PEAR depends on. + # Add some pear-PEAR deps to make programmatic creation of pear Portfiles easier. + if { + ${name} != "pear-Archive_Tar" && + ${name} != "pear-Console_Getopt" && + ${name} != "pear-Structures_Graph" && + ${name} != "pear-XML_Util" && + ${name} != "pear-PEAR" + } { + depends_lib-append port:pear-PEAR + } elseif { + ${name} == "pear-PEAR" + } { + depends_lib-append port:pear-Archive_Tar \ + port:pear-Console_Getopt \ + port:pear-Structures_Graph \ + port:pear-XML_Util + + } + + extract.post_args-append -C '${php5pear.sourceroot}' --strip-components 1 + + pre-extract { + xinstall -d "${php5pear.sourceroot}" + } + + post-extract { + # The "--strip-components 1" causes the loss of our package file so we will extract it now. + extract.post_args-delete --strip-components 1 + extract.post_args-append ${php5pear.packagexml} + command_exec extract + } + + post-patch { + # Some ports use a "." baseinstalldir which can cause issues creating pears packagingroot directory. + reinplace "s|baseinstalldir=\"\.\"|baseinstalldir=\"/\"|g" \ + ${php5pear.sourceroot}/${php5pear.packagexml} + } + + configure.env ${php5pear.env} + configure.dir ${php5pear.sourceroot} + configure { + # Install the pear command using the phar file. + configure.cmd ${php5pear.cmd-php} + configure.pre_args ${php5pear.cmd-phar} + command_exec configure + configure.cmd ${php5pear.cmd-pear} + configure.pre_args -c ${php5pear.installer}/pear.conf \ + -C ${php5pear.installer}/pear.conf + # Set up pear's conf file. + # The order appears to be important; we get errors if we set php_dir before adding channels + # and the directory is not writable. + xinstall -d "${php5pear.installer}/pear/php" + set pear_config [list] + lappend pear_config "config-set auto_discover 1" + if { "${php5pear.channel}" != "pear.php.net" } { + lappend pear_config "channel-discover ${php5pear.channel}" + lappend pear_config "config-set default_channel ${php5pear.channel}" + } + # Change the install directories to the final destinations + lappend pear_config "config-set php_dir ${php5pear.pearpath}" + lappend pear_config "config-set bin_dir ${php5pear.pearpath}/bin" + lappend pear_config "config-set cfg_dir ${php5pear.pearpath}/cfg" + lappend pear_config "config-set doc_dir ${php5pear.pearpath}/docs" + lappend pear_config "config-set data_dir ${php5pear.pearpath}/data" + lappend pear_config "config-set www_dir ${php5pear.pearpath}/www" + lappend pear_config "config-set test_dir ${php5pear.pearpath}/tests" + lappend pear_config "config-show" + foreach pear_args $pear_config { + configure.args "${pear_args}" + command_exec configure + } + } + + build { + build.env ${php5pear.env} + build.dir ${php5pear.sourceroot} + build.cmd ${php5pear.cmd-pear} + build.target install + build.args "-n -f -P '${php5pear.destroot}' ${php5pear.packagexml}" + command_exec build + } + + destroot { + copy ${php5pear.destroot}${php5pear.instpath} ${destroot}${prefix}/lib + # Remove all invisible "dot" files. + fs-traverse -ignoreErrors item "${destroot}${php5pear.instpath}" { + if {[string first . [file tail ${item}] 0] == 0} { + if {[file tail ${item}] != "." && [file tail ${item}] != ".."} { + puts "Removing dot file ${item}" + delete ${item} + } + } + } + if { [file exists "${destroot}${php5pear.pearpath}/generate_package_xml.php"] } { + # Some pear packages contain package creation files so we remove them. + delete "${destroot}${php5pear.pearpath}/generate_package_xml.php" + } + if { [file exists "${destroot}${php5pear.pearpath}/package.php"] } { + # Some pear packages contain package creation files so we remove them. + delete "${destroot}${php5pear.pearpath}/package.php" + } + } + + livecheck.type regex + livecheck.url http://${php5pear.channel}/package/${php5pear.package}/download + livecheck.regex http://download.${php5pear.channel}/package/ + livecheck.regex-append "${php5pear.package}-((?!\\${extract.suffix}).*)\\${extract.suffix}" +}

1 0

[89426] trunk/dports/security
by cal＠macports.org 28 Jan '12

28 Jan '12

Revision: 89426 http://trac.macports.org/changeset/89426 Author: cal(a)macports.org Date: 2012-01-28 10:51:31 -0800 (Sat, 28 Jan 2012) Log Message: ----------- Set svn:keywords and svn:eol-style Property Changed: ---------------- trunk/dports/security/yubico-c-client/Portfile trunk/dports/security/yubico-pam/Portfile Property changes on: trunk/dports/security/yubico-c-client/Portfile ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/dports/security/yubico-pam/Portfile ___________________________________________________________________ Added: svn:eol-style + native

1 0

[89425] trunk/dports/java/android/Portfile
by krischik＠macports.org 28 Jan '12

28 Jan '12

Revision: 89425 http://trac.macports.org/changeset/89425 Author: krischik(a)macports.org Date: 2012-01-28 10:35:35 -0800 (Sat, 28 Jan 2012) Log Message: ----------- Update to level 16, update one more icon for the launcher Modified Paths: -------------- trunk/dports/java/android/Portfile Modified: trunk/dports/java/android/Portfile =================================================================== --- trunk/dports/java/android/Portfile 2012-01-28 18:26:05 UTC (rev 89424) +++ trunk/dports/java/android/Portfile 2012-01-28 18:35:35 UTC (rev 89425) @@ -5,7 +5,7 @@ PortSystem 1.0 name android -version 14 +version 16 categories java devel emulators maintainers openmaintainer krischik platforms darwin @@ -13,7 +13,7 @@ long_description \ The Android SDK allows development for the Android mobile platform. -set patchversion 86202 +set patchversion 89422 set appbundles ${name}-appbundles-r${patchversion}.tar.gz set prog ${name}-sdk_r${version}-macosx.zip @@ -27,13 +27,13 @@ extract.only ${appbundles} checksums ${prog} \ - md5 812887018435382de8486f3bb26a5db4 \ - sha1 51a21a1045a69def46561bbf6759d67369362d90 \ - rmd160 d71f04888fb3f82b2bb86ed8e0f0983ccf41cc95 \ + md5 d1dc2b6f13eed5e3ce5cf26c4e4c47aa \ + sha1 0fd359309216d51c25360239453dbc4c20fa6f16 \ + rmd160 0087034908b39c6b3bbd850bd84da420f0d3613c \ ${appbundles} \ - md5 297ca0750c6cea42dd238063d15ae374 \ - sha1 4fb441d14c0a019ac1fe8428c1ddbafa8392c1d6 \ - rmd160 6d6b3086a2499bd675489aa816dcbb1e6216a177 + md5 258e33cd11898101d2e16212d3ff6967 \ + sha1 2ffb150e043209dbb6899b319fe5638fd90d1205 \ + rmd160 1cc76750f6493468ea5ced714990b577314445f7 use_configure no build.cmd true

1 0

[89424] distfiles/android/android-appbundles-r89422.tar.gz
by krischik＠macports.org 28 Jan '12

28 Jan '12

Revision: 89424 http://trac.macports.org/changeset/89424 Author: krischik(a)macports.org Date: 2012-01-28 10:26:05 -0800 (Sat, 28 Jan 2012) Log Message: ----------- Add distfile for android Added Paths: ----------- distfiles/android/android-appbundles-r89422.tar.gz Added: distfiles/android/android-appbundles-r89422.tar.gz =================================================================== (Binary files differ) Property changes on: distfiles/android/android-appbundles-r89422.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/x-gzip

1 0

[89423] users/krischik/android/Upload.command
by krischik＠macports.org 28 Jan '12

28 Jan '12

Revision: 89423 http://trac.macports.org/changeset/89423 Author: krischik(a)macports.org Date: 2012-01-28 10:25:47 -0800 (Sat, 28 Jan 2012) Log Message: ----------- New Startup bundles for android. Modified Paths: -------------- users/krischik/android/Upload.command Modified: users/krischik/android/Upload.command =================================================================== --- users/krischik/android/Upload.command 2012-01-28 18:24:46 UTC (rev 89422) +++ users/krischik/android/Upload.command 2012-01-28 18:25:47 UTC (rev 89423) @@ -15,6 +15,7 @@ alias mv=/opt/local/bin/gmv alias rm=/opt/local/bin/grm +alias svn=/opt/local/bin/svn pushd "/Work/MacPorts/krischik/android" svn commit -m"New Startup bundles for android."

1 0

[89422] users/krischik/android
by krischik＠macports.org 28 Jan '12

28 Jan '12

Revision: 89422 http://trac.macports.org/changeset/89422 Author: krischik(a)macports.org Date: 2012-01-28 10:24:46 -0800 (Sat, 28 Jan 2012) Log Message: ----------- another icon found. Modified Paths: -------------- users/krischik/android/appbundles/Android-Manager.app/Contents/Resources/Icon.icns Added Paths: ----------- users/krischik/android/Pictures/android_icon_128.icns users/krischik/android/Pictures/android_icon_128.png Added: users/krischik/android/Pictures/android_icon_128.icns =================================================================== (Binary files differ) Property changes on: users/krischik/android/Pictures/android_icon_128.icns ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: users/krischik/android/Pictures/android_icon_128.png =================================================================== (Binary files differ) Property changes on: users/krischik/android/Pictures/android_icon_128.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: users/krischik/android/appbundles/Android-Manager.app/Contents/Resources/Icon.icns =================================================================== (Binary files differ)

1 0

[89421] users/cal/ports/security/
by cal＠macports.org 28 Jan '12

28 Jan '12

Revision: 89421 http://trac.macports.org/changeset/89421 Author: cal(a)macports.org Date: 2012-01-28 10:19:06 -0800 (Sat, 28 Jan 2012) Log Message: ----------- Remove empty directory Removed Paths: ------------- users/cal/ports/security/

1 0

[89420]
by cal＠macports.org 28 Jan '12

28 Jan '12

Revision: 89420 http://trac.macports.org/changeset/89420 Author: cal(a)macports.org Date: 2012-01-28 10:18:29 -0800 (Sat, 28 Jan 2012) Log Message: ----------- New port: yubico-pam Added Paths: ----------- trunk/dports/security/yubico-pam/ Removed Paths: ------------- users/cal/ports/security/yubico-pam/

1 0