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

[70430] trunk/dports/graphics/opencv
by raphael＠macports.org 09 Aug '10

09 Aug '10

Revision: 70430 http://trac.macports.org/changeset/70430 Author: raphael(a)macports.org Date: 2010-08-09 10:00:44 -0700 (Mon, 09 Aug 2010) Log Message: ----------- opencv: maintainer timeout; closes #24503 * update to 2.1.0 * add modeline * use cmake portgroup * add missing dependencies * add universal variant * add python26 variant * add tbb variant * build and install examples * fix livecheck Modified Paths: -------------- trunk/dports/graphics/opencv/Portfile Added Paths: ----------- trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff Removed Paths: ------------- trunk/dports/graphics/opencv/files/patch-G4.diff Modified: trunk/dports/graphics/opencv/Portfile =================================================================== --- trunk/dports/graphics/opencv/Portfile 2010-08-09 16:47:25 UTC (rev 70429) +++ trunk/dports/graphics/opencv/Portfile 2010-08-09 17:00:44 UTC (rev 70430) @@ -1,10 +1,11 @@ +# -*- 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$ PortSystem 1.0 +PortGroup cmake 1.0 name opencv -version 2.0.0 -revision 1 +version 2.1.0 categories graphics science platforms darwin maintainers gmail.com:stante @@ -24,40 +25,68 @@ use_bzip2 yes distname OpenCV-${version} -checksums md5 ed27520514baacc5edad7b06ad24130e \ - sha1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 \ - rmd160 f46b993ded3d579dc52175131e5485476ac1f569 +checksums md5 1d71584fb4e04214c0085108f95e24c8 \ + sha1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 \ + rmd160 e31cdbd30e7925e3725f5957616ffc59c58db247 depends_build-append port:pkgconfig -depends_lib-append port:gtk2 port:zlib port:jpeg \ - port:libpng port:tiff path:lib/libavcodec.dylib:ffmpeg +depends_lib-append port:zlib \ + path:lib/libavcodec.dylib:ffmpeg \ + port:bzip2 \ + port:dirac \ + port:faac \ + port:faad2 \ + port:lame \ + port:schroedinger \ + port:liboil \ + port:libtheora \ + port:libvorbis \ + port:libogg \ + port:x264 \ + port:libdc1394 \ + port:orc -# ffmpeg is not universal. -# If universal support is to be added to opencv, careful consideration has -# to be given to the 64-bit issues with QuickTime and Carbon. -universal_variant no +patchfiles patch-CMakeLists.txt.diff +if {[variant_isset universal]} { + patchfiles-append patch-pch-CMakeLists.txt.diff +} -configure.args --without-python +post-patch { + if {[variant_isset python26]} { + reinplace "s|@@PYTHON_PKGD@@|${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages|g" ${worksrcpath}/CMakeLists.txt + } +} -switch ${build_arch} { - ppc64 - - x86_64 { - configure.args-append --without-quicktime \ - --without-carbon +configure.args-append -DBUILD_NEW_PYTHON_SUPPORT=OFF \ + -DBUILD_EXAMPLES=ON \ + -DINSTALL_C_EXAMPLES=ON \ + -DBZIP2_LIBRARIES=${prefix}/lib/libbz2.dylib + +# use macros in /usr/include/stdint.h with C++ compiler; see <https://roundup.ffmpeg.org/issue2093> +platform darwin { + if {${os.major} <= 9} { + configure.args-append -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS } - ppc { - patchfiles-append patch-G4.diff - } } -# For some reason the highgui module forgets to link against libavutil -configure.ldflags-append -lavutil +variant python26 description {Add Python 2.6 bindings} { + depends_lib-append port:python26 + configure.args-delete -DBUILD_NEW_PYTHON_SUPPORT=OFF + configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \ + -DPYTHON_LIBRARY=${prefix}/lib/libpython2.6.dylib \ + -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.6/Headers +} -post-destroot { - xinstall -m 644 ${worksrcpath}/cvconfig.h ${destroot}${prefix}/include/${name} +variant tbb description {Use Intel TBB} { + depends_lib-append port:tbb + configure.args-append -DWITH_TBB=ON \ + -DHAVE_TBB=ON \ + -DTBB_INCLUDE_DIRS=${prefix}/include \ + -DTBB_LIBRARY_DIRS=${prefix}/lib \ + -DOPENCV_LINKER_LIBS="-ltbb -ltbbmalloc" } livecheck.type regex livecheck.url http://sourceforge.net/projects/opencvlibrary/files/ -livecheck.regex {OpenCV-([0-9.]+)\.tar} +livecheck.regex "OpenCV-(\\d+(?:\\.\\d+)*)${extract.suffix}/download" Added: trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff (rev 0) +++ trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff 2010-08-09 17:00:44 UTC (rev 70430) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2010-04-13 17:51:01.000000000 +0400 ++++ CMakeLists.txt 2010-04-13 17:52:20.000000000 +0400 +@@ -468,7 +468,7 @@ + string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") + if(UNIX) + set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) ++ set(PYTHON_PACKAGES_PATH @@PYTHON_PKGD@@) + endif() + if(WIN32) + get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) Deleted: trunk/dports/graphics/opencv/files/patch-G4.diff =================================================================== --- trunk/dports/graphics/opencv/files/patch-G4.diff 2010-08-09 16:47:25 UTC (rev 70429) +++ trunk/dports/graphics/opencv/files/patch-G4.diff 2010-08-09 17:00:44 UTC (rev 70430) @@ -1,11 +0,0 @@ ---- work/OpenCV-2.0.0/configure.in.orig 2010-04-05 19:15:57.000000000 +0200 -+++ work/OpenCV-2.0.0/configure.in 2010-04-05 19:16:31.000000000 +0200 -@@ -310,7 +310,7 @@ - ;; - powerpc-apple-*) - # Mac OS X 10.4 runs on CPUs >= G4 only -- OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G4 -mpowerpc-gpopt -mtune=G5 -fsched-interblock -fgcse-sm -g" -+ OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G4 -fsched-interblock -fgcse-sm -g" - ;; - powerpc64-apple-*) - # There are no 64bit Macs with a CPU that's not a G5 Added: trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff =================================================================== --- trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff (rev 0) +++ trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff 2010-08-09 17:00:44 UTC (rev 70430) @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2010-06-08 16:23:51.000000000 +0400 ++++ CMakeLists.txt 2010-06-11 17:52:57.000000000 +0400 +@@ -195,7 +195,6 @@ + set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries") + endif() + +-include(OpenCVPCHSupport.cmake REQUIRED) + + if(UNIX) + include(OpenCVFindPkgConfig.cmake OPTIONAL)

