August 2011 - macports-changes - lists.macosforge.org

[81759] trunk/dports/x11/gtk-engines2/Portfile
by jmr＠macports.org 04 Aug '11

04 Aug '11

Revision: 81759 http://trac.macports.org/changeset/81759 Author: jmr(a)macports.org Date: 2011-08-04 11:03:49 -0700 (Thu, 04 Aug 2011) Log Message: ----------- gtk-engines2: add pkgconfig dep Modified Paths: -------------- trunk/dports/x11/gtk-engines2/Portfile Modified: trunk/dports/x11/gtk-engines2/Portfile =================================================================== --- trunk/dports/x11/gtk-engines2/Portfile 2011-08-04 18:02:16 UTC (rev 81758) +++ trunk/dports/x11/gtk-engines2/Portfile 2011-08-04 18:03:49 UTC (rev 81759) @@ -28,7 +28,8 @@ sha1 574c7577d70eaacecd2ffa14e288ef88fdcb6c2a \ rmd160 941b71cd2346a349d89f68962c2ce28e3520297c -depends_build port:intltool +depends_build port:intltool \ + port:pkgconfig depends_lib port:gtk2

1 0

[81758] trunk/dports/textproc/daisydiff/Portfile
by jmr＠macports.org 04 Aug '11

04 Aug '11

Revision: 81758 http://trac.macports.org/changeset/81758 Author: jmr(a)macports.org Date: 2011-08-04 11:02:16 -0700 (Thu, 04 Aug 2011) Log Message: ----------- daisydiff: fix case of LICENSE.txt Modified Paths: -------------- trunk/dports/textproc/daisydiff/Portfile Modified: trunk/dports/textproc/daisydiff/Portfile =================================================================== --- trunk/dports/textproc/daisydiff/Portfile 2011-08-04 18:00:25 UTC (rev 81757) +++ trunk/dports/textproc/daisydiff/Portfile 2011-08-04 18:02:16 UTC (rev 81758) @@ -56,7 +56,7 @@ set docdir ${destroot}${prefix}/share/doc/${name} xinstall -d ${docdir} xinstall -m 644 -W ${worksrcpath} \ - LICENSE.TXT \ + LICENSE.txt \ NOTICE.txt \ README.txt \ ${docdir}

1 0

[81757] branches/gsoc11-rev-upgrade/base/src/machista1.0
by cal＠macports.org 04 Aug '11

04 Aug '11

Revision: 81757 http://trac.macports.org/changeset/81757 Author: cal(a)macports.org Date: 2011-08-04 11:00:25 -0700 (Thu, 04 Aug 2011) Log Message: ----------- rev-upgrade: Add function to get the readable name from a cpu_type_t Modified Paths: -------------- branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.c branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.h branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.c =================================================================== --- branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.c 2011-08-04 17:59:17 UTC (rev 81756) +++ branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.c 2011-08-04 18:00:25 UTC (rev 81757) @@ -83,6 +83,14 @@ return result; } +const char *macho_get_arch_name (cpu_type_t cputype) { + const NXArchInfo *archInfo = NXGetArchInfoFromCpuType(cputype, CPU_SUBTYPE_MULTIPLE); + if (!archInfo) { + return NULL; + } + return archInfo->name; +} + /* Some byteswap wrappers */ static uint32_t macho_swap32 (uint32_t input) { return OSSwapInt32(input); Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.h =================================================================== --- branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.h 2011-08-04 17:59:17 UTC (rev 81756) +++ branches/gsoc11-rev-upgrade/base/src/machista1.0/libmachista.h 2011-08-04 18:00:25 UTC (rev 81757) @@ -111,6 +111,12 @@ char *macho_format_dylib_version(uint32_t version); /** + * Returns a readable version of any cpu_type_t constant. Returns a valid pointer to the first + * character in a 0-terminated string or NULL on error. The pointer must not be free()'d after use. + */ +const char *macho_get_arch_name(cpu_type_t cputype); + +/** * Parses the Mach-O file indicated by filepath and writes a pointer to a macho_t describing the * Mach-O file into the location idicated by res. Returns MACHO_SUCCESS on success or any of the * following error codes on error: Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i =================================================================== --- branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i 2011-08-04 17:59:17 UTC (rev 81756) +++ branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i 2011-08-04 18:00:25 UTC (rev 81757) @@ -151,3 +151,12 @@ %rename(format_dylib_version) macho_format_dylib_version; char *macho_format_dylib_version(uint32_t); +/** + * map macho_get_arch_name() + * The memory for the returned char * comes from NXGetArchInfoFromCpuType(), + * which is documentet in arch(3), without ever mentioning any memory issues. I + * assume it's static memory, that should not be free()'d. + */ +%rename(get_arch_name) macho_get_arch_name; +const char *macho_get_arch_name(cpu_type_t); + Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c =================================================================== --- branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c 2011-08-04 17:59:17 UTC (rev 81756) +++ branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c 2011-08-04 18:00:25 UTC (rev 81757) @@ -2292,7 +2292,31 @@ } +SWIGINTERN int +_wrap_get_arch_name(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { + cpu_type_t arg1 ; + int val1 ; + int ecode1 = 0 ; + char *result = 0 ; + + if (SWIG_GetArgs(interp, objc, objv,"o:machista::get_arch_name cpu_type_t ",(void *)0) == TCL_ERROR) SWIG_fail; + ecode1 = SWIG_AsVal_int SWIG_TCL_CALL_ARGS_2(objv[1], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "get_arch_name" "', argument " "1"" of type '" "cpu_type_t""'"); + } + arg1 = (cpu_type_t)(val1); + result = (char *)macho_get_arch_name(arg1); + Tcl_SetObjResult(interp,SWIG_FromCharPtr((const char *)result)); + { + free(result); + } + return TCL_OK; +fail: + return TCL_ERROR; +} + + static swig_command_info swig_commands[] = { { SWIG_prefix "macho_handle", (swig_wrapper_func) SWIG_ObjectConstructor, (ClientData)&_wrap_class_macho_handle}, { SWIG_prefix "macho_loadcmd_mlt_install_name_get", (swig_wrapper_func) _wrap_macho_loadcmd_mlt_install_name_get, NULL}, @@ -2316,6 +2340,7 @@ { SWIG_prefix "parse_file", (swig_wrapper_func) _wrap_parse_file, NULL}, { SWIG_prefix "strerror", (swig_wrapper_func) _wrap_strerror, NULL}, { SWIG_prefix "format_dylib_version", (swig_wrapper_func) _wrap_format_dylib_version, NULL}, + { SWIG_prefix "get_arch_name", (swig_wrapper_func) _wrap_get_arch_name, NULL}, {0, 0, 0} };