1 0

[70429] trunk/dports/security/skipfish/Portfile
by snc＠macports.org 09 Aug '10

09 Aug '10

Revision: 70429 http://trac.macports.org/changeset/70429 Author: snc(a)macports.org Date: 2010-08-09 09:47:25 -0700 (Mon, 09 Aug 2010) Log Message: ----------- update version Modified Paths: -------------- trunk/dports/security/skipfish/Portfile Modified: trunk/dports/security/skipfish/Portfile =================================================================== --- trunk/dports/security/skipfish/Portfile 2010-08-09 16:45:52 UTC (rev 70428) +++ trunk/dports/security/skipfish/Portfile 2010-08-09 16:47:25 UTC (rev 70429) @@ -4,7 +4,7 @@ PortSystem 1.0 name skipfish -version 1.52b +version 1.55b license Apache-2.0 categories security maintainers snc openmaintainer @@ -19,8 +19,8 @@ master_sites googlecode extract.suffix .tgz -checksums sha1 9b09f1b4ac401252db8dc0cdc753de1126230c6d \ - rmd160 37196102f58e78287a213853526d1e7ba7a551f6 +checksums sha1 ebf07232623f0ae8300fffc2048dd192518788a1 \ + rmd160 e6f05ddb61513ed48109923c034fd9b8491aefc2 patchfiles patch-config.h.diff post-patch {

1 0

[70428] trunk/dports/python/py25-webkitgtk/Portfile
by snc＠macports.org 09 Aug '10

09 Aug '10

Revision: 70428 http://trac.macports.org/changeset/70428 Author: snc(a)macports.org Date: 2010-08-09 09:45:52 -0700 (Mon, 09 Aug 2010) Log Message: ----------- update version Modified Paths: -------------- trunk/dports/python/py25-webkitgtk/Portfile Modified: trunk/dports/python/py25-webkitgtk/Portfile =================================================================== --- trunk/dports/python/py25-webkitgtk/Portfile 2010-08-09 16:31:12 UTC (rev 70427) +++ trunk/dports/python/py25-webkitgtk/Portfile 2010-08-09 16:45:52 UTC (rev 70428) @@ -4,7 +4,7 @@ PortSystem 1.0 name py25-webkitgtk -version 1.1.7 +version 1.1.8 categories python www description Python bindings for thw WebKit GTK+ port long_description ${description} @@ -17,9 +17,8 @@ distname pywebkitgtk-${version} master_sites http://pywebkitgtk.googlecode.com/files/ -checksums md5 4dbe0111c0b0ad2280052e4534903a9b \ - sha1 e3416d9455fe7d9947b079c66f40008a01f80055 \ - rmd160 c8f1d838d13bee68eb0299adadfbd9d1355c3798 +checksums md5 158335385354ba38090c9324b37bf225 \ + sha1 74ff2222d9aa9af6ab0aa4279b28dd2b26f5824e livecheck.type regex livecheck.url ${homepage}

1 0

[70427] branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl
by and.damore＠macports.org 09 Aug '10

09 Aug '10

Revision: 70427 http://trac.macports.org/changeset/70427 Author: and.damore(a)macports.org Date: 2010-08-09 09:31:12 -0700 (Mon, 09 Aug 2010) Log Message: ----------- fix missing checksum in portinstall.tcl, this lead to segfault in entry.o Modified Paths: -------------- branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl Modified: branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl =================================================================== --- branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl 2010-08-09 12:25:19 UTC (rev 70426) +++ branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl 2010-08-09 16:31:12 UTC (rev 70427) @@ -203,7 +203,7 @@ lappend installPlistWithMD5 $file if {[catch {md5 file "$imagedir$file"} md5sum] == 0} { lappend installPlistWithMD5 $md5sum - } + } else { lappend installPlistWithMD5 _not_present} } #puts "installPlist:$installPlist" puts "installPlistWithMD5:$installPlistWithMD5"

1 0

[70426] trunk/dports/math/pspp-devel/Portfile
by snc＠macports.org 09 Aug '10

09 Aug '10

Revision: 70426 http://trac.macports.org/changeset/70426 Author: snc(a)macports.org Date: 2010-08-09 05:25:19 -0700 (Mon, 09 Aug 2010) Log Message: ----------- update version Modified Paths: -------------- trunk/dports/math/pspp-devel/Portfile Modified: trunk/dports/math/pspp-devel/Portfile =================================================================== --- trunk/dports/math/pspp-devel/Portfile 2010-08-09 12:00:48 UTC (rev 70425) +++ trunk/dports/math/pspp-devel/Portfile 2010-08-09 12:25:19 UTC (rev 70426) @@ -4,10 +4,10 @@ PortSystem 1.0 name pspp-devel -set buildstamp 20100725040501 -set buildhash g1d2139 +set buildstamp 20100809040503 +set buildhash g36ecb7 version 0.7.5 -revision 11 +revision 12 categories math license GPLv3+ maintainers snc @@ -37,8 +37,8 @@ port:libglade2 \ port:libtool -checksums sha1 e4a8a071ff6560943c4e3c4ea9491b256e73c6bd \ - rmd160 0482b0800edea13a7f9ac363d9cf63d414af6863 +checksums sha1 0610c2011a2d49b31e486a2982f0442beec3a046 \ + rmd160 d0ecb5d321f61850dc8ff5926280e36357740bc5 #configure.optflags -O0 #configure.cflags-append -g

1 0

[70425] trunk/dports/graphics/pngcrush/Portfile
by snc＠macports.org 09 Aug '10

09 Aug '10