1 0

[81756] trunk/dports/editors/cssed/Portfile
by jmr＠macports.org 04 Aug '11

04 Aug '11

Revision: 81756 http://trac.macports.org/changeset/81756 Author: jmr(a)macports.org Date: 2011-08-04 10:59:17 -0700 (Thu, 04 Aug 2011) Log Message: ----------- cssed: add pkgconfig dep Modified Paths: -------------- trunk/dports/editors/cssed/Portfile Modified: trunk/dports/editors/cssed/Portfile =================================================================== --- trunk/dports/editors/cssed/Portfile 2011-08-04 17:49:31 UTC (rev 81755) +++ trunk/dports/editors/cssed/Portfile 2011-08-04 17:59:17 UTC (rev 81756) @@ -20,7 +20,7 @@ depends_lib port:gtk2 \ port:libxml2 -depends_build port:hicolor-icon-theme +depends_build port:hicolor-icon-theme \ + port:pkgconfig configure.args --mandir=${prefix}/share/man -

1 0

[81755] trunk/dports/security/libbswabe/Portfile
by jmr＠macports.org 04 Aug '11

04 Aug '11

Revision: 81755 http://trac.macports.org/changeset/81755 Author: jmr(a)macports.org Date: 2011-08-04 10:49:31 -0700 (Thu, 04 Aug 2011) Log Message: ----------- libbswabe: add pkgconfig dep Modified Paths: -------------- trunk/dports/security/libbswabe/Portfile Modified: trunk/dports/security/libbswabe/Portfile =================================================================== --- trunk/dports/security/libbswabe/Portfile 2011-08-04 17:48:47 UTC (rev 81754) +++ trunk/dports/security/libbswabe/Portfile 2011-08-04 17:49:31 UTC (rev 81755) @@ -32,6 +32,7 @@ checksums sha1 ed94479cde2cc0351487597be477ac7f87242727 \ rmd160 580b9c1550ea097cb89dd2059fd1b11ac964e127 +depends_build port:pkgconfig depends_lib port:pbc configure.args --with-pbc-include=${prefix}/include/pbc

1 0

[81754] branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
by cal＠macports.org 04 Aug '11

04 Aug '11