Revision: 70425 http://trac.macports.org/changeset/70425 Author: snc(a)macports.org Date: 2010-08-09 05:00:48 -0700 (Mon, 09 Aug 2010) Log Message: ----------- update version Modified Paths: -------------- trunk/dports/graphics/pngcrush/Portfile Modified: trunk/dports/graphics/pngcrush/Portfile =================================================================== --- trunk/dports/graphics/pngcrush/Portfile 2010-08-09 11:57:12 UTC (rev 70424) +++ trunk/dports/graphics/pngcrush/Portfile 2010-08-09 12:00:48 UTC (rev 70425) @@ -4,7 +4,7 @@ PortSystem 1.0 name pngcrush -version 1.7.11 +version 1.7.12 categories graphics maintainers snc openmaintainer description optimizer for PNG files @@ -22,9 +22,8 @@ master_sites sourceforge:pmt use_bzip2 yes -checksums md5 8f033c547a428132fe273e1771b7624e \ - sha1 ce65a62e39fdfef38fa71e09e0da18abe0f030e5 \ - rmd160 c0dc68afdf5a844a0c5b6f9d7cb8aaf5a17cedf6 +checksums md5 16d2eab491a13c1bc32d763e3d21e85b \ + sha1 7abe2389150ff08a47467085990e7a89044d2a02 use_configure no

1 0

[70424] trunk/dports/devel/depot_tools/Portfile
by snc＠macports.org 09 Aug '10

09 Aug '10

Revision: 70424 http://trac.macports.org/changeset/70424 Author: snc(a)macports.org Date: 2010-08-09 04:57:12 -0700 (Mon, 09 Aug 2010) Log Message: ----------- update version Modified Paths: -------------- trunk/dports/devel/depot_tools/Portfile Modified: trunk/dports/devel/depot_tools/Portfile =================================================================== --- trunk/dports/devel/depot_tools/Portfile 2010-08-09 10:28:49 UTC (rev 70423) +++ trunk/dports/devel/depot_tools/Portfile 2010-08-09 11:57:12 UTC (rev 70424) @@ -4,7 +4,7 @@ PortSystem 1.0 name depot_tools -version 54894 +version 55391 categories devel maintainers snc openmaintainer description Manages interaction with the Chromium development process

1 0

[70423] branches/gsoc10-configfiles/base/src
by and.damore＠macports.org 09 Aug '10

09 Aug '10