Revision: 81754 http://trac.macports.org/changeset/81754 Author: cal(a)macports.org Date: 2011-08-04 10:48:47 -0700 (Thu, 04 Aug 2011) Log Message: ----------- rev-upgrade: Handle macros in loadcommands, handle some broken ports (GitX installing precompiled binaries...) Modified Paths: -------------- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl Modified: branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-08-04 17:43:22 UTC (rev 81753) +++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-08-04 17:48:47 UTC (rev 81754) @@ -3807,7 +3807,7 @@ set i 1 foreach b $binaries { - ui_debug "Scanning binary $i of [llength $binaries]: [$b path]" + ui_debug "$i/[llength $binaries]: [$b path]" incr i set resultlist [machista::parse_file $handle [$b path]] @@ -3815,7 +3815,12 @@ set result [lindex $resultlist 1] if {$returncode != $machista::SUCCESS} { - ui_info "Error parsing file [$b path]: [machista::strerror $returncode]" + if {$returncode == $machista::EMAGIC} { + # not a Mach-O file + ui_debug "Error parsing file [$b path]: [machista::strerror $returncode]" + } else { + ui_warn "Error parsing file [$b path]: [machista::strerror $returncode]" + } continue; } @@ -3824,18 +3829,24 @@ set loadcommand [$architecture cget -mat_loadcmds] while {$loadcommand != "NULL"} { - set libresultlist [machista::parse_file $handle [$loadcommand cget -mlt_install_name]] + if {0 != [catch {set filepath [revupgrade_handle_special_paths [$b path] [$loadcommand cget -mlt_install_name]]}]} { + set loadcommand [$loadcommand cget -next] + continue; + } + + set libresultlist [machista::parse_file $handle $filepath] set libreturncode [lindex $libresultlist 0] set libresult [lindex $libresultlist 1] # if {[string first "/usr/" [$loadcommand cget -mlt_install_name]] == 0} { # # TODO: Filter whitelist - # ui_warn "File links against /usr/*: `[$b path]' links against `[$loadcommand cget -mlt_install_name]'" + # ui_warn "File links against /usr/*: [$b path] links against [$loadcommand cget -mlt_install_name]" # } if {$libreturncode != $machista::SUCCESS} { - ui_info "Could not open `[$loadcommand cget -mlt_install_name]': [machista::strerror $libreturncode]" + ui_warn "Could not open $filepath: [machista::strerror $libreturncode]" if {$libreturncode == $machista::EFILE} { + ui_debug "Marking [$b path] as broken" lappend broken_files [$b path] } set loadcommand [$loadcommand cget -next] @@ -3851,8 +3862,9 @@ } if {[$loadcommand cget -mlt_version] != [$libarchitecture cget -mat_version] && [$loadcommand cget -mlt_comp_version] != [$libarchitecture cget -mat_comp_version]} { - ui_info "Incompatible library version of file `[$loadcommand cget -mlt_install_name]': Expected [$loadcommand cget -mlt_comp_version], but got [$libarchitecture cget -mat_comp_version]" - lappend broken_files [$architecture cget -mat_install_name] + ui_warn "Incompatible library version of file [$loadcommand cget -mlt_install_name]: Expected [$loadcommand cget -mlt_comp_version], but got [$libarchitecture cget -mat_comp_version]" + ui_debug "Marking [$b path] as broken" + lappend broken_files [$b path] } set libarch_found true; @@ -3860,8 +3872,14 @@ } if {$libarch_found == false} { - ui_info "Missing architecture [$architecture cget -mat_arch] in file `[$loadcommand cget -mlt_install_name]'" - lappend broken_files [$architecture cget -mat_install_name] + ui_debug "Missing architecture [$architecture cget -mat_arch] in file $filepath" + if {[path_is_in_prefix $filepath]} { + ui_debug "Marking [$b path] as broken" + lappend broken_files [$b path] + } else { + ui_warn "Missing architecture [$architecture cget -mat_arch] in file outside prefix referenced from [$b path]" + ui_warn " How did you get that compiled anyway?" + } } set loadcommand [$loadcommand cget -next] } @@ -3881,7 +3899,7 @@ foreach file $broken_files { set port [registry::entry owner $file] if {$port == ""} { - ui_error "Broken file `$file' doesn't belong to any port." + ui_error "Broken file $file doesn't belong to any port." } lappend broken_ports $port } @@ -3987,6 +4005,44 @@ return 0; } +# Return whether a path is in the macports prefix +# Usage: path_is_in_prefix path_to_test +# Returns true if the path is in the prefix, false otherwise +proc path_is_in_prefix {path} { + return [string first $macports::prefix $path] == 0 || [string first $macports::applications_dir $path] == 0 +} + +# Function to replace macros in loadcommand paths with their proper values (which are usually determined at load time) +# Usage: revupgrade_handle_special_paths name_of_file path_from_loadcommand +# Returns the corrected path on success or an error in case of failure. +# Note that we can't reliably replace @executable_path, because it's only clear when executing a file where it was executed from. +# Replacing @rpath does not work yet, but it might be possible to get it working using the rpath attribute in the file containing the +# loadcommand +proc revupgrade_handle_special_paths {fname path} { + set corrected_path $path + + set loaderpath_idx [string first "@loader_path" $corrected_path] + if {$loaderpath_idx != -1} { + set corrected_path [string replace $corrected_path $loaderpath_idx $loaderpath_idx+11 [file dirname $fname]] + } + + set executablepath_idx [string first "@executable_path" $corrected_path] + if {$executablepath_idx != -1} { + ui_warn "Ignoring loadcommand containing @exectuable_path in $fname" + error "@exectuable_path in loadcommand" + } + + set rpath_idx [string first "@rpath" $corrected_path] + if {$rpath_idx != -1} { + ui_warn "Ignoring loadcommand containing @rpath in $fname" + error "@rpath in loadcommand" + } + + return $corrected_path +} + +# Recursively build the dependency graph between broken ports +# Usage: revupgrade_buildgraph start_port name_of_stack name_of_adjacency_list name_of_reverse_adjacency_list name_of_visited_map proc revupgrade_buildgraph {port stackname adjlistname revadjlistname visitedname} { upvar $stackname stack upvar $adjlistname adjlist