Revision: 70423 http://trac.macports.org/changeset/70423 Author: and.damore(a)macports.org Date: 2010-08-09 03:28:49 -0700 (Mon, 09 Aug 2010) Log Message: ----------- working md5 storage, code is full of DBG printf() Modified Paths: -------------- branches/gsoc10-configfiles/base/src/cregistry/entry.c branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c Modified: branches/gsoc10-configfiles/base/src/cregistry/entry.c =================================================================== --- branches/gsoc10-configfiles/base/src/cregistry/entry.c 2010-08-09 09:16:39 UTC (rev 70422) +++ branches/gsoc10-configfiles/base/src/cregistry/entry.c 2010-08-09 10:28:49 UTC (rev 70423) @@ -872,26 +872,39 @@ * @param [out] errPtr on error, a description of the error that occurred * @return true if success; false if failure */ -int reg_entry_map_with_md5(reg_entry* entry, char** files, char** md5sums, int arg_count, - reg_error* errPtr) { +int reg_entry_map_with_md5(reg_entry* entry, char** files, char** md5sums, + int arg_count, reg_error* errPtr) { reg_registry* reg = entry->reg; int result = 1; sqlite3_stmt* stmt = NULL; - char* insert = "INSERT INTO registry.files (id, path, mtime, active, md5sum) " - "VALUES (?, ?, 0, 0, ?)"; - /* sqlite3_prepare() is documented as legacy, http://www.sqlite.org/c3ref/step.html - use sqlite3_prepare_v2() should be used instead */ + char* insert = "INSERT INTO registry.files " + "(id, path, mtime, active, md5sum) VALUES (?, ?, 0, 0, ?)"; + + printf("GSOCDBG: \tentered reg_entry_map_with_md5\n"); + printf("GSOCDBG: \t\targ_count:%d\n",arg_count); + /* sqlite3_prepare() is documented as legacy, + cf. http://www.sqlite.org/c3ref/step.html + sqlite3_prepare_v2() should be used instead */ if ((sqlite3_prepare(reg->db, insert, -1, &stmt, NULL) == SQLITE_OK) && (sqlite3_bind_int64(stmt, 1, entry->id) == SQLITE_OK)) { int i; - for (i=0; i<(arg_count/2) && result; i++) { + printf("GSOCDBG: \tlet's print files[] and md5sums[]\n"); + for (i=0; i<arg_count; i++) { + printf("GSOCDBG: \t\tfiles[%d]:\"%s\"\n",i,files[i]); + printf("GSOCDBG: \t\tmd5sums[%d]:\"%s\"\n",i,md5sums[i]); + } + printf("GSOCDBG: \t\tentering the for loop\n"); + for (i=0; (i<arg_count) && result; i++) { + printf("GSOCDBG: \t\tloop iteration:%d\n",i); /* cycles through files[] array of strings, the if argument parse a file from the array and put in into the SQL statement */ if (sqlite3_bind_text(stmt, 2, files[i], -1, SQLITE_STATIC) == SQLITE_OK) { + printf("GSOCDBG: \t\t\tinside first if branch\n"); if (sqlite3_bind_text(stmt, 3, md5sums[i], -1, SQLITE_STATIC) == SQLITE_OK) { + printf("GSOCDBG: \t\t\tinside second if branch\n"); int r; do { r = sqlite3_step(stmt); @@ -917,6 +930,7 @@ reg_sqlite_error(reg->db, errPtr, insert); result = 0; } + printf("GSOCDBG: \texiting reg_entry_map_with_md5\n"); if (stmt) { sqlite3_finalize(stmt); } Modified: branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl =================================================================== --- branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl 2010-08-09 09:16:39 UTC (rev 70422) +++ branches/gsoc10-configfiles/base/src/port1.0/portinstall.tcl 2010-08-09 10:28:49 UTC (rev 70423) @@ -198,7 +198,16 @@ if {[info exists installPlist]} { # register files - $regref map_with_md5 $installPlist + set installPlistWithMD5 [list] + foreach file $installPlist { + lappend installPlistWithMD5 $file + if {[catch {md5 file "$imagedir$file"} md5sum] == 0} { + lappend installPlistWithMD5 $md5sum + } + } + #puts "installPlist:$installPlist" + puts "installPlistWithMD5:$installPlistWithMD5" + $regref map_with_md5 "$installPlistWithMD5" } # store portfile Modified: branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c =================================================================== --- branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c 2010-08-09 09:16:39 UTC (rev 70422) +++ branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c 2010-08-09 10:28:49 UTC (rev 70423) @@ -159,7 +159,7 @@ static int entry_obj_filemap_with_md5(Tcl_Interp* interp, reg_entry* entry, int objc, Tcl_Obj* CONST objv[]) { reg_registry* reg = registry_for(interp, reg_attached); - printf("GSOCDBG: we're into entry_obj_filemap_with_md5\n"); + printf("GSOCDBG: entering entry_obj_filemap_with_md5\n"); if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "map {file md5checksum}-list"); return TCL_ERROR; @@ -174,33 +174,46 @@ int listc; int result = TCL_ERROR; int i; + int list_counter; if (Tcl_ListObjGetElements(interp, objv[2], &listc, &listv) != TCL_OK) { return TCL_ERROR; } - files=malloc(listc*sizeof(char *)); - md5sums=malloc(listc*sizeof(char*)); + + printf("GSOCDBG: size of list %d\n", listc); /* remember to add check for malloc return values */ - for (i = 0; i < listc; i++) { + files=malloc((listc/2)*sizeof(char *)); + md5sums=malloc((listc/2)*sizeof(char*)); + + printf("GSOCDBG: for loop\n"); + /* fill in files[] and md5sums[] */ + for (i=0; i<listc; i+=2) { + list_counter=i/2; + /*if (Tcl_ListObjLength(interp, listv[i], &length) != TCL_OK) { + free(files); free(md5sums); return TCL_ERROR; } */ + printf("GSOCDBG: \titem %d\n", list_counter); + element=NULL; if (Tcl_ListObjIndex(interp, listv[i], 0, &element) != TCL_OK) { free(files); free(md5sums); return TCL_ERROR; } - else if(element != NULL) - files[i] = Tcl_GetString(element); + else if (element == NULL) { + Tcl_SetErrorCode(interp, "illegal input", NULL); return TCL_ERROR; } else { + files[list_counter] = Tcl_GetString(element); + printf("GSOCDBG: \t\tfiles[%d]=\"%s\"\n", list_counter, files[list_counter]); } + element=NULL; + if (Tcl_ListObjIndex(interp, listv[i+1], 0, &element) != TCL_OK) { + free(files); free(md5sums); return TCL_ERROR; } + else if (element == NULL) { Tcl_SetErrorCode(interp, "illegal input", NULL); return TCL_ERROR; } - - if (Tcl_ListObjIndex(interp, listv[i], 1, &element) != TCL_OK) { - free(files); free(md5sums); return TCL_ERROR; } - else if(element != NULL) - md5sums[i] = Tcl_GetString(element); else { - Tcl_SetErrorCode(interp, "illegal input", NULL); return TCL_ERROR; } + md5sums[list_counter] = Tcl_GetString(element); + printf("GSOCDBG: \t\tmd5sums[%d]=\"%s\"\n", list_counter, md5sums[list_counter]); } } /* change the condition, */ /* it used to be list_obj_to_string() but now we're filling arrays by hand */ if ( 1 ) { - if (reg_entry_map_with_md5(entry, files, md5sums, listc, &error)) { + if (reg_entry_map_with_md5(entry, files, md5sums, listc/2, &error)) { result = TCL_OK; } else { result = registry_failed(interp, &error); @@ -214,6 +227,7 @@ result = registry_failed(interp, &error); } */ + printf("GSOCDBG: exiting entry_obj_filemap_with_md5\n"); return result; } } @@ -469,6 +483,7 @@ int entry_obj_cmd(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]) { int cmd_index; + int len=0; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "cmd ?arg ...?"); return TCL_ERROR;