1 0

[81753] trunk/dports/gnome/gtksourceview/Portfile
by jmr＠macports.org 04 Aug '11

04 Aug '11

Revision: 81753 http://trac.macports.org/changeset/81753 Author: jmr(a)macports.org Date: 2011-08-04 10:43:22 -0700 (Thu, 04 Aug 2011) Log Message: ----------- gtksourceview: add pkgconfig dep Modified Paths: -------------- trunk/dports/gnome/gtksourceview/Portfile Modified: trunk/dports/gnome/gtksourceview/Portfile =================================================================== --- trunk/dports/gnome/gtksourceview/Portfile 2011-08-04 17:40:48 UTC (rev 81752) +++ trunk/dports/gnome/gtksourceview/Portfile 2011-08-04 17:43:22 UTC (rev 81753) @@ -25,7 +25,8 @@ sha1 4e61b6cda043c44dc918edecd2bd9ccfc5438d2c \ rmd160 978c59d5f99baeb5d8b9c3c14246ffc48ce150f8 -depends_build port:intltool +depends_build port:intltool \ + port:pkgconfig depends_lib port:gtk2 \ port:gnome-vfs \

1 0

[81752] trunk/dports/audio/libmad/Portfile
by jmr＠macports.org 04 Aug '11

04 Aug '11

Revision: 81752 http://trac.macports.org/changeset/81752 Author: jmr(a)macports.org Date: 2011-08-04 10:40:48 -0700 (Thu, 04 Aug 2011) Log Message: ----------- libmad: add missing automake dep Modified Paths: -------------- trunk/dports/audio/libmad/Portfile Modified: trunk/dports/audio/libmad/Portfile =================================================================== --- trunk/dports/audio/libmad/Portfile 2011-08-04 17:37:29 UTC (rev 81751) +++ trunk/dports/audio/libmad/Portfile 2011-08-04 17:40:48 UTC (rev 81752) @@ -23,6 +23,7 @@ depends_build port:pkgconfig \ port:libtool \ + port:automake \ port:autoconf post-extract {

1 0

[81751] trunk/dports/net/clusterit/Portfile
by jmr＠macports.org 04 Aug '11

04 Aug '11

Revision: 81751 http://trac.macports.org/changeset/81751 Author: jmr(a)macports.org Date: 2011-08-04 10:37:29 -0700 (Thu, 04 Aug 2011) Log Message: ----------- clusterit: add missing libX11 dependency Modified Paths: -------------- trunk/dports/net/clusterit/Portfile Modified: trunk/dports/net/clusterit/Portfile =================================================================== --- trunk/dports/net/clusterit/Portfile 2011-08-04 17:33:15 UTC (rev 81750) +++ trunk/dports/net/clusterit/Portfile 2011-08-04 17:37:29 UTC (rev 81751) @@ -18,6 +18,8 @@ rmd160 b08f7903bc90375e45a733ef843df3e9bf216bb7 platforms darwin +depends_lib port:xorg-libX11 + configure.cflags -I${prefix}/include configure.ldflags -L${prefix}/lib configure.args --mandir='\${prefix}/share/man' \

1 0

[81750] trunk/dports/devel/dbus/Portfile
by easieste＠macports.org 04 Aug '11

04 Aug '11

Revision: 81750 http://trac.macports.org/changeset/81750 Author: easieste(a)macports.org Date: 2011-08-04 10:33:15 -0700 (Thu, 04 Aug 2011) Log Message: ----------- Fix build for OS X Lion. Modified Paths: -------------- trunk/dports/devel/dbus/Portfile Modified: trunk/dports/devel/dbus/Portfile =================================================================== --- trunk/dports/devel/dbus/Portfile 2011-08-04 17:32:37 UTC (rev 81749) +++ trunk/dports/devel/dbus/Portfile 2011-08-04 17:33:15 UTC (rev 81750) @@ -61,6 +61,11 @@ } } +platform darwin 11 { + configure.args-append --disable-tests +} + + use_parallel_build yes test.run yes

1 0