1 0

[70422] trunk/dports/audio/sox/Portfile
by ryandesign＠macports.org 09 Aug '10

09 Aug '10

Revision: 70422 http://trac.macports.org/changeset/70422 Author: ryandesign(a)macports.org Date: 2010-08-09 02:16:39 -0700 (Mon, 09 Aug 2010) Log Message: ----------- sox: disable universal Modified Paths: -------------- trunk/dports/audio/sox/Portfile Modified: trunk/dports/audio/sox/Portfile =================================================================== --- trunk/dports/audio/sox/Portfile 2010-08-09 00:04:47 UTC (rev 70421) +++ trunk/dports/audio/sox/Portfile 2010-08-09 09:16:39 UTC (rev 70422) @@ -30,6 +30,9 @@ port:file \ port:libpng +# ffmpeg is not universal +universal_variant no + master_sites sourceforge checksums md5 b99871c7bbae84feac9d0d1f010331ba \ sha1 ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384 \

1 0

[70421] trunk/dports/devel/hs-alex
by gwright＠macports.org 09 Aug '10

09 Aug '10

Revision: 70421 http://trac.macports.org/changeset/70421 Author: gwright(a)macports.org Date: 2010-08-08 17:04:47 -0700 (Sun, 08 Aug 2010) Log Message: ----------- Version bump to 2.3.3. Modified Paths: -------------- trunk/dports/devel/hs-alex/Portfile Removed Paths: ------------- trunk/dports/devel/hs-alex/files/ Modified: trunk/dports/devel/hs-alex/Portfile =================================================================== --- trunk/dports/devel/hs-alex/Portfile 2010-08-08 23:55:43 UTC (rev 70420) +++ trunk/dports/devel/hs-alex/Portfile 2010-08-09 00:04:47 UTC (rev 70421) @@ -3,8 +3,7 @@ PortSystem 1.0 name hs-alex set canonicalname alex -version 2.3.2 -revision 1 +version 2.3.3 categories devel haskell maintainers gwright platforms darwin @@ -19,14 +18,12 @@ master_sites http://hackage.haskell.org/packages/archive/${canonicalname}/${version} distname ${canonicalname}-${version} -checksums md5 4ec089744917129d7354f56c901e2c76 \ - sha1 fe6b23f894d3e0c029a8e3e6f26a8cc106ff1d1e \ - rmd160 864616a2d2406da475af8c7473743e2ed45ae244 +checksums md5 bc5d90c932470ee8a64e6cda162ca05e \ + sha1 6b70d5a42559d654993e9b4218c7ac68aa1335ec \ + rmd160 c703459cb39731592f0a6e8d6fe887111a6bd611 depends_build port:ghc -patchfiles patch-alex.cabal.diff - configure { system "cd ${worksrcpath} && runhaskell Setup configure -v --ghc --with-gcc=${configure.cc} --prefix=${prefix} --program-suffix=\"-${version}\"" }

1 0