[100174] branches/pixilla-mysqls-55

pixilla at macports.org pixilla at macports.org
Sat Dec 1 13:28:45 PST 2012


Revision: 100174
          https://trac.macports.org/changeset/100174
Author:   pixilla at macports.org
Date:     2012-12-01 13:28:45 -0800 (Sat, 01 Dec 2012)
Log Message:
-----------
Sync the pixilla-mysqls-55 branch with trunk through r100173.

Revision Links:
--------------
    https://trac.macports.org/changeset/100173

Modified Paths:
--------------
    branches/pixilla-mysqls-55/base/ChangeLog
    branches/pixilla-mysqls-55/base/setupenv.bash.in
    branches/pixilla-mysqls-55/base/src/darwintracelib1.0/darwintrace.c
    branches/pixilla-mysqls-55/base/src/macports1.0/macports.tcl
    branches/pixilla-mysqls-55/base/src/package1.0/portarchivefetch.tcl
    branches/pixilla-mysqls-55/base/src/pextlib1.0/Pextlib.c
    branches/pixilla-mysqls-55/base/src/pextlib1.0/md_wrappers.h
    branches/pixilla-mysqls-55/base/src/pextlib1.0/rmd160cmd.c
    branches/pixilla-mysqls-55/base/src/pextlib1.0/tracelib.c
    branches/pixilla-mysqls-55/base/src/port/port.tcl
    branches/pixilla-mysqls-55/base/src/port1.0/fetch_common.tcl
    branches/pixilla-mysqls-55/base/src/port1.0/portchecksum.tcl
    branches/pixilla-mysqls-55/base/src/port1.0/portfetch.tcl
    branches/pixilla-mysqls-55/base/src/port1.0/portsandbox.tcl
    branches/pixilla-mysqls-55/base/src/port1.0/porttrace.tcl
    branches/pixilla-mysqls-55/base/src/port1.0/portutil.tcl
    branches/pixilla-mysqls-55/doc-new/guide/xml/project.xml
    branches/pixilla-mysqls-55/dports/_resources/port1.0/fetch/mirror_sites.tcl
    branches/pixilla-mysqls-55/dports/_resources/port1.0/group/active_variants-1.0.tcl
    branches/pixilla-mysqls-55/dports/_resources/port1.0/group/cmake-1.0.tcl
    branches/pixilla-mysqls-55/dports/_resources/port1.0/group/muniversal-1.0.tcl
    branches/pixilla-mysqls-55/dports/_resources/port1.0/group/php-1.1.tcl
    branches/pixilla-mysqls-55/dports/_resources/port1.0/group/x11font-1.0.tcl
    branches/pixilla-mysqls-55/dports/aqua/AquaLess/Portfile
    branches/pixilla-mysqls-55/dports/aqua/aquaterm/Portfile
    branches/pixilla-mysqls-55/dports/aqua/qt4-mac/Portfile
    branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff
    branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-configure.diff
    branches/pixilla-mysqls-55/dports/audio/abcMIDI/Portfile
    branches/pixilla-mysqls-55/dports/audio/gmpc/Portfile
    branches/pixilla-mysqls-55/dports/audio/libmpd/Portfile
    branches/pixilla-mysqls-55/dports/audio/sphinxbase/Portfile
    branches/pixilla-mysqls-55/dports/cad/gerbv/Portfile
    branches/pixilla-mysqls-55/dports/comms/telepathy-haze/Portfile
    branches/pixilla-mysqls-55/dports/comms/telepathy-idle/Portfile
    branches/pixilla-mysqls-55/dports/comms/telepathy-idle/files/patch-src-idle-parser.c.diff
    branches/pixilla-mysqls-55/dports/comms/telepathy-salut/Portfile
    branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-configure.diff
    branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-lib-ext-wocky-Makefile.in.diff
    branches/pixilla-mysqls-55/dports/databases/groonga/Portfile
    branches/pixilla-mysqls-55/dports/databases/mongodb/Portfile
    branches/pixilla-mysqls-55/dports/databases/mysql5-devel/Portfile
    branches/pixilla-mysqls-55/dports/databases/mysql51/Portfile
    branches/pixilla-mysqls-55/dports/devel/akonadi/Portfile
    branches/pixilla-mysqls-55/dports/devel/astyle/Portfile
    branches/pixilla-mysqls-55/dports/devel/autoconf263/Portfile
    branches/pixilla-mysqls-55/dports/devel/automake/Portfile
    branches/pixilla-mysqls-55/dports/devel/boost/Portfile
    branches/pixilla-mysqls-55/dports/devel/buildbot/Portfile
    branches/pixilla-mysqls-55/dports/devel/buildbot-slave/Portfile
    branches/pixilla-mysqls-55/dports/devel/clucene/Portfile
    branches/pixilla-mysqls-55/dports/devel/cmake/Portfile
    branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-CMakeLists.txt.diff
    branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
    branches/pixilla-mysqls-55/dports/devel/codeblocks/Portfile
    branches/pixilla-mysqls-55/dports/devel/ctags/Portfile
    branches/pixilla-mysqls-55/dports/devel/dbus/Portfile
    branches/pixilla-mysqls-55/dports/devel/dbus-devel/Portfile
    branches/pixilla-mysqls-55/dports/devel/e_dbus/Portfile
    branches/pixilla-mysqls-55/dports/devel/ecore/Portfile
    branches/pixilla-mysqls-55/dports/devel/eet/Portfile
    branches/pixilla-mysqls-55/dports/devel/eina/Portfile
    branches/pixilla-mysqls-55/dports/devel/embryo/Portfile
    branches/pixilla-mysqls-55/dports/devel/evas/Portfile
    branches/pixilla-mysqls-55/dports/devel/git-core/Portfile
    branches/pixilla-mysqls-55/dports/devel/git-core/files/git-subtree.1.diff
    branches/pixilla-mysqls-55/dports/devel/git-ftp/Portfile
    branches/pixilla-mysqls-55/dports/devel/glib2/Portfile
    branches/pixilla-mysqls-55/dports/devel/glib2-devel/Portfile
    branches/pixilla-mysqls-55/dports/devel/gob2/Portfile
    branches/pixilla-mysqls-55/dports/devel/gradle/Portfile
    branches/pixilla-mysqls-55/dports/devel/gsoap/Portfile
    branches/pixilla-mysqls-55/dports/devel/gsoap/files/patch-configure.diff
    branches/pixilla-mysqls-55/dports/devel/jubatus/Portfile
    branches/pixilla-mysqls-55/dports/devel/lcov/Portfile
    branches/pixilla-mysqls-55/dports/devel/libcdio/Portfile
    branches/pixilla-mysqls-55/dports/devel/libmemcached/Portfile
    branches/pixilla-mysqls-55/dports/devel/libzookeeper/Portfile
    branches/pixilla-mysqls-55/dports/devel/mercurial/Portfile
    branches/pixilla-mysqls-55/dports/devel/mspdebug/Portfile
    branches/pixilla-mysqls-55/dports/devel/nodejs/Portfile
    branches/pixilla-mysqls-55/dports/devel/npm/Portfile
    branches/pixilla-mysqls-55/dports/devel/pb2make/Portfile
    branches/pixilla-mysqls-55/dports/devel/pev/Portfile
    branches/pixilla-mysqls-55/dports/devel/pev/files/lib_libpe_Makefile.patch
    branches/pixilla-mysqls-55/dports/devel/pure-readline/Portfile
    branches/pixilla-mysqls-55/dports/devel/qt-assistant/Portfile
    branches/pixilla-mysqls-55/dports/devel/quickfix/Portfile
    branches/pixilla-mysqls-55/dports/devel/re2/Portfile
    branches/pixilla-mysqls-55/dports/devel/slib-guile16/Portfile
    branches/pixilla-mysqls-55/dports/devel/talloc/Portfile
    branches/pixilla-mysqls-55/dports/devel/thrift/Portfile
    branches/pixilla-mysqls-55/dports/devel/trac/Portfile
    branches/pixilla-mysqls-55/dports/devel/zmq22/Portfile
    branches/pixilla-mysqls-55/dports/editors/elvis/Portfile
    branches/pixilla-mysqls-55/dports/editors/emacs/Portfile
    branches/pixilla-mysqls-55/dports/editors/sigil/Portfile
    branches/pixilla-mysqls-55/dports/editors/texstudio/Portfile
    branches/pixilla-mysqls-55/dports/editors/texstudio/files/patch-texstudio.pro.diff
    branches/pixilla-mysqls-55/dports/editors/textmate2/Portfile
    branches/pixilla-mysqls-55/dports/emulators/mednafen/Portfile
    branches/pixilla-mysqls-55/dports/emulators/qemu/Portfile
    branches/pixilla-mysqls-55/dports/games/simutrans/Portfile
    branches/pixilla-mysqls-55/dports/gis/cgal/Portfile
    branches/pixilla-mysqls-55/dports/gis/gdal/Portfile
    branches/pixilla-mysqls-55/dports/gis/qgis/Portfile
    branches/pixilla-mysqls-55/dports/gis/qlandkartegt/Portfile
    branches/pixilla-mysqls-55/dports/gnome/atkmm/Portfile
    branches/pixilla-mysqls-55/dports/gnome/gst-plugins-good/Portfile
    branches/pixilla-mysqls-55/dports/gnome/gst-plugins-ugly/Portfile
    branches/pixilla-mysqls-55/dports/graphics/cairo/Portfile
    branches/pixilla-mysqls-55/dports/graphics/cairo-devel/Portfile
    branches/pixilla-mysqls-55/dports/graphics/edje/Portfile
    branches/pixilla-mysqls-55/dports/graphics/fontconfig/Portfile
    branches/pixilla-mysqls-55/dports/graphics/graphviz/Portfile
    branches/pixilla-mysqls-55/dports/graphics/graphviz-devel/Portfile
    branches/pixilla-mysqls-55/dports/graphics/harfbuzz/Portfile
    branches/pixilla-mysqls-55/dports/graphics/inkscape/Portfile
    branches/pixilla-mysqls-55/dports/graphics/inkscape-devel/Portfile
    branches/pixilla-mysqls-55/dports/graphics/ipe/Portfile
    branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/Portfile
    branches/pixilla-mysqls-55/dports/graphics/libiptcdata/Portfile
    branches/pixilla-mysqls-55/dports/graphics/librsvg/Portfile
    branches/pixilla-mysqls-55/dports/graphics/opencv/Portfile
    branches/pixilla-mysqls-55/dports/graphics/pdf2djvu/Portfile
    branches/pixilla-mysqls-55/dports/graphics/qwt/Portfile
    branches/pixilla-mysqls-55/dports/graphics/qwtplot3d/Portfile
    branches/pixilla-mysqls-55/dports/graphics/tiff/Portfile
    branches/pixilla-mysqls-55/dports/irc/bahamut/Portfile
    branches/pixilla-mysqls-55/dports/java/android/Portfile
    branches/pixilla-mysqls-55/dports/java/hadoop/Portfile
    branches/pixilla-mysqls-55/dports/java/trove4j/Portfile
    branches/pixilla-mysqls-55/dports/java/xercesj/Portfile
    branches/pixilla-mysqls-55/dports/kde/amarok-devel/Portfile
    branches/pixilla-mysqls-55/dports/kde/analitza/Portfile
    branches/pixilla-mysqls-55/dports/kde/ark/Portfile
    branches/pixilla-mysqls-55/dports/kde/blinken/Portfile
    branches/pixilla-mysqls-55/dports/kde/cantor/Portfile
    branches/pixilla-mysqls-55/dports/kde/gwenview/Portfile
    branches/pixilla-mysqls-55/dports/kde/gwenview/files/patch-CMakeLists.txt.diff
    branches/pixilla-mysqls-55/dports/kde/kalgebra/Portfile
    branches/pixilla-mysqls-55/dports/kde/kalzium/Portfile
    branches/pixilla-mysqls-55/dports/kde/kamera/Portfile
    branches/pixilla-mysqls-55/dports/kde/kanagram/Portfile
    branches/pixilla-mysqls-55/dports/kde/kate/Portfile
    branches/pixilla-mysqls-55/dports/kde/kbruch/Portfile
    branches/pixilla-mysqls-55/dports/kde/kcalc/Portfile
    branches/pixilla-mysqls-55/dports/kde/kcharselect/Portfile
    branches/pixilla-mysqls-55/dports/kde/kcolorchooser/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ar/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-bg/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-bs/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca-valencia/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-cs/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-da/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-de/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-el/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-en_GB/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-es/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-et/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-eu/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-fa/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-fi/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-fr/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ga/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-gl/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-he/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-hr/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-hu/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ia/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-is/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-it/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ja/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-kk/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-km/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ko/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-lt/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-lv/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-nb/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-nds/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-nl/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-nn/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-pa/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-pl/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt_BR/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ro/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ru/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-si/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-sk/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-sl/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-sr/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-sv/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-tg/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-th/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-tr/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-ug/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-uk/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-vi/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-wa/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_CN/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_TW/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde-wallpapers/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde4-baseapps/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde4-filelight/Portfile
    branches/pixilla-mysqls-55/dports/kde/kde4-runtime/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdeadmin/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdeartwork/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdebindings4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdeedu4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdegames4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdegraphics-strigi-analyzer/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdegraphics-thumbnailers/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdegraphics4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdelibs3/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/CompileScript.sh
    branches/pixilla-mysqls-55/dports/kde/kdelibs4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdemultimedia4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdenetwork4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdepim4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdepim4-runtime/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdepimlibs4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdesdk4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdetoys4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdeutils4/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdevelop/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdevplatform/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdewebdev/Portfile
    branches/pixilla-mysqls-55/dports/kde/kdiskfree/Portfile
    branches/pixilla-mysqls-55/dports/kde/kfloppy/Portfile
    branches/pixilla-mysqls-55/dports/kde/kgeography/Portfile
    branches/pixilla-mysqls-55/dports/kde/kgpg/Portfile
    branches/pixilla-mysqls-55/dports/kde/kgpg/files/patch-CMakeLists.txt.diff
    branches/pixilla-mysqls-55/dports/kde/khangman/Portfile
    branches/pixilla-mysqls-55/dports/kde/kig/Portfile
    branches/pixilla-mysqls-55/dports/kde/kimono/Portfile
    branches/pixilla-mysqls-55/dports/kde/kiten/Portfile
    branches/pixilla-mysqls-55/dports/kde/klettres/Portfile
    branches/pixilla-mysqls-55/dports/kde/kmplot/Portfile
    branches/pixilla-mysqls-55/dports/kde/kmymoney4-devel/Portfile
    branches/pixilla-mysqls-55/dports/kde/kolourpaint/Portfile
    branches/pixilla-mysqls-55/dports/kde/konsole/Portfile
    branches/pixilla-mysqls-55/dports/kde/konversation/Portfile
    branches/pixilla-mysqls-55/dports/kde/korundum/Portfile
    branches/pixilla-mysqls-55/dports/kde/kross-interpreters/Portfile
    branches/pixilla-mysqls-55/dports/kde/kruler/Portfile
    branches/pixilla-mysqls-55/dports/kde/ksaneplugin/Portfile
    branches/pixilla-mysqls-55/dports/kde/kstars/Portfile
    branches/pixilla-mysqls-55/dports/kde/ktimer/Portfile
    branches/pixilla-mysqls-55/dports/kde/ktouch/Portfile
    branches/pixilla-mysqls-55/dports/kde/kturtle/Portfile
    branches/pixilla-mysqls-55/dports/kde/kwallet/Portfile
    branches/pixilla-mysqls-55/dports/kde/kwordquiz/Portfile
    branches/pixilla-mysqls-55/dports/kde/libkdcraw/Portfile
    branches/pixilla-mysqls-55/dports/kde/libkdeedu/Portfile
    branches/pixilla-mysqls-55/dports/kde/libkexiv2/Portfile
    branches/pixilla-mysqls-55/dports/kde/libkipi/Portfile
    branches/pixilla-mysqls-55/dports/kde/libksane/Portfile
    branches/pixilla-mysqls-55/dports/kde/marble/Portfile
    branches/pixilla-mysqls-55/dports/kde/mobipocket/Portfile
    branches/pixilla-mysqls-55/dports/kde/okular/Portfile
    branches/pixilla-mysqls-55/dports/kde/oxygen-icons/Portfile
    branches/pixilla-mysqls-55/dports/kde/parley/Portfile
    branches/pixilla-mysqls-55/dports/kde/perlkde/Portfile
    branches/pixilla-mysqls-55/dports/kde/perlqt/Portfile
    branches/pixilla-mysqls-55/dports/kde/qtruby/Portfile
    branches/pixilla-mysqls-55/dports/kde/qyoto/Portfile
    branches/pixilla-mysqls-55/dports/kde/rocs/Portfile
    branches/pixilla-mysqls-55/dports/kde/rocs/files/patch-CMakeLists.txt.diff
    branches/pixilla-mysqls-55/dports/kde/shared-desktop-ontologies/Portfile
    branches/pixilla-mysqls-55/dports/kde/smokegen/Portfile
    branches/pixilla-mysqls-55/dports/kde/smokekde/Portfile
    branches/pixilla-mysqls-55/dports/kde/smokeqt/Portfile
    branches/pixilla-mysqls-55/dports/kde/step/Portfile
    branches/pixilla-mysqls-55/dports/kde/svgpart/Portfile
    branches/pixilla-mysqls-55/dports/kde/sweeper/Portfile
    branches/pixilla-mysqls-55/dports/lang/abcl/Portfile
    branches/pixilla-mysqls-55/dports/lang/algol68g/Portfile
    branches/pixilla-mysqls-55/dports/lang/dragonegg-3.0/Portfile
    branches/pixilla-mysqls-55/dports/lang/dragonegg-3.1/Portfile
    branches/pixilla-mysqls-55/dports/lang/dragonegg-3.2/Portfile
    branches/pixilla-mysqls-55/dports/lang/eero-devel/Portfile
    branches/pixilla-mysqls-55/dports/lang/gcc48/Portfile
    branches/pixilla-mysqls-55/dports/lang/gccxml-devel/Portfile
    branches/pixilla-mysqls-55/dports/lang/go/Portfile
    branches/pixilla-mysqls-55/dports/lang/gprolog/Portfile
    branches/pixilla-mysqls-55/dports/lang/llvm-3.2/Portfile
    branches/pixilla-mysqls-55/dports/lang/llvm-3.2/files/install_target.patch
    branches/pixilla-mysqls-55/dports/lang/perl5.10/Portfile
    branches/pixilla-mysqls-55/dports/lang/php/Portfile
    branches/pixilla-mysqls-55/dports/lang/php5/Portfile
    branches/pixilla-mysqls-55/dports/lang/pure/Portfile
    branches/pixilla-mysqls-55/dports/lang/pure/files/patch-openbrowser.diff
    branches/pixilla-mysqls-55/dports/lang/pure-docs/Portfile
    branches/pixilla-mysqls-55/dports/lang/pure-docs/files/patch-openbrowser.diff
    branches/pixilla-mysqls-55/dports/lang/qore/Portfile
    branches/pixilla-mysqls-55/dports/lang/qore-devel/Portfile
    branches/pixilla-mysqls-55/dports/lang/qore-mysql-module/Portfile
    branches/pixilla-mysqls-55/dports/lang/ruby19/Portfile
    branches/pixilla-mysqls-55/dports/lang/spidermonkey/Portfile
    branches/pixilla-mysqls-55/dports/lang/swi-prolog/Portfile
    branches/pixilla-mysqls-55/dports/lang/swi-prolog-devel/Portfile
    branches/pixilla-mysqls-55/dports/lang/tcl/Portfile
    branches/pixilla-mysqls-55/dports/lang/vala/Portfile
    branches/pixilla-mysqls-55/dports/mail/dovecot2/Portfile
    branches/pixilla-mysqls-55/dports/mail/dovecot2-antispam/Portfile
    branches/pixilla-mysqls-55/dports/mail/dovecot2-sieve/Portfile
    branches/pixilla-mysqls-55/dports/mail/imapsync/Portfile
    branches/pixilla-mysqls-55/dports/mail/opendkim/Portfile
    branches/pixilla-mysqls-55/dports/math/arpack/Portfile
    branches/pixilla-mysqls-55/dports/math/gnudatalanguage/Portfile
    branches/pixilla-mysqls-55/dports/math/gnuplot/Portfile
    branches/pixilla-mysqls-55/dports/math/gunits/Portfile
    branches/pixilla-mysqls-55/dports/math/libsvm/Portfile
    branches/pixilla-mysqls-55/dports/math/maxima/Portfile
    branches/pixilla-mysqls-55/dports/math/octave-devel/Portfile
    branches/pixilla-mysqls-55/dports/math/pspp-devel/Portfile
    branches/pixilla-mysqls-55/dports/math/pure-octave/Portfile
    branches/pixilla-mysqls-55/dports/math/qrupdate/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/VLC/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/VLC-devel/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/VLC09/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/mlt/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/mplayer2/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/mythtv-core.25/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/vcdimager/Portfile
    branches/pixilla-mysqls-55/dports/multimedia/xine-lib/Portfile
    branches/pixilla-mysqls-55/dports/net/curl/Portfile
    branches/pixilla-mysqls-55/dports/net/curl-ca-bundle/Portfile
    branches/pixilla-mysqls-55/dports/net/esniper/Portfile
    branches/pixilla-mysqls-55/dports/net/libquvi-scripts/Portfile
    branches/pixilla-mysqls-55/dports/net/libtorrent-devel/Portfile
    branches/pixilla-mysqls-55/dports/net/minidlna/Portfile
    branches/pixilla-mysqls-55/dports/net/munin/Portfile
    branches/pixilla-mysqls-55/dports/net/munin/files/patch-munin-node.conf.in
    branches/pixilla-mysqls-55/dports/net/nmap/Portfile
    branches/pixilla-mysqls-55/dports/net/rtorrent-devel/Portfile
    branches/pixilla-mysqls-55/dports/net/squid3/Portfile
    branches/pixilla-mysqls-55/dports/net/unison/Portfile
    branches/pixilla-mysqls-55/dports/net/youtube-dl/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-astro-satpass/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-file-listing/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-html-form/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-http-cookies/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-http-daemon/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-http-date/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-http-lite/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-http-message/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-http-negotiate/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-http-recorder/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-image-exiftool/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-lwp-mediatypes/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-http10/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-https/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-net-http/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-sgmlspm/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-text-csv_xs/Portfile
    branches/pixilla-mysqls-55/dports/perl/p5-www-robotrules/Portfile
    branches/pixilla-mysqls-55/dports/php/php-eaccelerator/Portfile
    branches/pixilla-mysqls-55/dports/php/php-magickwand/Portfile
    branches/pixilla-mysqls-55/dports/php/php-mongo/Portfile
    branches/pixilla-mysqls-55/dports/php/php-svm/Portfile
    branches/pixilla-mysqls-55/dports/php/php-timezonedb/Portfile
    branches/pixilla-mysqls-55/dports/php/php-yaz/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-calendar/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-curl/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-dba/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-eaccelerator/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-enchant/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-exif/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-ftp/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-gd/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-gettext/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-gmp/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-iconv/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-imap/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-intl/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-ldap/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-magickwand/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-mbstring/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-mcrypt/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-mongo/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-mssql/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-mysql/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-odbc/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-openssl/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-oracle/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-pcntl/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-posix/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-postgresql/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-pspell/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-snmp/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-soap/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-sockets/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-sqlite/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-tidy/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-timezonedb/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-wddx/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-xmlrpc/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-xsl/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-yaz/Portfile
    branches/pixilla-mysqls-55/dports/php/php5-zip/Portfile
    branches/pixilla-mysqls-55/dports/print/libLASi/Portfile
    branches/pixilla-mysqls-55/dports/python/py-bpython/Portfile
    branches/pixilla-mysqls-55/dports/python/py-dateutil/Portfile
    branches/pixilla-mysqls-55/dports/python/py-distribute/Portfile
    branches/pixilla-mysqls-55/dports/python/py-graph-tool/Portfile
    branches/pixilla-mysqls-55/dports/python/py-httplib2/Portfile
    branches/pixilla-mysqls-55/dports/python/py-icalendar/Portfile
    branches/pixilla-mysqls-55/dports/python/py-kombu/Portfile
    branches/pixilla-mysqls-55/dports/python/py-mahotas/Portfile
    branches/pixilla-mysqls-55/dports/python/py-matplotlib/Portfile
    branches/pixilla-mysqls-55/dports/python/py-matplotlib/files/patch-setupext.py.diff
    branches/pixilla-mysqls-55/dports/python/py-matplotlib-basemap/Portfile
    branches/pixilla-mysqls-55/dports/python/py-milk/Portfile
    branches/pixilla-mysqls-55/dports/python/py-novas_py/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pandas/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pika/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pyfftw/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pygccxml-devel/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pygrib/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pymongo/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pynds/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pyplusplus-devel/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pyrxp/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pyside/Portfile
    branches/pixilla-mysqls-55/dports/python/py-redis/Portfile
    branches/pixilla-mysqls-55/dports/python/py-regex/Portfile
    branches/pixilla-mysqls-55/dports/python/py-reportlab/Portfile
    branches/pixilla-mysqls-55/dports/python/py-robotframework-ride/Portfile
    branches/pixilla-mysqls-55/dports/python/py-roman/Portfile
    branches/pixilla-mysqls-55/dports/python/py-shiboken/Portfile
    branches/pixilla-mysqls-55/dports/python/py-thrift/Portfile
    branches/pixilla-mysqls-55/dports/python/py-xhtml2pdf/Portfile
    branches/pixilla-mysqls-55/dports/python/py-xlib/Portfile
    branches/pixilla-mysqls-55/dports/python/py-xlutils/Portfile
    branches/pixilla-mysqls-55/dports/python/py-yt/Portfile
    branches/pixilla-mysqls-55/dports/python/repo/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-configuration/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-cri/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-diff-lcs/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-innate/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-launchy/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-rack/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-term-ansicolor/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-treetop/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb-twitter-stream/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb19-arrayfields/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb19-configuration/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb19-cri/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb19-daemons/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb19-launchy/Portfile
    branches/pixilla-mysqls-55/dports/ruby/rb19-main/Portfile
    branches/pixilla-mysqls-55/dports/science/arb/Portfile
    branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-config.makefile.diff
    branches/pixilla-mysqls-55/dports/science/clhep/Portfile
    branches/pixilla-mysqls-55/dports/science/ds9/Portfile
    branches/pixilla-mysqls-55/dports/science/geos/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-atsc/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-audio-jack/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-audio-osx/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-audio-portaudio/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-companion/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-core/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-cvsd-vocoder/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-examples/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-gpio/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-grc/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-gruel/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-gsm-fr-vocoder/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-mblock/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-msdd6000/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-noaa/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-omnithread/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-pager/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-pmt/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-qtgui/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-radar-mono/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-radio-astronomy/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-sounder/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-trellis/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-usrp/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-utils/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-video-sdl/Portfile
    branches/pixilla-mysqls-55/dports/science/gnuradio-wxgui/Portfile
    branches/pixilla-mysqls-55/dports/science/gstlal/Portfile
    branches/pixilla-mysqls-55/dports/science/gstlal-ugly/Portfile
    branches/pixilla-mysqls-55/dports/science/indi/Portfile
    branches/pixilla-mysqls-55/dports/science/lal/Portfile
    branches/pixilla-mysqls-55/dports/science/lalapps/Portfile
    branches/pixilla-mysqls-55/dports/science/lalburst/Portfile
    branches/pixilla-mysqls-55/dports/science/lalframe/Portfile
    branches/pixilla-mysqls-55/dports/science/lalinference/Portfile
    branches/pixilla-mysqls-55/dports/science/lalinspiral/Portfile
    branches/pixilla-mysqls-55/dports/science/lalmetaio/Portfile
    branches/pixilla-mysqls-55/dports/science/lalpulsar/Portfile
    branches/pixilla-mysqls-55/dports/science/lalsimulation/Portfile
    branches/pixilla-mysqls-55/dports/science/lalstochastic/Portfile
    branches/pixilla-mysqls-55/dports/science/lalxml/Portfile
    branches/pixilla-mysqls-55/dports/science/libframe/Portfile
    branches/pixilla-mysqls-55/dports/science/magic-devel/Portfile
    branches/pixilla-mysqls-55/dports/science/magic-devel/files/patch-scripts-configure.in.diff
    branches/pixilla-mysqls-55/dports/science/molden/Portfile
    branches/pixilla-mysqls-55/dports/science/mpich2/Portfile
    branches/pixilla-mysqls-55/dports/science/nco/Portfile
    branches/pixilla-mysqls-55/dports/science/ompl/Portfile
    branches/pixilla-mysqls-55/dports/science/plplot/Portfile
    branches/pixilla-mysqls-55/dports/science/pylal/Portfile
    branches/pixilla-mysqls-55/dports/science/pymol/Portfile
    branches/pixilla-mysqls-55/dports/science/pymol-devel/Portfile
    branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pymol_shell.diff
    branches/pixilla-mysqls-55/dports/science/splash/Portfile
    branches/pixilla-mysqls-55/dports/science/triangle/Portfile
    branches/pixilla-mysqls-55/dports/science/uhd/Portfile
    branches/pixilla-mysqls-55/dports/science/usrp/Portfile
    branches/pixilla-mysqls-55/dports/security/stegdetect/Portfile
    branches/pixilla-mysqls-55/dports/sysutils/bacula/Portfile
    branches/pixilla-mysqls-55/dports/sysutils/di/Portfile
    branches/pixilla-mysqls-55/dports/sysutils/duply/Portfile
    branches/pixilla-mysqls-55/dports/sysutils/glances/Portfile
    branches/pixilla-mysqls-55/dports/sysutils/parallel/Portfile
    branches/pixilla-mysqls-55/dports/sysutils/sleuthkit/Portfile
    branches/pixilla-mysqls-55/dports/sysutils/terminator/Portfile
    branches/pixilla-mysqls-55/dports/tex/dvipng/Portfile
    branches/pixilla-mysqls-55/dports/tex/latexdiff/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-basic/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-bin/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-fonts-recommended/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-generic-recommended/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-latex/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-latex-recommended/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-math-extra/Portfile
    branches/pixilla-mysqls-55/dports/tex/texlive-pictures/Portfile
    branches/pixilla-mysqls-55/dports/textproc/chasen-base/Portfile
    branches/pixilla-mysqls-55/dports/textproc/cpi00/Portfile
    branches/pixilla-mysqls-55/dports/textproc/docbook-dsssl/Portfile
    branches/pixilla-mysqls-55/dports/textproc/icat/Portfile
    branches/pixilla-mysqls-55/dports/textproc/lader/Portfile
    branches/pixilla-mysqls-55/dports/textproc/lilypond-devel/Portfile
    branches/pixilla-mysqls-55/dports/textproc/mdocml/Portfile
    branches/pixilla-mysqls-55/dports/textproc/mecab-base/Portfile
    branches/pixilla-mysqls-55/dports/textproc/ocaml-xtmpl/Portfile
    branches/pixilla-mysqls-55/dports/textproc/pdfjam/Portfile
    branches/pixilla-mysqls-55/dports/textproc/rst2pdf/Portfile
    branches/pixilla-mysqls-55/dports/textproc/xercesc3/Portfile
    branches/pixilla-mysqls-55/dports/www/lighttpd/Portfile
    branches/pixilla-mysqls-55/dports/www/linkchecker/Portfile
    branches/pixilla-mysqls-55/dports/www/mod_security2/Portfile
    branches/pixilla-mysqls-55/dports/www/nginx/Portfile
    branches/pixilla-mysqls-55/dports/www/phpmyadmin/Portfile
    branches/pixilla-mysqls-55/dports/www/stog/Portfile
    branches/pixilla-mysqls-55/dports/www/stog/files/patch-Makefile.diff
    branches/pixilla-mysqls-55/dports/x11/efreet/Portfile
    branches/pixilla-mysqls-55/dports/x11/font-alias/Portfile
    branches/pixilla-mysqls-55/dports/x11/font-misc-ethiopic/Portfile
    branches/pixilla-mysqls-55/dports/x11/gtkspell2/Portfile
    branches/pixilla-mysqls-55/dports/x11/pango/Portfile
    branches/pixilla-mysqls-55/dports/x11/qt4-x11/Portfile
    branches/pixilla-mysqls-55/dports/x11/rgb/Portfile
    branches/pixilla-mysqls-55/dports/x11/sessreg/Portfile
    branches/pixilla-mysqls-55/dports/x11/setxkbmap/Portfile
    branches/pixilla-mysqls-55/dports/x11/showfont/Portfile
    branches/pixilla-mysqls-55/dports/x11/smproxy/Portfile
    branches/pixilla-mysqls-55/dports/x11/tk/Portfile
    branches/pixilla-mysqls-55/dports/x11/twm/Portfile
    branches/pixilla-mysqls-55/dports/x11/viewres/Portfile
    branches/pixilla-mysqls-55/dports/x11/wine-crossover/Portfile
    branches/pixilla-mysqls-55/dports/x11/wine-devel/Portfile
    branches/pixilla-mysqls-55/dports/x11/x11perf/Portfile
    branches/pixilla-mysqls-55/dports/x11/xbacklight/Portfile
    branches/pixilla-mysqls-55/dports/x11/xcalc/Portfile
    branches/pixilla-mysqls-55/dports/x11/xclipboard/Portfile
    branches/pixilla-mysqls-55/dports/x11/xclock/Portfile
    branches/pixilla-mysqls-55/dports/x11/xconsole/Portfile
    branches/pixilla-mysqls-55/dports/x11/xcursorgen/Portfile
    branches/pixilla-mysqls-55/dports/x11/xorg-libXcursor/Portfile
    branches/pixilla-mysqls-55/www/localized/es/downloads/index.php
    branches/pixilla-mysqls-55/www/localized/es/ports.php
    branches/pixilla-mysqls-55/www/localized/fr/downloads/index.php
    branches/pixilla-mysqls-55/www/localized/fr/ports.php
    branches/pixilla-mysqls-55/www/localized/it/downloads/index.php
    branches/pixilla-mysqls-55/www/localized/it/ports.php
    branches/pixilla-mysqls-55/www/localized/ru/ports.php
    branches/pixilla-mysqls-55/www/ports.php

Added Paths:
-----------
    branches/pixilla-mysqls-55/dports/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl
    branches/pixilla-mysqls-55/dports/comms/telepathy-qt/
    branches/pixilla-mysqls-55/dports/devel/astyle-dev/
    branches/pixilla-mysqls-55/dports/devel/autoconf264/
    branches/pixilla-mysqls-55/dports/devel/cmake/files/Info.plist.in
    branches/pixilla-mysqls-55/dports/devel/coccinelle/
    branches/pixilla-mysqls-55/dports/devel/codesearch/
    branches/pixilla-mysqls-55/dports/devel/ctags/files/
    branches/pixilla-mysqls-55/dports/devel/gob2/files/
    branches/pixilla-mysqls-55/dports/devel/pbtomake/
    branches/pixilla-mysqls-55/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff
    branches/pixilla-mysqls-55/dports/devel/thrift/files/
    branches/pixilla-mysqls-55/dports/editors/elvis/files/
    branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-configure-mdt.diff
    branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff
    branches/pixilla-mysqls-55/dports/finance/sc/
    branches/pixilla-mysqls-55/dports/gnome/keybinder/
    branches/pixilla-mysqls-55/dports/graphics/fontconfig/files/
    branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/files/universal.sh
    branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-cmake-OpenCVFindOpenNI.cmake.diff
    branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-CPPFLAGS.diff
    branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-src-m_who.c.diff
    branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c.diff
    branches/pixilla-mysqls-55/dports/kde/dragon/
    branches/pixilla-mysqls-55/dports/kde/ffmpegthumbs/
    branches/pixilla-mysqls-55/dports/kde/juk/
    branches/pixilla-mysqls-55/dports/kde/kactivities/
    branches/pixilla-mysqls-55/dports/kde/kanagram/files/patch-CMakeLists-engine.diff
    branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff
    branches/pixilla-mysqls-55/dports/kde/khangman/files/patch-CMakeLists-engine.diff
    branches/pixilla-mysqls-55/dports/kde/kimono/files/
    branches/pixilla-mysqls-55/dports/kde/kmix/
    branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-CMakeLists.diff
    branches/pixilla-mysqls-55/dports/kde/kscd/
    branches/pixilla-mysqls-55/dports/kde/libkcddb/
    branches/pixilla-mysqls-55/dports/kde/libkcompactdisc/
    branches/pixilla-mysqls-55/dports/kde/mplayerthumbs/
    branches/pixilla-mysqls-55/dports/kde/nepomuk-core/
    branches/pixilla-mysqls-55/dports/kde/pairs/
    branches/pixilla-mysqls-55/dports/lang/dragonegg-3.3/
    branches/pixilla-mysqls-55/dports/lang/go/files/
    branches/pixilla-mysqls-55/dports/lang/llvm-3.3/
    branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-iODBC.diff
    branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff
    branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-scripts-php-config.in.diff
    branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-unixODBC.diff
    branches/pixilla-mysqls-55/dports/lang/php/files/php55
    branches/pixilla-mysqls-55/dports/lang/toluapp/
    branches/pixilla-mysqls-55/dports/math/gnudatalanguage/files/
    branches/pixilla-mysqls-55/dports/multimedia/mplayer2/files/
    branches/pixilla-mysqls-55/dports/net/squid3/files/snowleopard-bool.diff
    branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.OCaml.diff
    branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.diff
    branches/pixilla-mysqls-55/dports/perl/p5-termextract/
    branches/pixilla-mysqls-55/dports/php/php-magickwand/files/
    branches/pixilla-mysqls-55/dports/php/php5-magickwand/files/
    branches/pixilla-mysqls-55/dports/python/py-cssutils/
    branches/pixilla-mysqls-55/dports/python/py-webpy/
    branches/pixilla-mysqls-55/dports/python/py-wxpython30/
    branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff
    branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.c.diff
    branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.h.diff
    branches/pixilla-mysqls-55/dports/science/fcl/
    branches/pixilla-mysqls-55/dports/science/gnuradio/files/
    branches/pixilla-mysqls-55/dports/science/gst-plugins-cairovis/
    branches/pixilla-mysqls-55/dports/science/gst-plugins-math/
    branches/pixilla-mysqls-55/dports/science/mpich/Portfile
    branches/pixilla-mysqls-55/dports/science/mpich3/
    branches/pixilla-mysqls-55/dports/science/pymol-devel/files/apbs-psize.patch
    branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pmg_tk_platform.patch
    branches/pixilla-mysqls-55/dports/sysutils/bacula/files/patch-qt-console-osx.diff
    branches/pixilla-mysqls-55/dports/textproc/libstemmer/
    branches/pixilla-mysqls-55/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff
    branches/pixilla-mysqls-55/dports/x11/tk/files/
    branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch

Removed Paths:
-------------
    branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-4.8.4-osx-native-menu-state-fix.diff
    branches/pixilla-mysqls-55/dports/audio/gmpc/files/
    branches/pixilla-mysqls-55/dports/devel/pev/files/src_Makefile.patch
    branches/pixilla-mysqls-55/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff
    branches/pixilla-mysqls-55/dports/graphics/fontconfig/files/
    branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff
    branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c
    branches/pixilla-mysqls-55/dports/kde/kamera/files/patch-gphoto25.diff
    branches/pixilla-mysqls-55/dports/kde/kdemultimedia4/files/
    branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-cmake.diff
    branches/pixilla-mysqls-55/dports/lang/eero-devel/files/install_target.patch
    branches/pixilla-mysqls-55/dports/lang/eero-devel/files/llvm-bin
    branches/pixilla-mysqls-55/dports/lang/eero-devel/files/mp-clang-3.2
    branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile
    branches/pixilla-mysqls-55/dports/python/py25-cssutils/
    branches/pixilla-mysqls-55/dports/python/py25-reportlab/
    branches/pixilla-mysqls-55/dports/python/py26-reportlab/
    branches/pixilla-mysqls-55/dports/python/py27-reportlab/
    branches/pixilla-mysqls-55/dports/python/py31-dateutil/
    branches/pixilla-mysqls-55/dports/python/py32-dateutil/
    branches/pixilla-mysqls-55/dports/science/mpich/Portfile
    branches/pixilla-mysqls-55/dports/science/mpich/files/
    branches/pixilla-mysqls-55/dports/www/lighttpd/files/patch-configure.ac.diff
    branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/ScreenToClient.patch

Property Changed:
----------------
    branches/pixilla-mysqls-55/
    branches/pixilla-mysqls-55/base/
    branches/pixilla-mysqls-55/dports/
    branches/pixilla-mysqls-55/dports/_resources/port1.0/group/active_variants-1.0.tcl
    branches/pixilla-mysqls-55/dports/databases/mysql5-devel/
    branches/pixilla-mysqls-55/dports/devel/
    branches/pixilla-mysqls-55/dports/devel/glib2-devel/
    branches/pixilla-mysqls-55/dports/devel/zmq22/Portfile
    branches/pixilla-mysqls-55/dports/editors/sigil/
    branches/pixilla-mysqls-55/dports/graphics/cairo-devel/
    branches/pixilla-mysqls-55/dports/graphics/graphviz-devel/
    branches/pixilla-mysqls-55/dports/graphics/inkscape/
    branches/pixilla-mysqls-55/dports/graphics/librsvg/
    branches/pixilla-mysqls-55/dports/lang/php/
    branches/pixilla-mysqls-55/dports/lang/php5/
    branches/pixilla-mysqls-55/dports/net/rtorrent-devel/
    branches/pixilla-mysqls-55/dports/python/py-astlib/Portfile
    branches/pixilla-mysqls-55/dports/python/py-pyfftw/Portfile
    branches/pixilla-mysqls-55/dports/python/py-reportlab/
    branches/pixilla-mysqls-55/dports/science/ds9/Portfile
    branches/pixilla-mysqls-55/dports/tex/
    branches/pixilla-mysqls-55/dports/tex/texlive-basic/
    branches/pixilla-mysqls-55/dports/tex/texlive-bin/
    branches/pixilla-mysqls-55/dports/tex/texlive-fonts-recommended/
    branches/pixilla-mysqls-55/dports/tex/texlive-generic-recommended/
    branches/pixilla-mysqls-55/dports/tex/texlive-latex/
    branches/pixilla-mysqls-55/dports/tex/texlive-latex-recommended/
    branches/pixilla-mysqls-55/dports/tex/texlive-math-extra/
    branches/pixilla-mysqls-55/dports/tex/texlive-pictures/
    branches/pixilla-mysqls-55/dports/x11/wine-crossover/
    branches/pixilla-mysqls-55/dports/x11/wine-devel/


Property changes on: branches/pixilla-mysqls-55
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:99672-100173


Property changes on: branches/pixilla-mysqls-55/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:99672-100173
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/pixilla-mysqls-55/base/ChangeLog
===================================================================
--- branches/pixilla-mysqls-55/base/ChangeLog	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/ChangeLog	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,6 +3,12 @@
 # $Id$
 ###
 
+Release 2.2.0 (unreleased)
+    - Added 'subport:' pseudo-portname that expands to ports that provide
+      a matching subport; added 'subportof:' pseudo-portname that expands to
+      the list of subports of the given port name
+      (raimue in r100059)
+
 Release 2.1.3 (unreleased)
     - Fixed a bug where a certain order of starting and aborting a build,
       running selfupdate and continuing a build would resume building although

Modified: branches/pixilla-mysqls-55/base/setupenv.bash.in
===================================================================
--- branches/pixilla-mysqls-55/base/setupenv.bash.in	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/setupenv.bash.in	2012-12-01 21:28:45 UTC (rev 100174)
@@ -78,7 +78,7 @@
 }
 
 function export_display() {
-    if [ -z $DISPLAY ]; then
+    if [ -z "$DISPLAY" ]; then
         export DISPLAY=":0.0"
     fi
 }

Modified: branches/pixilla-mysqls-55/base/src/darwintracelib1.0/darwintrace.c
===================================================================
--- branches/pixilla-mysqls-55/base/src/darwintracelib1.0/darwintrace.c	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/darwintracelib1.0/darwintrace.c	2012-12-01 21:28:45 UTC (rev 100174)
@@ -59,19 +59,21 @@
 #include <sys/paths.h>
 #endif
 
+#include <dirent.h>
+#include <dlfcn.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/syscall.h>
-#include <errno.h>
-#include <sys/socket.h>
+#include <sys/types.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #ifndef HAVE_STRLCPY
 /* Define strlcpy if it's not available. */
@@ -140,10 +142,12 @@
 inline char* const* __darwintrace_restore_env(char* const envp[]);
 inline void __darwintrace_setup();
 inline void __darwintrace_cleanup_path(char *path);
-static char * exchange_with_port(const char * buf, size_t len, int answer, char failures);
+static char * exchange_with_port(const char * buf, size_t len, int answer);
 
-#define START_FD 81
-static int __darwintrace_fd = -1;
+#define DT_STATIC_FD_NUM (236)
+static int __darwintrace_fd = -2;
+static FILE *__darwintrace_debug = NULL;
+static pid_t __darwintrace_pid = (pid_t) -1;
 #define BUFFER_SIZE	1024
 
 /**
@@ -160,15 +164,15 @@
 static char* __env_dyld_insert_libraries;
 static char* __env_dyld_force_flat_namespace;
 static char* __env_darwintrace_log;
+static char* __env_darwintrace_debug_log;
 
+#if DARWINTRACE_DEBUG_OUTPUT
 #if __STDC_VERSION__>=199901L
-#if DARWINTRACE_DEBUG_OUTPUT
-#define debug_printf(...) fprintf(stderr, __VA_ARGS__)
+#define debug_printf(format, ...) fprintf(stderr, "darwintrace[%d]: " format, getpid(), __VA_ARGS__); \
+	if (__darwintrace_debug) { \
+		fprintf(__darwintrace_debug, "darwintrace: " format, __VA_ARGS__); \
+	}
 #else
-#define debug_printf(...)
-#endif
-#else
-#if DARWINTRACE_DEBUG_OUTPUT
 __attribute__ ((format (printf, 1, 2)))
 static inline
 int debug_printf(const char *format, ...) {
@@ -179,40 +183,12 @@
     va_end(args);
     return ret;
 }
+#endif
 #else
-#define debug_printf(format, param)
+#define debug_printf(...)
 #endif
-#endif
 
 /*
- * char wait_for_socket(int sock, char w)
- * Function used for read/write operation to socket...
- * Args:
- *  sock - socket 
- *  w - what should socket do in next operation. 1 for write, 0 for read
- * Return value: 
- *  1 - everything is ok, we can read/write to/from it
- *  0 - something's went wrong
- */
-static int wait_for_socket(int sock, char w)
-{
-	struct timeval tv;
-	fd_set fds;
-	
-	if(sock==-1)
-		return 0;
-	
-	tv.tv_sec=10;
-	tv.tv_usec=0;
-	FD_ZERO(&fds);
-	FD_SET(sock, &fds);
-	if(select(sock+1, (w==0 ? &fds : 0), (w==1 ? &fds : 0), 0, &tv)<1)
-		return 0;
-	return FD_ISSET(sock, &fds)!=0;
-}
-
-
-/*
  * return 0 if str doesn't begin with prefix, 1 otherwise.
  */
 inline int __darwintrace_strbeginswith(const char* str, const char* prefix) {
@@ -248,6 +224,12 @@
 	} else {
 		__env_darwintrace_log = NULL;
 	}
+	theValue = getenv("DARWINTRACE_DEBUG_LOG");
+	if (theValue != NULL) {
+		__env_darwintrace_debug_log = strdup(theValue);
+	} else {
+		__env_darwintrace_debug_log = NULL;
+	}
 }
 
 /*
@@ -291,6 +273,10 @@
 		__darwintrace_alloc_env(
 			"DARWINTRACE_LOG",
 			__env_darwintrace_log);
+	char* darwintrace_debug_log_ptr =	
+		__darwintrace_alloc_env(
+			"DARWINTRACE_DEBUG_LOG",
+			__env_darwintrace_debug_log);
 
 	char* const * theEnvIter = envp;
 	int theEnvLength = 0;
@@ -318,6 +304,9 @@
 		} else if (__darwintrace_strbeginswith(theValue, "DARWINTRACE_LOG=")) {
 			theValue = darwintrace_log_ptr;
 			darwintrace_log_ptr = NULL;
+		} else if (__darwintrace_strbeginswith(theValue, "DARWINTRACE_DEBUG_LOG=")) {
+			theValue = darwintrace_debug_log_ptr;
+			darwintrace_debug_log_ptr = NULL;
 		}
 		
 		if (theValue) {
@@ -336,6 +325,9 @@
 	if (darwintrace_log_ptr) {
 		*theCopyIter++ = darwintrace_log_ptr;
 	}
+	if (darwintrace_debug_log_ptr) {
+		*theCopyIter++ = darwintrace_debug_log_ptr;
+	}
 
 	*theCopyIter = 0;
 	
@@ -344,7 +336,7 @@
 
 static void ask_for_filemap()
 {
-	filemap=exchange_with_port("filemap\t", sizeof("filemap\t"), 1, 0);
+	filemap=exchange_with_port("filemap\t", sizeof("filemap\t"), 1);
 	if(filemap==(char*)-1)
 		filemap=0;
 }
@@ -353,17 +345,35 @@
 inline void __darwintrace_setup() {
 #define open(x,y,z) syscall(SYS_open, (x), (y), (z))
 #define close(x) syscall(SYS_close, (x))
-	if (__darwintrace_fd == -1) {
+	pid_t oldpid = __darwintrace_pid;
+	if (__darwintrace_pid != (pid_t) -1 && __darwintrace_pid != getpid()) {
+		if (__darwintrace_fd != -2) {
+			close(__darwintrace_fd);
+			__darwintrace_fd = -2;
+		}
+		if (__darwintrace_debug) {
+			fclose(__darwintrace_debug);
+			__darwintrace_debug = NULL;
+		}
+		__darwintrace_pid = (pid_t) -1;
+	}
+	if (__darwintrace_pid == (pid_t) -1) {
+		__darwintrace_pid = getpid();
 		if (__env_darwintrace_log != NULL) {
 			int olderrno = errno;
-			int sock=socket(AF_UNIX, SOCK_STREAM, 0);
+			int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+			if (-1 == dup2(sock, DT_STATIC_FD_NUM)) {
+				debug_printf("couldn't duplicate filedescriptor into %d", DT_STATIC_FD_NUM);
+				abort();
+			}
+			close(sock);
+			sock = DT_STATIC_FD_NUM;
 			struct sockaddr_un sun;
-			sun.sun_family=AF_UNIX;
+			sun.sun_family = AF_UNIX;
 			strncpy(sun.sun_path, __env_darwintrace_log, sizeof(sun.sun_path));
-			if(connect(sock, (struct sockaddr*)&sun, strlen(__env_darwintrace_log)+1+sizeof(sun.sun_family))!=-1)
-			{
-				debug_printf("darwintrace: connect successful. socket %d\n", sock);
-				__darwintrace_fd=sock;
+			if (connect(sock, (struct sockaddr*)&sun, strlen(__env_darwintrace_log) + 1 + sizeof(sun.sun_family)) != -1) {
+				debug_printf("connect successful, socket %d in pid %d\n", sock, __darwintrace_pid);
+				__darwintrace_fd = sock;
 				ask_for_filemap();
 			} else {
 				debug_printf("connect failed: %s\n", strerror(errno));
@@ -371,6 +381,21 @@
 			}
 			errno = olderrno;
 		}
+		if (__darwintrace_debug == NULL) {
+			if (__env_darwintrace_debug_log != NULL) {
+				char logpath[MAXPATHLEN];
+				snprintf(logpath, MAXPATHLEN, __env_darwintrace_debug_log, getpid());
+				if (NULL == (__darwintrace_debug = fopen(logpath, "w"))) {
+					fprintf(stderr, "failed to open logfile: %s\n", strerror(errno));
+					abort();
+				}
+				fprintf(__darwintrace_debug, "pid %d is process %s\n", getpid(), getenv("_"));
+				debug_printf("logging socket communication to: %s\n", logpath);
+			}
+		}
+		if (oldpid != (pid_t) -1) {
+			debug_printf("seems to have forked from %d, re-opened files\n", oldpid);
+		}
 	}
 #undef close
 #undef open
@@ -386,7 +411,7 @@
 	int size;
 	char somepath[MAXPATHLEN];
 	char logbuffer[BUFFER_SIZE];
-	
+
 	do {
 #ifdef __APPLE__ /* Only Darwin has volfs and F_GETPATH */
 		if ((fd > 0) && (DARWINTRACE_LOG_FULL_PATH
@@ -416,9 +441,9 @@
 
 	size = snprintf(logbuffer, sizeof(logbuffer),
 		"%s\t%s",
-		op, somepath );
+		op, somepath);
 
-	exchange_with_port(logbuffer, size+1, 0, 0);
+	exchange_with_port(logbuffer, size+1, 0);
 	
 	return;
 }
@@ -427,82 +452,63 @@
  * do a partial realpath(3) to fix "foo//bar" to "foo/bar"
  */
 inline void __darwintrace_cleanup_path(char *path) {
-  size_t pathlen;
+	size_t pathlen;
 #ifdef __APPLE__
-  size_t rsrclen;
+	size_t rsrclen;
 #endif
-  size_t i, shiftamount;
-  enum { SAWSLASH, NOTHING } state = NOTHING;
+	size_t i, shiftamount;
+	enum { SAWSLASH, NOTHING } state = NOTHING;
 
-  /* if this is a foo/..namedfork/rsrc, strip it off */
-  pathlen = strlen(path);
-  /* ..namedfork/rsrc is only on OS X */
-#ifdef __APPLE__ 
-  rsrclen = strlen(_PATH_RSRCFORKSPEC);
-  if(pathlen > rsrclen
-     && 0 == strcmp(path + pathlen - rsrclen,
-		    _PATH_RSRCFORKSPEC)) {
-    path[pathlen - rsrclen] = '\0';
-    pathlen -= rsrclen;
-  }
+	/* if this is a foo/..namedfork/rsrc, strip it off */
+	pathlen = strlen(path);
+	/* ..namedfork/rsrc is only on OS X */
+#ifdef __APPLE__
+	rsrclen = strlen(_PATH_RSRCFORKSPEC);
+	if (pathlen > rsrclen && 0 == strcmp(path + pathlen - rsrclen, _PATH_RSRCFORKSPEC)) {
+		path[pathlen - rsrclen] = '\0';
+		pathlen -= rsrclen;
+	}
 #endif
 
-  /* for each position in string (including
-     terminal \0), check if we're in a run of
-     multiple slashes, and only emit the
-     first one
-  */
-  for(i=0, shiftamount=0; i <= pathlen; i++) {
-    if(state == SAWSLASH) {
-      if(path[i] == '/') {
-	/* consume it */
-	shiftamount++;
-      } else {
-	state = NOTHING;
-	path[i - shiftamount] = path[i];
-      }
-    } else {
-      if(path[i] == '/') {
-	state = SAWSLASH;
-      }
-      path[i - shiftamount] = path[i];
-    }
-  }
-
-  debug_printf("darwintrace: cleanup resulted in %s\n", path);
+	/* for each position in string (including terminal \0), check if we're in
+	 * a run of multiple slashes, and only emit the first one */
+	for(i = 0, shiftamount = 0; i <= pathlen; i++) {
+		if (state == SAWSLASH) {
+			if (path[i] == '/') {
+				/* consume it */
+				shiftamount++;
+				continue;
+			} else {
+				state = NOTHING;
+			}
+		} else {
+			if (path[i] == '/') {
+				state = SAWSLASH;
+			}
+		}
+		path[i - shiftamount] = path[i];
+	}
 }
 
 /*
- * return 1 if path is directory or not exists
- * return 0 otherwise
- */
-static int is_directory(const char * path)
-{
-#define stat(path, sb) syscall(SYS_stat, path, sb)
-	struct stat s;
-	if(stat(path, &s)==-1)
-		/* Actually is not directory, but anyway, we shouldn't test a dependency unless file exists */
-		return 1;
-	
-	return S_ISDIR(s.st_mode);
-#undef stat
-}
-
-
-/*
  * return 1 if path allowed, 0 otherwise
  */
-static int ask_for_dependency(char * path)
-{
+static int ask_for_dependency(char * path) {
+#define stat(y, z) syscall(SYS_stat, (y), (z))
 	char buffer[BUFFER_SIZE], *p;
-	int result=0;
-	
-	if(is_directory(path))
+	int result = 0;
+	struct stat st;
+
+	if (-1 == stat(path, &st)) {
 		return 1;
+	}
+	if (S_ISDIR(st.st_mode)) {
+		return 1;
+	}
 	
 	strncpy(buffer, "dep_check\t", sizeof(buffer));
 	strncpy(buffer+10, path, sizeof(buffer)-10);
-	p=exchange_with_port(buffer, strlen(buffer)+1, 1, 0);
+	p=exchange_with_port(buffer, strlen(buffer)+1, 1);
 	if(p==(char*)-1||!p)
 		return 0;
 	
@@ -511,6 +517,7 @@
 	
 	free(p);
 	return result;
+#undef stat
 }
 
 /*
@@ -525,155 +532,180 @@
  *    0      -- data successfully sent
  *    string -- answer (caller shoud free it)
  */
-static char * exchange_with_port(const char * buf, size_t len, int answer, char failures)
-{
-	wait_for_socket(__darwintrace_fd, 1);
-	if(send(__darwintrace_fd, buf, len, 0)==-1)
-	{
-		if(errno==ENOTSOCK && failures<3)
-		{
-			__darwintrace_fd=-1;
-			__darwintrace_setup();
-			return exchange_with_port(buf, len, answer, failures+1);
+static char * exchange_with_port(const char * buf, size_t len, int answer) {
+	size_t sent = 0;
+
+	if (__darwintrace_debug) {
+		fprintf(__darwintrace_debug, "> %s\n", buf);
+	}
+	while (sent < len) {
+		ssize_t local_sent = send(__darwintrace_fd, buf + sent, len - sent, 0);
+		if (local_sent == -1) {
+			debug_printf("error communicating with socket %d: %s\n", __darwintrace_fd, strerror(errno));
+			if (__darwintrace_debug)
+				fprintf(__darwintrace_debug, "darwintrace: error communicating with socket %d: %s\n", __darwintrace_fd, strerror(errno));
+			abort();
 		}
-		return (char*)-1;
+		sent += local_sent;
 	}
-	if(!answer)
+	if (!answer) {
 		return 0;
-	{
-		size_t l=0;
-		char * b;
+	} else {
+		size_t recv_len = 0, received;
+		char *recv_buf;
 		
-		wait_for_socket(__darwintrace_fd, 0);
-		recv(__darwintrace_fd, &l, sizeof(l),0);
-		if(!l)
+		ssize_t t;
+		if (-1 == (t = recv(__darwintrace_fd, &recv_len, sizeof(recv_len), 0))) {
+			debug_printf("error reading data from socket %d: %s\n", __darwintrace_fd, strerror(errno));
+			if (__darwintrace_debug)
+				fprintf(__darwintrace_debug, "darwintrace: error reading data from socket %d: %s\n", __darwintrace_fd, strerror(errno));
+			abort();
+		}
+		if (t != sizeof(recv_len)) {
+			debug_printf("!!! received %zd, but should have been %zd\n", t, sizeof(recv_len));
+		}
+		if (recv_len == 0) {
 			return 0;
-		b=(char*)malloc(l+1);
-		b[l]=0;
-		recv(__darwintrace_fd, b, l, 0);
-		return b;
+		}
+		recv_buf = malloc(recv_len + 1);
+		recv_buf[recv_len] = '\0';
+
+		received = 0;
+		while (received < recv_len) {
+			ssize_t local_received = recv(__darwintrace_fd, recv_buf + received, recv_len - received, 0);
+			if (local_received == -1) {
+				debug_printf("error reading data from socket %d: %s\n", __darwintrace_fd, strerror(errno));
+				if (__darwintrace_debug)
+					fprintf(__darwintrace_debug, "darwintrace: error reading data from socket %d: %s\n", __darwintrace_fd, strerror(errno));
+				abort();
+			}
+			received += local_received;
+		}
+		if (__darwintrace_debug) {
+			fprintf(__darwintrace_debug, "< %s\n", recv_buf);
+		}
+		return recv_buf;
 	}
 }
 
+#define DARWINTRACE_STATUS_PATH    ((char) 0)
+#define DARWINTRACE_STATUS_COMMAND ((char) 1)
+#define DARWINTRACE_STATUS_DONE    ((char) 2)
+
 /*
  * return 1 if path (once normalized) is in sandbox or redirected, 0 otherwise.
  */
 __attribute__((always_inline))
 inline int __darwintrace_is_in_sandbox(const char* path, char * newpath) {
-	char * t, * p, * _;
-	int result=-1;
+	char *t, *p, *_;
+	char lpath[MAXPATHLEN];
 	
 	__darwintrace_setup();
 	
-	if(!filemap)
+	if (!filemap)
 		return 1;
 	
-	if(*path=='/')
-		p=strdup(path);
-	else
-	{
-		p=(char*)malloc(MAXPATHLEN);
-		if (getcwd(p, MAXPATHLEN-1) == NULL) {
+	if (*path=='/') {
+		p = strcpy(lpath, path);
+	} else {
+		if (getcwd(lpath, MAXPATHLEN - 1) == NULL) {
 			fprintf(stderr, "darwintrace: getcwd: %s, path was: %s\n", strerror(errno), path);
 			abort();
 		}
-		if (p[strlen(p)-1] != '/')
-			strcat(p, "/");
-		strcat(p, path);
+		strcat(lpath, "/");
+		strcat(lpath, path);
 	}
-	__darwintrace_cleanup_path(p);
-			
-	do
-	{
-		for(t=filemap; *t;)
-		{
-			if(__darwintrace_strbeginswith(p, t))
-			{
-				t+=strlen(t)+1;
-				switch(*t)
-				{
+
+	p = lpath;
+
+	for (t = filemap; *t;) {
+		char state;
+		
+		if (__darwintrace_strbeginswith(p, t)) {
+			/* move t to the integer describing how to handle this match */
+			t += strlen(t) + 1;
+			switch (*t) {
 				case 0:
-					result=1;
-					break;
+					return 1;
 				case 1:
-					if(!newpath)
-					{
-						result=0;
-						break;
+					if (!newpath) {
+						return 0;
 					}
-					strcpy(newpath, t+1);
-					_=newpath+strlen(newpath);
-					if(_[-1]!='/')
-						*_++='/';
+					/* the redirected path starts right after the byte telling
+					 * us we should redirect */
+					strcpy(newpath, t + 1);
+					_ = newpath + strlen(newpath);
+					/* append '/' if it's missing */
+					if (_[-1] != '/') {
+						*_ = '/';
+					}
 					strcpy(_, p);
-					result=1;
-					break;
+					return 1;
 				case 2:
-					result=ask_for_dependency(p);
+					/* ask the socket whether this file is OK */
+					return ask_for_dependency(p);
+				default:
+					fprintf(stderr, "darwintrace: error: unexpected byte in file map: `%x'\n", *t);
+					abort();
+			}
+		}
+
+		/* advance the cursor: if the number after the string is not 1, there's
+		 * no path behind it and we can advance by strlen(t) + 3. If it is 1,
+		 * make sure to skip the path, too.
+		 */
+		state = DARWINTRACE_STATUS_PATH;
+		while (state != DARWINTRACE_STATUS_DONE) {
+			switch (state) {
+				case DARWINTRACE_STATUS_PATH:
+					if (!*t) {
+						state = DARWINTRACE_STATUS_COMMAND;
+					}
 					break;
-				}
+				case DARWINTRACE_STATUS_COMMAND:
+					if (*t == 1) {
+						state = DARWINTRACE_STATUS_PATH;
+						t++;
+					} else {
+						state = DARWINTRACE_STATUS_DONE;
+					}
+					break;
 			}
-			if(result!=-1)
-				break;
-			t+=strlen(t)+1;
-			if(*t==1)
-				t+=strlen(t)+1;
-			else
-				t+=2;
+			t++;
 		}
-		if(result!=-1)
-			break;
-		__darwintrace_log_op("sandbox_violation", path, 0);
-		result=0;
+		t++;
 	}
-	while(0);
-	free(p);
-	return result;
+
+	__darwintrace_log_op("sandbox_violation", path, 0);
+	return 0;
 }
 
-/* Log calls to open(2) into the file specified by DARWINTRACE_LOG.
-   Only logs if the DARWINTRACE_LOG environment variable is set.
-   Only logs files (or rather, do not logs directories)
-   Only logs files where the open succeeds.
-   Only logs files opened for read access, without the O_CREAT flag set
-   	(unless DARWINTRACE_LOG_CREATE is set).
-   The assumption is that any file that can be created isn't necessary
-   to build the project.
-*/
-
+/* wrapper for open(2) preventing opening files outside the sandbox */
 int open(const char* path, int flags, ...) {
 #define open(x,y,z) syscall(SYS_open, (x), (y), (z))
 	mode_t mode;
-	int result;
 	va_list args;
-	struct stat sb;
 	char newpath[MAXPATHLEN];
-	int isInSandbox;	
 
+	debug_printf("open(%s)\n", path);
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		debug_printf("open %s was forbidden\n", path);
+		errno = EACCES;
+		return -1;
+	}
+
+	if (*newpath) {
+		path = newpath;
+	}
+
 	/* Why mode here ? */
 	va_start(args, flags);
 	mode = va_arg(args, int);
 	va_end(args);
-	
-	result = 0;
-	
-	if((stat(path, &sb)!=-1 && !(sb.st_mode&S_IFDIR)) || flags & O_CREAT )
-	{
-		*newpath=0;
-		__darwintrace_setup();
-		isInSandbox = __darwintrace_is_in_sandbox(path, newpath);
-		if (isInSandbox == 0) {
-			debug_printf("darwintrace: creation/writing was forbidden at %s\n", path);
-			errno = EACCES;
-			result = -1;
-		}
-		if(*newpath)
-			path=newpath;
-	}
-	if (result == 0) {
-		result = open(path, flags, mode);
-	}
-	return result;
+
+	return open(path, flags, mode);
 #undef open
 }
 
@@ -682,25 +714,26 @@
    Only logs files where the readlink succeeds.
 */
 #ifdef READLINK_IS_NOT_P1003_1A
-int  readlink(const char * path, char * buf, int bufsiz) {
+int readlink(const char * path, char * buf, int bufsiz) {
 #else
-ssize_t  readlink(const char * path, char * buf, size_t bufsiz) {
+ssize_t readlink(const char * path, char * buf, size_t bufsiz) {
 #endif
 #define readlink(x,y,z) syscall(SYS_readlink, (x), (y), (z))
-	ssize_t result;
-	int isInSandbox;
+	char newpath[MAXPATHLEN];
 
-	result = readlink(path, buf, bufsiz);
-	if (result >= 0) {
-		__darwintrace_setup();
-		isInSandbox = __darwintrace_is_in_sandbox(path, 0);
-		if (!isInSandbox)
-		{
-			errno=EACCES;
-			result=-1;
-		}
+	debug_printf("readlink(%s)\n", path);
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		errno = EACCES;
+		return -1;
 	}
-	return result;
+
+	if (*newpath) {
+		path = newpath;
+	}
+
+	return readlink(path, buf, bufsiz);
 #undef readlink
 }
 
@@ -709,314 +742,432 @@
 #define open(x,y,z) syscall(SYS_open, (x), (y), (z))
 #define close(x) syscall(SYS_close, (x))
 #define lstat(x, y) syscall(SYS_lstat, (x), (y))
-	int result;
+	debug_printf("execve(%s)\n", path);
 	__darwintrace_setup();
 	if (__darwintrace_fd >= 0) {
-	  struct stat sb;
-	  /* for symlinks, we want to capture
-	   * both the original path and the modified one,
-	   * since for /usr/bin/gcc -> gcc-4.0,
-	   * both "gcc_select" and "gcc" are contributors
-	   */
-	  if (lstat(path, &sb) == 0) {
-	  	int fd;
+		struct stat sb;
+		/* for symlinks, we want to capture both the original path and the
+		 * modified one, since for /usr/bin/gcc -> gcc-4.0, both "gcc_select"
+		 * and "gcc" are contributors
+		 */
+		if (lstat(path, &sb) == 0) {
+			int fd;
+			if (S_ISLNK(sb.st_mode)) {
+				/* for symlinks, print both */
+				__darwintrace_log_op("execve", path, 0);
+			}
 
-	    if(S_ISLNK(sb.st_mode)) {
-	      /* for symlinks, print both */
-		  __darwintrace_log_op("execve", path, 0);
-	    }
-		
-		fd = open(path, O_RDONLY, 0);
-		if (fd > 0) {
-		  char buffer[MAXPATHLEN+1], newpath[MAXPATHLEN+1];
-		  ssize_t bytes_read;
-		
-		  *newpath=0;
-		  if(__darwintrace_is_in_sandbox(path, newpath)==0)
-		  {
-			close(fd);
-			errno=ENOENT;
-		    return -1;
-		  }
-		  if(*newpath)
-		    path=newpath;
+			fd = open(path, O_RDONLY, 0);
+			if (fd > 0) {
+				char buffer[MAXPATHLEN+1];
+				ssize_t bytes_read;
+
+				if(!__darwintrace_is_in_sandbox(path, NULL)) {
+					close(fd);
+					errno = ENOENT;
+					return -1;
+				}
 	
-		  /* once we have an open fd, if a full path was requested, do it */
-		  __darwintrace_log_op("execve", path, fd);
-
-		  /* read the file for the interpreter */
-		  bytes_read = read(fd, buffer, MAXPATHLEN);
-		  buffer[bytes_read] = 0;
-		  if (bytes_read > 2 &&
-			buffer[0] == '#' && buffer[1] == '!') {
-			const char* interp = &buffer[2];
-			int i;
-			/* skip past leading whitespace */
-			for (i = 2; i < bytes_read; ++i) {
-			  if (buffer[i] != ' ' && buffer[i] != '\t') {
-				interp = &buffer[i];
-				break;
-			  }
+				/* once we have an open fd, if a full path was requested, do it */
+				__darwintrace_log_op("execve", path, fd);
+	
+				/* read the file for the interpreter */
+				bytes_read = read(fd, buffer, MAXPATHLEN);
+				buffer[bytes_read] = 0;
+				if (bytes_read > 2 && buffer[0] == '#' && buffer[1] == '!') {
+					const char* interp = &buffer[2];
+					int i;
+					/* skip past leading whitespace */
+					for (i = 2; i < bytes_read; ++i) {
+						if (buffer[i] != ' ' && buffer[i] != '\t') {
+							interp = &buffer[i];
+							break;
+						}
+					}
+					/* found interpreter (or ran out of data); skip until next
+					 * whitespace, then terminate the string */
+					for (; i < bytes_read; ++i) {
+						if (buffer[i] == ' ' || buffer[i] == '\t' || buffer[i] == '\n') {
+							buffer[i] = 0;
+							break;
+						}
+					}
+					/* we have liftoff */
+					if (interp && interp[0] != '\0') {
+						__darwintrace_log_op("execve", interp, 0);
+					}
+				}
+				close(fd);
 			}
-			/* found interpreter (or ran out of data)
-			   skip until next whitespace, then terminate the string */
-			for (; i < bytes_read; ++i) {
-			  if (buffer[i] == ' ' || buffer[i] == '\t' || buffer[i] == '\n') {
-				buffer[i] = 0;
-				break;
-			  }
-			}
-			/* we have liftoff */
-			if (interp && interp[0] != '\0') {
-			  __darwintrace_log_op("execve", interp, 0);
-			}
-		  }
-		  close(fd);
 		}
-	  }
-	close(__darwintrace_fd);
-	__darwintrace_fd=-1;
 	}
-	
+	/* our variables won't survive exec, clean up */
+	if (__darwintrace_fd != -2) {
+		close(__darwintrace_fd);
+		__darwintrace_fd = -2;
+	}
+	if (__darwintrace_debug) {
+		fclose(__darwintrace_debug);
+		__darwintrace_debug = NULL;
+	}
+	__darwintrace_pid = (pid_t) -1;
+
 	/* call the original execve function, but fix the environment if required. */
-	result = __execve(path, argv, __darwintrace_restore_env(envp));
-	return result;
+	return __execve(path, argv, __darwintrace_restore_env(envp));
 #undef lstat
 #undef close
 #undef open
 #undef execve
 }
 
-/* if darwintrace has been initialized, trap
-   attempts to close our file descriptor
-*/
+/* if darwintrace has been initialized, trap attempts to close our file
+ * descriptor */
 int close(int fd) {
 #define close(x) syscall(SYS_close, (x))
+	if (__darwintrace_fd != -2 && fd == __darwintrace_fd) {
+		errno = EBADF;
+		return -1;
+	}
 
-  if(__darwintrace_fd != -2 && fd == __darwintrace_fd) {
-    errno = EBADF;
-    return -1;
-  }
-
-  return close(fd);
+	return close(fd);
 #undef close
 }
 
-/* Trap attempts to unlink a file outside the sandbox.
- */
+/* if darwintrace has been initialized, trap attempts to dup2 over our file descriptor */
+int dup2(int filedes, int filedes2) {
+#define dup2(x, y) syscall(SYS_dup2, (x), (y))
+
+	debug_printf("dup2(%d, %d)\n", filedes, filedes2);
+	if (__darwintrace_fd != -2 && filedes2 == __darwintrace_fd) {
+		errno = EBADF;
+		return -1;
+	}
+
+	return dup2(filedes, filedes2);
+#undef dup2
+}
+
+
+/* Trap attempts to unlink a file outside the sandbox. */
 int unlink(const char* path) {
 #define __unlink(x) syscall(SYS_unlink, (x))
-	int result = 0;
-	int isInSandbox = __darwintrace_is_in_sandbox(path, 0);
-	if (isInSandbox == 1) {
-		debug_printf("darwintrace: unlink was allowed at %s\n", path);
-	} else if (isInSandbox == 0) {
-		/* outside sandbox, but sandbox is defined: forbid */
-		debug_printf("darwintrace: unlink was forbidden at %s\n", path);
+	char newpath[MAXPATHLEN];
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		debug_printf("unlink %s was forbidden\n", path);
 		errno = EACCES;
-		result = -1;
+		return -1;
 	}
-	
-	if (result == 0) {
-		result = __unlink(path);
+
+	if (*newpath) {
+		path = newpath;
 	}
-	
-	return result;
+
+	debug_printf("unlink %s was allowed\n", path);
+
+	return __unlink(path);
 }
 
 /* Trap attempts to create directories outside the sandbox.
  */
 int mkdir(const char* path, mode_t mode) {
 #define __mkdir(x,y) syscall(SYS_mkdir, (x), (y))
-	int result = 0;
-	int isInSandbox = __darwintrace_is_in_sandbox(path, 0);
-	if (isInSandbox == 1) {
-		debug_printf("darwintrace: mkdir was allowed at %s\n", path);
-	} else if (isInSandbox == 0) {
-		/* outside sandbox, but sandbox is defined: forbid */
-		/* only consider directories that do not exist. */
-		struct stat theInfo;
-		int err;
-		err = lstat(path, &theInfo);
-		if ((err == -1) && (errno == ENOENT))
-		{
-			debug_printf("darwintrace: mkdir was forbidden at %s\n", path);
-			errno = EACCES;
-			result = -1;
-		} /* otherwise, mkdir will do nothing (directory exists) or fail
-		     (another error) */
+	char newpath[MAXPATHLEN];
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		struct stat st;
+		if (-1 == lstat(path, &st)) {
+			if (errno == ENOENT) {
+				/* directory doesn't exist yet */
+				debug_printf("mkdir was forbidden at %s\n", path);
+				errno = EACCES;
+				return -1;
+			}
+		}
+		/* otherwise, mkdir will do nothing or fail with a hopefully meaningful
+		 * error */
+	} else {
+		if (*newpath) {
+			path = newpath;
+		}
+
+		debug_printf("mkdir was allowed at %s\n", path);
 	}
-	
-	if (result == 0) {
-		result = __mkdir(path, mode);
-	}
-	
-	return result;
+
+	return __mkdir(path, mode);
 }
 
 /* Trap attempts to remove directories outside the sandbox.
  */
 int rmdir(const char* path) {
 #define __rmdir(x) syscall(SYS_rmdir, (x))
-	int result = 0;
-	int isInSandbox = __darwintrace_is_in_sandbox(path, 0);
-	if (isInSandbox == 1) {
-		debug_printf("darwintrace: rmdir was allowed at %s\n", path);
-	} else if (isInSandbox == 0) {
-		/* outside sandbox, but sandbox is defined: forbid */
-		debug_printf("darwintrace: removing directory %s was forbidden\n", path);
+	if (!__darwintrace_is_in_sandbox(path, NULL)) {
+		debug_printf("removing directory %s was forbidden\n", path);
 		errno = EACCES;
-		result = -1;
+		return -1;
 	}
-	
-	if (result == 0) {
-		result = __rmdir(path);
-	}
-	
-	return result;
+
+	debug_printf("rmdir %s was allowed\n", path);
+
+	return __rmdir(path);
 }
 
 /* Trap attempts to rename files/directories outside the sandbox.
  */
 int rename(const char* from, const char* to) {
 #define __rename(x,y) syscall(SYS_rename, (x), (y))
-	int result = 0;
-	int isInSandbox = __darwintrace_is_in_sandbox(from, 0);
-	if (isInSandbox == 1) {
-		debug_printf("darwintrace: rename was allowed at %s\n", from);
-	} else if (isInSandbox == 0) {
-		/* outside sandbox, but sandbox is defined: forbid */
-		debug_printf("darwintrace: renaming from %s was forbidden\n", from);
+	if (!__darwintrace_is_in_sandbox(from, NULL)) {
+		/* outside sandbox, forbid */
+		debug_printf("renaming from %s was forbidden\n", from);
 		errno = EACCES;
-		result = -1;
+		return -1;
 	}
+	if (!__darwintrace_is_in_sandbox(to, NULL)) {
+		debug_printf("renaming to %s was forbidden\n", to);
+		errno = EACCES;
+		return -1;
+	}
 
-	if (result == 0) {
-		isInSandbox = __darwintrace_is_in_sandbox(to, 0);
-		if (isInSandbox == 1) {
-			debug_printf("darwintrace: rename was allowed at %s\n", to);
-		} else if (isInSandbox == 0) {
-			/* outside sandbox, but sandbox is defined: forbid */
-			debug_printf("darwintrace: renaming to %s was forbidden\n", to);
-			errno = EACCES;
-			result = -1;
-		}
-	}
-	
-	if (result == 0) {
-		result = __rename(from, to);
-	}
-	
-	return result;
+	debug_printf("renaming from %s to %s was allowed\n", from, to);
+
+	return __rename(from, to);
 }
 
-int stat(const char * path, struct stat * sb)
-{
+int stat(const char * path, struct stat * sb) {
 #define stat(path, sb) syscall(SYS_stat, path, sb)
-	int result=0;
-	char newpath[260];
-		
-	*newpath=0;
-	if(!is_directory(path)&&__darwintrace_is_in_sandbox(path, newpath)==0)
-	{
-		errno=ENOENT;
-		result=-1;
-	}else
-	{
-		if(*newpath)
-			path=newpath;
-			
-		result=stat(path, sb);
+	int result = 0;
+	char newpath[MAXPATHLEN];
+
+	debug_printf("stat(%s)\n", path);
+	if (-1 == (result = stat(path, sb))) {
+		return -1;
 	}
-	
+
+	if (S_ISDIR(sb->st_mode)) {
+		return result;
+	}
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	if (*newpath) {
+		result = stat(newpath, sb);
+	}
+
 	return result;
 #undef stat
 }
 
 #if defined(__DARWIN_64_BIT_INO_T) && !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)
 
-int stat64(const char * path, struct stat64 * sb)
-{
+int stat64(const char * path, struct stat64 * sb) {
 #define stat64(path, sb) syscall(SYS_stat64, path, sb)
-	int result=0;
-	char newpath[260];
-		
-	*newpath=0;
-	if(!is_directory(path)&&__darwintrace_is_in_sandbox(path, newpath)==0)
-	{
-		errno=ENOENT;
-		result=-1;
-	}else
-	{
-		if(*newpath)
-			path=newpath;
-			
-		result=stat64(path, sb);
+	int result = 0;
+	char newpath[MAXPATHLEN];
+
+	debug_printf("stat64(%s)\n", path);
+	if (-1 == (result = stat64(path, sb))) {
+		return -1;
 	}
-	
+
+	if (S_ISDIR(sb->st_mode)) {
+		return result;
+	}
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	if (*newpath) {
+		result = stat64(newpath, sb);
+	}
+
 	return result;
 #undef stat64
 }
 
-int stat$INODE64(const char * path, struct stat64 * sb)
-{
+int stat$INODE64(const char * path, struct stat64 * sb) {
     return stat64(path, sb);
 }
 
 #endif /* defined(__DARWIN_64_BIT_INO_T) && !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE) */
 
 
-int lstat(const char * path, struct stat * sb)
-{
+int lstat(const char * path, struct stat * sb) {
 #define lstat(path, sb) syscall(SYS_lstat, path, sb)
-	int result=0;
-	char newpath[260];
-	
-	*newpath=0;
-	if(!is_directory(path)&&__darwintrace_is_in_sandbox(path, newpath)==0)
-	{
-		errno=ENOENT;
-		result=-1;
-	}else
-	{
-		if(*newpath)
-			path=newpath;
-			
-		result=lstat(path, sb);
+	int result = 0;
+	char newpath[MAXPATHLEN];
+
+	debug_printf("lstat(%s)\n", path);
+	if (-1 == (result = lstat(path, sb))) {
+		return -1;
 	}
-	
+
+	if (S_ISDIR(sb->st_mode)) {
+		return result;
+	}
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	if (*newpath) {
+		result = lstat(newpath, sb);
+	}
+
 	return result;
 #undef lstat
 }
 
 #if defined(__DARWIN_64_BIT_INO_T) && !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)
 
-int lstat64(const char * path, struct stat64 * sb)
-{
+int lstat64(const char * path, struct stat64 * sb) {
 #define lstat64(path, sb) syscall(SYS_lstat64, path, sb)
-	int result=0;
-	char newpath[260];
-	
-	*newpath=0;
-	if(!is_directory(path)&&__darwintrace_is_in_sandbox(path, newpath)==0)
-	{
-		errno=ENOENT;
-		result=-1;
-	}else
-	{
-		if(*newpath)
-			path=newpath;
-			
-		result=lstat64(path, sb);
+	int result = 0;
+	char newpath[MAXPATHLEN];
+
+	debug_printf("lstat64(%s)\n", path);
+	if (-1 == (result = lstat64(path, sb))) {
+		return -1;
 	}
-	
+
+	if (S_ISDIR(sb->st_mode)) {
+		return result;
+	}
+
+	*newpath = '\0';
+	if (!__darwintrace_is_in_sandbox(path, newpath)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	if (*newpath) {
+		result = lstat64(newpath, sb);
+	}
+
 	return result;
 #undef lstat64
 }
 
-int lstat$INODE64(const char * path, struct stat64 * sb)
-{
+int lstat$INODE64(const char * path, struct stat64 * sb) {
     return lstat64(path, sb);
 }
 
 #endif /* defined(__DARWIN_64_BIT_INO_T) && !defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE) */
+
+/**
+ * re-implementation of getdirent(2) and __getdirent64(2) preventing paths
+ * outside the sandbox to show up when reading the contents of a directory.
+ * Unfortunately, since we need to access the contents of the buffer, but the
+ * contents differ by architecture, we can not rely on the dirent structure
+ * defined by the header included by this program, because we don't know
+ * whether darwintrace.dylib has been compiled for 64bit or 32bit inodes. We
+ * thus copy both structs and decide at runtime.
+ */
+
+#ifdef __APPLE__
+/* only do this on mac, because fcntl(fd, F_GETPATH) might not be available on
+ * other systems, and because other system's syscall names are probably
+ * different anyway */
+
+#pragma pack(4)
+struct dirent32 {
+	ino_t d_ino;			/* file number of entry */
+	__uint16_t d_reclen;		/* length of this record */
+	__uint8_t  d_type; 		/* file type, see below */
+	__uint8_t  d_namlen;		/* length of string in d_name */
+	char d_name[__DARWIN_MAXNAMLEN + 1];	/* name must be no longer than this */
+};
+#pragma pack()
+
+struct dirent64  {
+	__uint64_t  d_ino;      /* file number of entry */
+	__uint64_t  d_seekoff;  /* seek offset (optional, used by servers) */
+	__uint16_t  d_reclen;   /* length of this record */
+	__uint16_t  d_namlen;   /* length of string in d_name */
+	__uint8_t   d_type;     /* file type, see below */
+	char      d_name[__DARWIN_MAXPATHLEN]; /* entry name (up to MAXPATHLEN bytes) */
+};
+
+size_t __getdirentries64(int fd, void *buf, size_t bufsize, __darwin_off_t *basep) {
+#define __getdirentries64(w,x,y,z) syscall(SYS_getdirentries64, (w), (x), (y), (z))
+	size_t sz = __getdirentries64(fd, buf, bufsize, basep);
+	char dirname[MAXPATHLEN];
+	size_t dnamelen;
+
+	if (-1 == fcntl(fd, F_GETPATH, dirname)) {
+		errno = EBADF;
+		return 0;
+	}
+
+	dnamelen = strlen(dirname);
+	if (dirname[dnamelen - 1] != '/') {
+		dirname[dnamelen] = '/';
+		dirname[dnamelen + 1] = '\0';
+		dnamelen++;
+	}
+
+	dnamelen = strlen(dirname);
+	size_t offset;
+	for (offset = 0; offset < sz;) {
+		struct dirent64 *dent = (struct dirent64 *)(((char *) buf) + offset);
+		dirname[dnamelen] = '\0';
+		strcat(dirname, dent->d_name);
+		if (!__darwintrace_is_in_sandbox(dirname, NULL)) {
+			debug_printf("__getdirentries64: filtered %s\n", dirname);
+			dent->d_ino = 0;
+		} else {
+			debug_printf("__getdirentries64:  allowed %s\n", dirname);
+		}
+		offset += dent->d_reclen;
+	}
+
+	return sz;
+#undef __getdirentries64
+}
+
+int getdirentries(int fd, char *buf, int nbytes, long *basep) {
+#define getdirentries(w,x,y,z) syscall(SYS_getdirentries, (w), (x), (y), (z))
+	size_t sz = getdirentries(fd, buf, nbytes, basep);
+	char dirname[MAXPATHLEN];
+	size_t dnamelen;
+
+	if (-1 == fcntl(fd, F_GETPATH, dirname)) {
+		errno = EBADF;
+		return 0;
+	}
+
+	dnamelen = strlen(dirname);
+	if (dirname[dnamelen - 1] != '/') {
+		dirname[dnamelen] = '/';
+		dirname[dnamelen + 1] = '\0';
+		dnamelen++;
+	}
+
+	size_t offset;
+	for (offset = 0; offset < sz;) {
+		struct dirent32 *dent = (struct dirent32 *)(buf + offset);
+		dirname[dnamelen] = '\0';
+		strcat(dirname, dent->d_name);
+		if (!__darwintrace_is_in_sandbox(dirname, NULL)) {
+			debug_printf("getdirentries: filtered %s\n", dirname);
+			dent->d_ino = 0;
+		} else {
+			debug_printf("getdirentries:  allowed %s\n", dirname);
+		}
+		offset += dent->d_reclen;
+	}
+
+	return sz;
+#undef getdirentries
+}
+#endif /* __APPLE__ */

Modified: branches/pixilla-mysqls-55/base/src/macports1.0/macports.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/macports1.0/macports.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/macports1.0/macports.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3404,12 +3404,16 @@
 }
 
 # upgrade API wrapper procedure
-# return codes: 0 = success, 1 = general failure, 2 = port name not found in index
+# return codes:
+#   0 = success
+#   1 = general failure
+#   2 = port name not found in index
+#   3 = port not installed
 proc macports::upgrade {portname dspec variationslist optionslist {depscachename ""}} {
     # only installed ports can be upgraded
     if {![registry::entry_exists_for_name $portname]} {
         ui_error "$portname is not installed"
-        return 1
+        return 3
     }
     if {![string match "" $depscachename]} {
         upvar $depscachename depscache
@@ -4372,8 +4376,8 @@
                 }
                 if {[llength $result] < 2} {
                     ui_warn "No port $portname found in the index; can't rebuild"
-                    unset broken_files_by_port($port)
-                    continue
+                    ui_warn "Either your portindex is corrupt or $portname has been removed; consider uninstalling it."
+                    error "Port $portname not found in index"
                 }
             }
             if {![info exists broken_port_counts($portname)]} {

Modified: branches/pixilla-mysqls-55/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/package1.0/portarchivefetch.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/package1.0/portarchivefetch.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -295,6 +295,7 @@
     if {[info exists all_archive_files] && [llength $all_archive_files] > 0} {
         ui_msg "$UI_PREFIX [format [msgcat::mc "Fetching archive for %s"] $subport]"
     }
+    portfetch::check_dns
 }
 
 # Main archive fetch routine

Modified: branches/pixilla-mysqls-55/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/pixilla-mysqls-55/base/src/pextlib1.0/Pextlib.c	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/pextlib1.0/Pextlib.c	2012-12-01 21:28:45 UTC (rev 100174)
@@ -46,6 +46,7 @@
 #include <fcntl.h>
 #include <grp.h>
 #include <limits.h>
+#include <netdb.h>
 #include <pwd.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -568,6 +569,34 @@
 }
 #endif
 
+/* Check if the configured DNS server(s) incorrectly return a result for
+   a nonexistent hostname. Returns true if broken, false if OK. */
+int CheckBrokenDNSCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc UNUSED, Tcl_Obj *CONST objv[] UNUSED)
+{
+    static int already_checked = 0;
+    Tcl_Obj *tcl_result;
+    int broken = 0;
+    struct addrinfo *res = NULL;
+    int error;
+
+    /* Only do the actual test once per run. */
+    if (!already_checked) {
+        error = getaddrinfo("invalid-host.macports.org", NULL, NULL, &res);
+        if (!error) {
+            broken = 1;
+        }
+        if (res) {
+            freeaddrinfo(res);
+        }
+    
+        already_checked = 1;
+    }
+
+    tcl_result = Tcl_NewBooleanObj(broken);
+    Tcl_SetObjResult(interp, tcl_result);
+    return TCL_OK;
+}
+
 int Pextlib_Init(Tcl_Interp *interp)
 {
     if (Tcl_InitStubs(interp, "8.4", 0) == NULL)
@@ -630,6 +659,8 @@
     Tcl_CreateObjCommand(interp, "isatty", IsattyCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "term_get_size", TermGetSizeCmd, NULL, NULL);
 
+    Tcl_CreateObjCommand(interp, "check_broken_dns", CheckBrokenDNSCmd, NULL, NULL);
+
     if (Tcl_PkgProvide(interp, "Pextlib", "1.0") != TCL_OK)
         return TCL_ERROR;
 

Modified: branches/pixilla-mysqls-55/base/src/pextlib1.0/md_wrappers.h
===================================================================
--- branches/pixilla-mysqls-55/base/src/pextlib1.0/md_wrappers.h	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/pextlib1.0/md_wrappers.h	2012-12-01 21:28:45 UTC (rev 100174)
@@ -79,5 +79,15 @@
     return algo##End(&ctx, buf);						\
 }
 
+#define CHECKSUMData(algo, ctxtype)						\
+static char *algo##Data(const u_char *str, u_int32_t len, char *buf)		\
+{														\
+    ctxtype ctx;										\
+														\
+    algo##Init(&ctx);									\
+    algo##Update(&ctx,str,len);					        \
+    return algo##End(&ctx, buf);						\
+}
+
 #endif
 /* _MD_WRAPPERS_H */

Modified: branches/pixilla-mysqls-55/base/src/pextlib1.0/rmd160cmd.c
===================================================================
--- branches/pixilla-mysqls-55/base/src/pextlib1.0/rmd160cmd.c	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/pextlib1.0/rmd160cmd.c	2012-12-01 21:28:45 UTC (rev 100174)
@@ -55,6 +55,7 @@
 #include "md_wrappers.h"
 CHECKSUMEnd(RIPEMD160_, RIPEMD160_CTX, RIPEMD160_DIGEST_LENGTH)
 CHECKSUMFile(RIPEMD160_, RIPEMD160_CTX)
+CHECKSUMData(RIPEMD160_, RIPEMD160_CTX)
 #else
 /*
  * let's use our own version of rmd160* libraries.
@@ -64,18 +65,22 @@
 #include "rmd160.c"
 #define RIPEMD160_DIGEST_LENGTH 20
 #define RIPEMD160_File(x,y) RMD160File(x,y)
+#define RIPEMD160_Data(x,y,z) RMD160Data(x,y,z)
 
 #include "md_wrappers.h"
 CHECKSUMEnd(RMD160, RMD160_CTX, RIPEMD160_DIGEST_LENGTH)
 CHECKSUMFile(RMD160, RMD160_CTX)
+CHECKSUMData(RMD160, RMD160_CTX)
 #endif
 
 int RMD160Cmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	char *file, *action;
+	char *file, *instr, *action;
+	int inlen;
 	char buf[2*RIPEMD160_DIGEST_LENGTH + 1];
 	const char usage_message[] = "Usage: rmd160 file";
-	const char error_message[] = "Could not open file: ";
+	const char file_error_message[] = "Could not open file: ";
+	const char string_error_message[] = "Could not process string: ";
 	Tcl_Obj *tcl_result;
 
 	if (objc != 3) {
@@ -84,22 +89,33 @@
 	}
 
 	/*
-	 * Only the 'file' action is currently supported
+	 * 'file' and 'string' actions are currently supported
 	 */
 	action = Tcl_GetString(objv[1]);
-	if (strcmp(action, "file") != 0) {
+	if (strcmp(action, "file") == 0) {
+	    file = Tcl_GetString(objv[2]);
+
+        if (!RIPEMD160_File(file, buf)) {
+            tcl_result = Tcl_NewStringObj(file_error_message, sizeof(file_error_message) - 1);
+            Tcl_AppendObjToObj(tcl_result, Tcl_NewStringObj(file, -1));
+            Tcl_SetObjResult(interp, tcl_result);
+            return TCL_ERROR;
+        }
+	} else if (strcmp(action, "string") == 0) {
+	    instr = Tcl_GetStringFromObj(objv[2], &inlen);
+
+	    if (!RIPEMD160_Data((u_char *)instr, (u_int32_t)inlen, buf)) {
+            tcl_result = Tcl_NewStringObj(string_error_message, sizeof(string_error_message) - 1);
+            Tcl_AppendObjToObj(tcl_result, Tcl_NewStringObj(instr, -1));
+            Tcl_SetObjResult(interp, tcl_result);
+            return TCL_ERROR;
+        }
+	} else {
 		tcl_result = Tcl_NewStringObj(usage_message, sizeof(usage_message) - 1);
 		Tcl_SetObjResult(interp, tcl_result);
 		return TCL_ERROR;
 	}
-	file = Tcl_GetString(objv[2]);
-
-	if (!RIPEMD160_File(file, buf)) {
-		tcl_result = Tcl_NewStringObj(error_message, sizeof(error_message) - 1);
-		Tcl_AppendObjToObj(tcl_result, Tcl_NewStringObj(file, -1));
-		Tcl_SetObjResult(interp, tcl_result);
-		return TCL_ERROR;
-	}
+	
 	tcl_result = Tcl_NewStringObj(buf, sizeof(buf) - 1);
 	Tcl_SetObjResult(interp, tcl_result);
 	return TCL_OK;

Modified: branches/pixilla-mysqls-55/base/src/pextlib1.0/tracelib.c
===================================================================
--- branches/pixilla-mysqls-55/base/src/pextlib1.0/tracelib.c	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/pextlib1.0/tracelib.c	2012-12-01 21:28:45 UTC (rev 100174)
@@ -342,7 +342,7 @@
 	
 		t = depends;
 		for (; *t; t += strlen(t) + 1) {
-			fprintf(stderr, "trace: %s =?= %s\n", t, port);
+			/* fprintf(stderr, "trace: %s =?= %s\n", t, port); */
 			if (!strcmp(t, port)) {
 				resolution = '+';
 				break;

Modified: branches/pixilla-mysqls-55/base/src/port/port.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/port/port.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/port/port.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -297,7 +297,8 @@
     switch -- $field {
         variant -
         platform -
-        maintainer {
+        maintainer -
+        subport {
             set field "${field}s"
         }
         category {
@@ -1140,7 +1141,43 @@
     return [portlist_sort $results]
 }
 
+proc get_subports {portname} {
+    global global_variations
 
+    # look up portname
+    if {[catch {mportlookup $portname} result]} {
+        ui_debug "$::errorInfo"
+        return -code error "lookup of portname $portname failed: $result"
+    }
+    if {[llength $result] < 2} {
+        return -code error "Port $portname not found"
+    }
+    array unset portinfo
+    array set portinfo [lindex $result 1]
+    set porturl $portinfo(porturl)
+
+    # open portfile
+    if {[catch {set mport [mportopen $porturl [list subport $portinfo(name)] [array get global_variations]]} result]} {
+        ui_debug "$::errorInfo"
+        return -code error "Unable to open port: $result"
+    }
+    array unset portinfo
+    array set portinfo [mportinfo $mport]
+    mportclose $mport
+
+    # gather its subports
+    set results {}
+
+    if {[info exists portinfo(subports)]} {
+        foreach subport $portinfo(subports) {
+            add_to_portlist results [list name $subport]
+        }
+    }
+
+    return [portlist_sort $results]
+}
+
+
 ##########################################
 # Port expressions
 ##########################################
@@ -1325,6 +1362,8 @@
         ^depends_fetch:     -
         ^replaced_by:       -
         ^revision:          -
+        ^subport:           -
+        ^subports:          -
         ^license:           { # Handle special port selectors
             advance
 
@@ -1379,6 +1418,17 @@
             set el 1
         }
 
+        ^subportof:         {
+            advance
+
+            # Break up the token, because older Tcl switch doesn't support -matchvar
+            regexp {^(\w+):(.*)} $token matchvar selector portname
+
+            add_multiple_ports reslist [get_subports $portname]
+
+            set el 1
+        }
+
         [][?*]              { # Handle portname glob patterns
             advance; add_multiple_ports reslist [get_matching_ports $token no glob]
             set el 1
@@ -2593,16 +2643,17 @@
     foreachport $portlist {
         if {![info exists depscache(port:$portname)]} {
             set status [macports::upgrade $portname "port:$portname" [array get requested_variations] [array get options] depscache]
-            # status 2 means the port was not found in the index
-            if {$status != 0 && $status != 2 && ![macports::ui_isset ports_processall]} {
+            # status 2 means the port was not found in the index,
+            # status 3 means the port is not installed
+            if {$status != 0 && $status != 2 && $status != 3 && ![macports::ui_isset ports_processall]} {
                 break
             }
         }
     }
     
-    if {$status != 0} {
+    if {$status != 0 && $status != 2 && $status != 3} {
         print_tickets_url
-    } else {
+    } elseif {$status == 0} {
         array set options $opts
         if {![info exists options(ports_upgrade_no-rev-upgrade)] && ${macports::revupgrade_autorun} && ![macports::global_option_isset ports_dryrun]} {
             set status [action_revupgrade $action $portlist $opts]

Modified: branches/pixilla-mysqls-55/base/src/port1.0/fetch_common.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/port1.0/fetch_common.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/port1.0/fetch_common.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -339,3 +339,11 @@
 
     return $urls
 }
+
+# warn if DNS is broken
+proc portfetch::check_dns {} {
+    # check_broken_dns returns true at most once, so we don't have to worry about spamming this message
+    if {[check_broken_dns]} {
+        ui_warn "Your DNS server(s) incorrectly claim to know the address of nonexistent hosts. This may cause checksum mismatches for some ports."
+    }
+}

Modified: branches/pixilla-mysqls-55/base/src/port1.0/portchecksum.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/port1.0/portchecksum.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/port1.0/portchecksum.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -280,6 +280,8 @@
                     && "text/html" == $mimetype} {
                     # file --mime-type would be preferable to file --mime and strsed, but is only available as of Snow Leopard
                     set wrong_mimetype yes
+                    set htmlfile_path ${fullpath}.html
+                    file rename -force $fullpath $htmlfile_path
                 }
             }
 
@@ -291,10 +293,6 @@
 
     if {[tbool fail]} {
 
-        # Show the desired checksum line for easy cut-paste
-        ui_info "The correct checksum line may be:"
-        ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]]
-
         if {[tbool wrong_mimetype]} {
             # We got an HTML file, though the distfile name does not suggest that one was
             # expected. Probably a helpful DNS server sent us to its search results page
@@ -305,6 +303,11 @@
             ui_notice "for the checksum mismatch:"
             ui_notice "<https://trac.macports.org/wiki/MisbehavingServers>"
             ui_notice "***"
+            ui_notice "The file has been moved to: $htmlfile_path"
+        } else {
+            # Show the desired checksum line for easy cut-paste
+            ui_info "The correct checksum line may be:"
+            ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]]
         }
 
         return -code error "[msgcat::mc "Unable to verify file checksums"]"

Modified: branches/pixilla-mysqls-55/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/port1.0/portfetch.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/port1.0/portfetch.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -598,6 +598,8 @@
             }
         }
     }
+
+    portfetch::check_dns
 }
 
 # Main fetch routine

Modified: branches/pixilla-mysqls-55/base/src/port1.0/portsandbox.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/port1.0/portsandbox.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/port1.0/portsandbox.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -83,8 +83,10 @@
     }
 
     set portsandbox_profile "(version 1) (allow default) (deny file-write*) \
-(allow file-write-data (literal \"/dev/null\")) (allow file-write* (regex #\"^(/private)?(/var)?/tmp/\" \
-#\"^(/private)?/var/folders/\"))"
+(allow file-write-data (literal \"/dev/null\") (literal \"/dev/dtracehelper\") \
+(literal \"/dev/tty\") (literal \"/dev/stdin\") (literal \"/dev/stdout\") \
+(literal \"/dev/stderr\") (regex #\"^/dev/fd/\")) (allow file-write* \
+(regex #\"^(/private)?(/var)?/tmp/\" #\"^(/private)?/var/folders/\"))"
 
     foreach dir $allow_dirs {
         append portsandbox_profile " (allow file-write* ("

Modified: branches/pixilla-mysqls-55/base/src/port1.0/porttrace.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/port1.0/porttrace.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/port1.0/porttrace.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -141,7 +141,7 @@
     # Get the list of violations.
     set violations [slave_send porttrace::slave_get_sandbox_violations]
 
-    foreach violation [lsort $violations] {
+    foreach violation [lsort -unique $violations] {
         ui_warn "An activity was attempted outside sandbox: $violation"
     }
 }
@@ -175,14 +175,13 @@
 # Private
 # Create the slave thread.
 proc porttrace::create_slave {workpath trace_fifo} {
-    global trace_thread prefix developer_dir
+    global trace_thread prefix developer_dir registry.path
     # Create the thread.
     set trace_thread [macports_create_thread]
 
-    # The slave thread requires the registry package.
-    thread::send $trace_thread "package require registry 1.0"
-    # and this file as well.
+    # The slave thred needs this file and macports 1.0
     thread::send $trace_thread "package require porttrace 1.0"
+    thread::send $trace_thread "package require macports 1.0"
     # slave needs ui_{info,warn,debug,error}...
     # make sure to sync this with ../pextlib1.0/tracelib.c!
     thread::send $trace_thread "macports::ui_init debug"
@@ -191,6 +190,10 @@
     thread::send $trace_thread "macports::ui_init error"
     # and these variables
     thread::send $trace_thread "set prefix \"$prefix\"; set developer_dir \"$developer_dir\""
+    # The slave thread requires the registry package.
+    thread::send $trace_thread "package require registry 1.0"
+    # and an open registry
+    thread::send $trace_thread "registry::open [file join ${registry.path} registry registry.db]"
 
     # Initialize the slave
     thread::send $trace_thread "porttrace::slave_init $trace_fifo $workpath"

Modified: branches/pixilla-mysqls-55/base/src/port1.0/portutil.tcl
===================================================================
--- branches/pixilla-mysqls-55/base/src/port1.0/portutil.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/base/src/port1.0/portutil.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2398,7 +2398,17 @@
 # return filename of the archive for this port
 proc get_portimage_name {} {
     global portdbpath subport version revision portvariants os.platform os.major portarchivetype
-    return "${subport}-${version}_${revision}${portvariants}.${os.platform}_${os.major}.[join [get_canonical_archs] -].${portarchivetype}"
+    set ret "${subport}-${version}_${revision}${portvariants}.${os.platform}_${os.major}.[join [get_canonical_archs] -].${portarchivetype}"
+    # should really look up NAME_MAX here, but it's 255 for all OS X so far
+    # (leave 10 chars for an extension like .rmd160 on the sig file)
+    if {[string length $ret] > 245 && ${portvariants} != ""} {
+        # try hashing the variants
+        set ret "${subport}-${version}_${revision}+[rmd160 string ${portvariants}].${os.platform}_${os.major}.[join [get_canonical_archs] -].${portarchivetype}"
+    }
+    if {[string length $ret] > 245} {
+        error "filename too long: $ret"
+    }
+    return $ret
 }
 
 # return path where a newly created image/archive for this port will be stored

Modified: branches/pixilla-mysqls-55/doc-new/guide/xml/project.xml
===================================================================
--- branches/pixilla-mysqls-55/doc-new/guide/xml/project.xml	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/doc-new/guide/xml/project.xml	2012-12-01 21:28:45 UTC (rev 100174)
@@ -21,8 +21,21 @@
 
       <itemizedlist>
         <listitem>
-          <para>Check the Problem HotList</para>
+          <para>Clean and try again</para>
           <para>
+            If a build fails or is otherwise interrupted, and you try again,
+            MacPorts tries to pick up where it left off. Sometimes this causes
+            new problems, and even if it doesn't, it means that log messages
+            from earlier steps, which can be essential for figuring out why a
+            build failed, are not included in the new log; MacPorts prints
+            "Skipping completed" in the log for each previously-completed phase
+            that was skipped. Before filing a ticket, "sudo port clean" the
+            port that failed, then try again.
+          </para>
+        </listitem>
+        <listitem>
+          <para>Check the problem hotlist</para>
+          <para>
             The <ulink
               url="https://trac.macports.org/wiki/ProblemHotlist">Problem
               Hotlist</ulink> contains possible solutions to problems that


Property changes on: branches/pixilla-mysqls-55/dports
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
   + /branches/mld-qt-481/dports:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports:99672-100173

Modified: branches/pixilla-mysqls-55/dports/_resources/port1.0/fetch/mirror_sites.tcl
===================================================================
--- branches/pixilla-mysqls-55/dports/_resources/port1.0/fetch/mirror_sites.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/_resources/port1.0/fetch/mirror_sites.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -423,7 +423,6 @@
     http://jaist.dl.sourceforge.net/
     http://nchc.dl.sourceforge.net/
     http://netcologne.dl.sourceforge.net/
-    http://space.dl.sourceforge.net/
     http://superb-dca2.dl.sourceforge.net/
     http://superb-dca3.dl.sourceforge.net/
     http://switch.dl.sourceforge.net/

Modified: branches/pixilla-mysqls-55/dports/_resources/port1.0/group/active_variants-1.0.tcl
===================================================================
--- branches/pixilla-mysqls-55/dports/_resources/port1.0/group/active_variants-1.0.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/_resources/port1.0/group/active_variants-1.0.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,4 +1,4 @@
-# $Id: haskell-1.0.tcl 96776 2012-08-19 05:52:01Z blair at macports.org $
+# $Id$
 #
 # Copyright (c) 2012 The MacPorts Project
 # All rights reserved.


Property changes on: branches/pixilla-mysqls-55/dports/_resources/port1.0/group/active_variants-1.0.tcl
___________________________________________________________________
Deleted: svn:keywods
   - 
Added: svn:keywords
   + Id

Modified: branches/pixilla-mysqls-55/dports/_resources/port1.0/group/cmake-1.0.tcl
===================================================================
--- branches/pixilla-mysqls-55/dports/_resources/port1.0/group/cmake-1.0.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/_resources/port1.0/group/cmake-1.0.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,8 +1,8 @@
 # -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
-
+#
 # Copyright (c) 2009 Orville Bennett <illogical1 at gmail.com>
-# Copyright (c) 2010 The MacPorts Project
+# Copyright (c) 2010-2012 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,22 +51,32 @@
                     -DCMAKE_BUILD_TYPE=Release \
                     -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
                     -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
-                    -DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
+                    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
                     -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
                     -Wno-dev
 
-pre-configure {
-    if {${os.platform} == "darwin" && (![variant_isset universal] || ![variant_exists universal])} {
-        configure.args-append \
-            -DCMAKE_OSX_ARCHITECTURES=\"${configure.build_arch}\"
+platform darwin {
+    pre-configure {
+        if {[variant_exists universal] && [variant_isset universal]} {
+            if {[info exists universal_archs_supported]} {
+                global merger_configure_args
+                foreach arch ${universal_archs_to_use} {
+                    lappend merger_configure_args(${arch}) -DCMAKE_OSX_ARCHITECTURES=${arch}
+                }
+            } else {
+                configure.universal_args-append \
+                    -DCMAKE_OSX_ARCHITECTURES="[join ${configure.universal_archs} \;]"
+            }
+        } else {
+            configure.args-append \
+                -DCMAKE_OSX_ARCHITECTURES="${configure.build_arch}"
+        }
+        if {${configure.sdkroot} != ""} {
+            configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
+        } else {
+            configure.args-append -DCMAKE_OSX_SYSROOT=/
+        }
     }
-    configure.universal_args-append \
-        -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
-    if {${configure.sdkroot} != ""} {
-        configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
-    } else {
-        configure.args-append -DCMAKE_OSX_SYSROOT=/
-    }
 }
 
 configure.universal_args-delete --disable-dependency-tracking

Copied: branches/pixilla-mysqls-55/dports/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl (from rev 100173, trunk/dports/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl)
===================================================================
--- branches/pixilla-mysqls-55/dports/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/_resources/port1.0/group/compiler_blacklist_versions-1.0.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,135 @@
+# -*- 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$
+#
+# Copyright (c) 2012 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.
+#
+#
+# Including this PortGroup in a Portfile enhances the compiler.blacklist option
+# to support blacklisting only specific build numbers of the given compiler.
+#
+# Examples:
+#
+# Blacklist only clang build numbers less than 318.0.61:
+# compiler.blacklist-append {clang < 318.0.61}
+#
+# Blacklist only clang build numbers greater than or equal to 421.11.66:
+# compiler.blacklist-append {clang >= 421.11.66}
+#
+# Blacklist only clang build numbers greater than or equal to 421.11.66 but less than 444:
+# compiler.blacklist-append {clang >= 421.11.66 < 444}
+#
+# Blacklist all versions of clang (same as without this PortGroup):
+# compiler.blacklist-append clang
+#
+# Known limitations:
+#
+# Trying to remove an enhanced compiler.blacklist specification will not work
+# (it will silently do nothing):
+# compiler.blacklist-delete {clang >= 421.11.66}
+# Workaround:
+# compiler.blacklist-delete clang
+#
+# This PortGroup was created following this discussion:
+# http://lists.macosforge.org/pipermail/macports-dev/2012-November/021103.html
+
+option_proc compiler.blacklist compiler_blacklist_versions._set_compiler_blacklist
+
+proc compiler_blacklist_versions._set_compiler_blacklist {option action args} {
+    if {"set" != ${action}} return
+    foreach blacklist [option ${option}] {
+        if {[llength ${blacklist}] > 1} {
+            compiler.blacklist-delete ${blacklist}
+            set compiler [lindex ${blacklist} 0]
+            set comparisons [lrange ${blacklist} 1 end]
+            set compiler_version [compiler_blacklist_versions._get_compiler_version ${compiler}]
+            if {[compiler_blacklist_versions._matches_all_versions ${compiler} ${comparisons}]} {
+                if {[string equal ${compiler_version} ""]} {
+                    ui_debug "compiler ${compiler} blacklisted because not installed"
+                } else {
+                    ui_debug "compiler ${compiler} ${compiler_version} blacklisted because matches {${blacklist}}"
+                }
+                compiler.blacklist-append ${compiler}
+            } else {
+                ui_debug "compiler ${compiler} ${compiler_version} not blacklisted because does not match {${blacklist}}"
+            }
+        }
+    }
+}
+
+proc compiler_blacklist_versions._matches_all_versions {compiler comparisons} {
+    if {[llength ${comparisons}] % 2} {
+        return -code error "invalid/incomplete comparison specification “${comparisons}”"
+    }
+    while {[llength ${comparisons}] > 0} {
+        set comparison_operator [lindex ${comparisons} 0]
+        set test_version [lindex ${comparisons} 1]
+        if {![compiler_blacklist_versions._version_matches ${compiler} ${comparison_operator} ${test_version}]} {
+            return 0
+        }
+        set comparisons [lrange ${comparisons} 2 end]
+    }
+    return 1
+}
+
+proc compiler_blacklist_versions._version_matches {compiler comparison_operator test_version} {
+    set actual_version [compiler_blacklist_versions._get_compiler_version ${compiler}]
+    if {[string equal ${actual_version} ""]} {
+        return 1
+    }
+    return [expr [vercmp ${actual_version} ${test_version}] ${comparison_operator} 0]
+}
+
+proc compiler_blacklist_versions._get_compiler_version {compiler} {
+    global compiler_blacklist_versions._compiler_versions
+    if {[info exists compiler_blacklist_versions._compiler_versions(${compiler})]} {
+        return [set compiler_blacklist_versions._compiler_versions(${compiler})]
+    }
+    switch ${compiler} {
+        clang {
+            set re {clang-([0-9.]+)}
+        }
+        gcc-4.0 -
+        gcc-4.2 -
+        apple-gcc-4.2 -
+        llvm-gcc-4.2 {
+            set re {build ([0-9.]+)}
+        }
+        default {
+            return -code error "don't know how to determine build number of compiler “${compiler}”"
+        }
+    }
+    set cc [portconfigure::configure_get_compiler cc ${compiler}]
+    if {![file exists ${cc}]} return
+    regexp ${re} [exec ${cc} -v 2>@1] -> compiler_version
+    if {![info exists compiler_version]} {
+        return -code error "couldn't determine build number of compiler “${compiler}”"
+    }
+    set compiler_blacklist_versions._compiler_versions(${compiler}) ${compiler_version}
+    return ${compiler_version}
+}

Modified: branches/pixilla-mysqls-55/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- branches/pixilla-mysqls-55/dports/_resources/port1.0/group/muniversal-1.0.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/_resources/port1.0/group/muniversal-1.0.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,9 +1,7 @@
 # -*- 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
-# muniversal-1.0.tcl
-#
 # $Id$
 #
-# Copyright (c) 2009 The MacPorts Project,
+# Copyright (c) 2009-2012 The MacPorts Project,
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -428,14 +426,14 @@
             xinstall -d -m 0755 ${dir}
 
             foreach fl [glob -directory ${dir2} -tails -nocomplain *] {
-                if { ![file exists ${dir1}/${fl}] } {
+                if { ![muniversal_file_or_symlink_exists ${dir1}/${fl}] } {
                     # File only exists in ${dir1}
                     ui_debug "universal: merge: ${prefixDir}/${fl} only exists in ${base2}"
                     copy ${dir2}/${fl} ${dir}
                 }
             }
             foreach fl [glob -directory ${dir1} -tails -nocomplain *] {
-                if { ![file exists ${dir2}/${fl}] } {
+                if { ![muniversal_file_or_symlink_exists ${dir2}/${fl}] } {
                     # File only exists in ${dir2}
                     ui_debug "universal: merge: ${prefixDir}/${fl} only exists in ${base1}"
                     copy ${dir1}/${fl} ${dir}
@@ -652,3 +650,15 @@
         }
     }
 }
+
+# [muniversal_file_or_symlink_exists ${f}] tells you if ${f} exists. And unlike
+# [file exists ${f}], if used on a symlink, [muniversal_file_or_symlink_exists ${f}]
+# tells you about the symlink, not what it points to.
+proc muniversal_file_or_symlink_exists {f} {
+    # If [file type ${f}] throws an error, ${f} doesn't exist.
+    if {[catch {file type ${f}}]} {
+        return 0
+    }
+    # Otherwise, it does.
+    return 1
+}

Modified: branches/pixilla-mysqls-55/dports/_resources/port1.0/group/php-1.1.tcl
===================================================================
--- branches/pixilla-mysqls-55/dports/_resources/port1.0/group/php-1.1.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/_resources/port1.0/group/php-1.1.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -126,12 +126,22 @@
 }
 
 
-# php.default_branch: the branch of PHP which should be installed if the user
-# installs the stub port. The default is the largest value in php.branches and
-# most ports should not need to change this.
+# php.latest_stable_branch: the latest stable branch of PHP in the php port.
+# Ports should not change this. It should be changed here in this portgroup
+# when the php port is updated.
 
+options php.latest_stable_branch
+default php.latest_stable_branch 5.4
+
+
+# php.default_branch: the branch of PHP for which the port should be installed
+# (i.e. the subport on which a dependency will be declared) if the user
+# installs the stub port. The default is the latest stable branch, if the port
+# supports it, or otherwise the latest listed in ${php.branches}. Ports should
+# not need to change this.
+
 options php.default_branch
-default php.default_branch      {[lindex ${php.branches} end]}
+default php.default_branch      {[expr {[lsearch -exact ${php.branches} ${php.latest_stable_branch}] != -1 ? ${php.latest_stable_branch} : [lindex ${php.branches} end]}]}
 option_proc php.default_branch  php._set_default_branch
 
 proc php._set_default_branch {option action args} {

Modified: branches/pixilla-mysqls-55/dports/_resources/port1.0/group/x11font-1.0.tcl
===================================================================
--- branches/pixilla-mysqls-55/dports/_resources/port1.0/group/x11font-1.0.tcl	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/_resources/port1.0/group/x11font-1.0.tcl	2012-12-01 21:28:45 UTC (rev 100174)
@@ -46,6 +46,7 @@
     name             ${myportname}
     version          ${myportversion}
     categories       x11 x11-font graphics
+    supported_archs  noarch
     homepage         http://www.x.org/
     master_sites     xorg:individual/font/
     use_bzip2        yes

Modified: branches/pixilla-mysqls-55/dports/aqua/AquaLess/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/aqua/AquaLess/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/aqua/AquaLess/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       xcode 1.0
 
 name            AquaLess
-revision        1
+revision        2
 version         1.6
 license         GPL-2+
 categories      aqua sysutils
@@ -20,7 +20,7 @@
     for each text, so you can keep working in the terminal while you read.
 
 homepage        http://aqualess.sourceforge.net/
-master_sites    sourceforge:aqualess
+master_sites    sourceforge:project/aqualess/AquaLess/${version}
 distname        ${name}-${version}-src
 
 supported_archs i386 ppc
@@ -33,9 +33,10 @@
 
 post-destroot {
     if {[vercmp $xcodeversion 4.2] >= 0} {
-        file rename ${destroot}${applications_dir}/aless ${destroot}${prefix}/bin/aless
+        move ${destroot}${applications_dir}/aless ${destroot}${prefix}/bin
     } else {
-        file copy ${worksrcpath}/build/UninstalledProducts/aless ${destroot}${prefix}/bin
+        copy ${worksrcpath}/build/UninstalledProducts/aless ${destroot}${prefix}/bin
+        copy ${worksrcpath}/build/UninstalledProducts/AquaLess.app ${destroot}${applications_dir}
     }
 }
 

Modified: branches/pixilla-mysqls-55/dports/aqua/aquaterm/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/aqua/aquaterm/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/aqua/aquaterm/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,7 +8,7 @@
 github.setup            AquaTerm AquaTerm 1.1.1 v
 name                    aquaterm
 categories              aqua math science
-maintainers             g5pw gmail.com:mojca.miklavec.lists
+maintainers             g5pw mojca
 license                 BSD
 description             AquaTerm is a viewer that displays vector graphics on Mac OS X
 long_description        AquaTerm is a viewer app that displays vector \

Modified: branches/pixilla-mysqls-55/dports/aqua/qt4-mac/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/aqua/qt4-mac/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/aqua/qt4-mac/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -11,8 +11,7 @@
 
 name                qt4-mac
 conflicts           qt3 qt3-mac qt4-mac-devel
-version             4.8.3
-revision            1
+version             4.8.4
 categories          aqua
 platforms           macosx
 maintainers         michaelld openmaintainer
@@ -27,8 +26,8 @@
 master_sites        trolltech
 distname            qt-everywhere-opensource-src-${version}
 
-checksums           sha1    bc352a283610e0cd2fe0dbedbc45613844090fcb \
-                    rmd160  fe56e5da874503a79d6f84a1e15460eba5a6feae
+checksums           sha1    f5880f11c139d7d8d01ecb8d874535f7d9553198 \
+                    rmd160  3c09a3b1411385d0917225f01ac2ff3a2ce83fda
 
 minimum_xcodeversions   {8 2.5}
 
@@ -216,11 +215,6 @@
 patchfiles-append   \
     patch-tools_macdeployqt_shared_shared.cpp.diff
 
-# (25) temporary fix for Mac menu state; will be removed with 4.8.4.
-
-patchfiles-append   \
-    patch-4.8.4-osx-native-menu-state-fix.diff
-
 ###############################################
 
 # disable CCACHE for now (ticket #34856)
@@ -508,6 +502,11 @@
     if {[file exists ${SDK}]} {
         configure.args-append -sdk ${SDK}
     }
+
+    # set which pkg-config to use
+
+    configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config
+
 }
 
 post-configure {
@@ -842,11 +841,29 @@
         eval xinstall -m 644 [split ${files}] ${dest_dir}
     }
 
-    # Move .apps into the applications_dir
+    # Move .apps into the applications_dir, and link each .apps'
+    # executable back into ${qt_bins_dir}
 
-    xinstall -m 755 -d ${destroot}${qt_apps_dir}
-    foreach app [glob ${destroot}/${qt_bins_dir}/*.app] {
-        move ${app} ${destroot}${qt_apps_dir}
+    set dr_qt_apps_dir ${destroot}${qt_apps_dir}
+    set dr_qt_bins_dir ${destroot}${qt_bins_dir}
+
+    xinstall -m 755 -d ${dr_qt_apps_dir}
+    foreach app [glob ${dr_qt_bins_dir}/*.app] {
+
+        # remove the leading stuff
+
+        set app [lindex [split ${app} /] end]
+
+        # move the .app
+
+        move ${dr_qt_bins_dir}/${app} ${dr_qt_apps_dir}
+
+        # link the app's executable back
+
+        set texe [strsed ${app} {g@\.app@@}]
+        ln -s ${qt_apps_dir}/${app}/Contents/MacOS/${texe} \
+            ${dr_qt_bins_dir}
+
     }
 
     # move tests to ${qt_data_dir}
@@ -854,6 +871,46 @@
     xinstall -m 755 -d ${destroot}${qt_data_dir}
     move ${destroot_qt}/tests/qt4 ${destroot}${qt_data_dir}/tests
 
+    # install ${qt_includes_dir}/Qt if not already and it exists in
+    # the build, for support of legacy projects
+
+    if {![file exists ${destroot}${qt_includes_dir}/Qt] &&
+        [file exists ${worksrcpath}/include/Qt]} {
+
+        # copy the Qt headers directory
+
+        copy ${worksrcpath}/include/Qt ${destroot}${qt_includes_dir}
+
+    }
+
+    # if ${qt_includes_dir}/Qt was installed, then replace each header
+    # with a link to its actual header when possible
+
+    if {[file exists ${destroot}${qt_includes_dir}/Qt]} {
+
+        foreach QtH [exec find ${destroot}${qt_includes_dir}/Qt | \
+                         sed -e "1d" -e "s@${destroot}${qt_includes_dir}/Qt/@@g"] {
+
+            # find the header
+
+            set tH [exec find ${destroot}${qt_frameworks_dir} -name ${QtH} | \
+                        sed -e "s@${destroot}@@g"]
+
+            # if found ...
+
+            if {${tH} != ""} {
+
+                # remove this header
+
+                file delete ${destroot}${qt_includes_dir}/Qt/${QtH}
+
+                # link it to the found header
+
+                ln -s ${tH} ${destroot}${qt_includes_dir}/Qt/${QtH}
+
+            }
+        }
+    }
 }
 
 pre-activate {

Deleted: branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-4.8.4-osx-native-menu-state-fix.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-4.8.4-osx-native-menu-state-fix.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-4.8.4-osx-native-menu-state-fix.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,77 +0,0 @@
---- src/gui/widgets/qmenu.cpp.orig
-+++ src/gui/widgets/qmenu.cpp
-@@ -2387,7 +2387,7 @@ void QMenu::changeEvent(QEvent *e)
-         if (d->tornPopup) // torn-off menu
-             d->tornPopup->setEnabled(isEnabled());
-         d->menuAction->setEnabled(isEnabled());
--#ifdef Q_WS_MAC
-+#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
-         if (d->mac_menu)
-             d->setMacMenuEnabled(isEnabled());
- #endif
---- src/gui/widgets/qmenu_mac.mm.orig
-+++ src/gui/widgets/qmenu_mac.mm
-@@ -1554,6 +1554,7 @@ QMenuPrivate::syncSeparatorsCollapsible(bool collapse)
- 
- 
- 
-+#ifndef QT_MAC_USE_COCOA
- /*!
-   \internal
- */
-@@ -1567,26 +1568,16 @@ void QMenuPrivate::setMacMenuEnabled(bool enable)
-         for (int i = 0; i < mac_menu->actionItems.count(); ++i) {
-             QMacMenuAction *menuItem = mac_menu->actionItems.at(i);
-             if (menuItem && menuItem->action && menuItem->action->isEnabled()) {
--#ifndef QT_MAC_USE_COCOA
-                 // Only enable those items which contains an enabled QAction.
-                 // i == 0 -> the menu itself, hence i + 1 for items.
-                 EnableMenuItem(mac_menu->menu, i + 1);
--#else
--                [menuItem->menuItem setEnabled:true];
--#endif
-             }
-         }
-     } else {
--#ifndef QT_MAC_USE_COCOA
-         DisableAllMenuItems(mac_menu->menu);
--#else
--        NSMenu *menu = mac_menu->menu;
--        for (NSMenuItem *item in [menu itemArray]) {
--            [item setEnabled:false];
--        }
--#endif
-     }
- }
-+#endif
- 
- /*!
-     \internal
-@@ -1744,6 +1735,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::syncAction(QMacMenuAction *action)
-         [item setSubmenu: submenu];
-         [submenu setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(action->action->text()))];
-         syncNSMenuItemVisiblity(item, visible);
-+        syncNSMenuItemEnabled(item, action->action->isEnabled());
- #endif
-         if (release_submenu) { //no pointers to it
- #ifndef QT_MAC_USE_COCOA
-@@ -1846,6 +1838,7 @@ OSMenuRef QMenuBarPrivate::macMenu()
-         return 0;
-     } else if (!mac_menubar->menu) {
-         mac_menubar->menu = qt_mac_create_menu(q);
-+        [mac_menubar->menu setAutoenablesItems:NO];
-         ProcessSerialNumber mine, front;
-         if (GetCurrentProcess(&mine) == noErr && GetFrontProcess(&front) == noErr) {
-             if (!qt_mac_no_menubar_merge && !mac_menubar->apple_menu) {
---- src/gui/widgets/qmenu_p.h.orig
-+++ src/gui/widgets/qmenu_p.h
-@@ -327,7 +327,9 @@ public:
-         }
-     } *mac_menu;
-     OSMenuRef macMenu(OSMenuRef merge);
-+#ifndef QT_MAC_USE_COCOA
-     void setMacMenuEnabled(bool enable = true);
-+#endif
-     void syncSeparatorsCollapsible(bool collapsible);
-     static QHash<OSMenuRef, OSMenuRef> mergeMenuHash;
-     static QHash<OSMenuRef, QMenuMergeList*> mergeMenuItemsHash;

Modified: branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,11 +1,11 @@
---- config.tests/unix/compile.test.orig	2012-04-23 14:49:04.000000000 -0400
-+++ config.tests/unix/compile.test	2012-04-17 14:38:16.000000000 -0400
-@@ -68,7 +68,7 @@
- # Make sure output from possible previous tests is gone
+--- config.tests/unix/compile.test.orig	2012-11-23 05:11:21.000000000 -0500
++++ config.tests/unix/compile.test	2012-11-29 12:02:46.000000000 -0500
+@@ -69,7 +69,7 @@
  rm -f "$EXE" "${EXE}.exe"
  
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release app_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CXXFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS*=$CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+ echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache"
+-"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
++"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release app_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CXXFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS*=$CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
  
  if [ "$VERBOSE" = "yes" ]; then
      $MAKE

Modified: branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-configure.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-configure.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/aqua/qt4-mac/files/patch-configure.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,6 @@
---- configure.orig	2012-09-17 11:00:59.000000000 -0400
-+++ configure	2012-09-17 11:01:07.000000000 -0400
-@@ -920,6 +920,7 @@
+--- configure.orig	2012-11-23 05:11:23.000000000 -0500
++++ configure	2012-11-29 12:08:53.000000000 -0500
+@@ -924,6 +924,7 @@
  QT_INSTALL_DOCS=
  QT_INSTALL_HEADERS=
  QT_INSTALL_LIBS=
@@ -8,7 +8,7 @@
  QT_INSTALL_BINS=
  QT_INSTALL_PLUGINS=
  QT_INSTALL_IMPORTS=
-@@ -1380,6 +1381,9 @@
+@@ -1392,6 +1393,9 @@
      libdir)
          QT_INSTALL_LIBS="$VAL"
          ;;
@@ -18,7 +18,7 @@
      qtnamespace)
          QT_NAMESPACE="$VAL"
          ;;
-@@ -3697,6 +3701,19 @@
+@@ -3685,6 +3689,19 @@
      fi
      QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
  
@@ -104,7 +104,7 @@
  	    if [ '!' -z "$CFG_SDK" ]; then
  		echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
  		echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
-@@ -5441,9 +5454,9 @@
+@@ -5511,9 +5524,9 @@
          psql)
              if [ "$CFG_SQL_psql" != "no" ]; then
                  # Be careful not to use native pg_config when cross building.
@@ -117,7 +117,7 @@
                  fi
                  [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
                  [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
-@@ -7097,16 +7110,8 @@
+@@ -7161,16 +7174,8 @@
  
  # set the global Mac deployment target. This is overridden on an arch-by-arch basis
  # in some cases, see code further down
@@ -136,7 +136,7 @@
  
  # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
  case "$XPLATFORM" in
-@@ -7844,28 +7849,28 @@
+@@ -7910,28 +7915,28 @@
  # env. variable. 
  if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
      if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
@@ -181,7 +181,7 @@
      fi
  fi
  
-@@ -8618,6 +8623,7 @@
+@@ -8689,6 +8694,7 @@
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
  QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include

Modified: branches/pixilla-mysqls-55/dports/audio/abcMIDI/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/audio/abcMIDI/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/audio/abcMIDI/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                abcMIDI
-version             2012-11-08
+version             2012-11-26
 categories          audio
 platforms           darwin
 maintainers         mww
@@ -14,8 +14,8 @@
 
 homepage            http://ifdo.pugmarks.com/~seymour/runabc/top.html
 master_sites        http://ifdo.pugmarks.com/~seymour/runabc/
-checksums           rmd160  be3417a57aba5423b80892aac28862519673ccfe \
-                    sha256  c236991106607a28d78422b0fe8dd590a8dc4d91d9b5e26a959a0f9ba8d7c0ba
+checksums           rmd160  cfa86e22024bb0f6465a305390481b992da310a3 \
+                    sha256  f5029a392db7411095e4471f815f9b24267b6fd81bd8632786635274abaad7ff
 patchfiles          patch-makefile.diff
 
 worksrcdir          abcmidi

Modified: branches/pixilla-mysqls-55/dports/audio/gmpc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/audio/gmpc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/audio/gmpc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name            gmpc
-version         0.20.0
-revision        3
+version         11.8.16
 categories      audio
 platforms       darwin
 license         GPL-2+
@@ -17,34 +16,31 @@
     easy to use, but provide full access to all the features MPD provides. Give \
     the user several ways to browse his database while still being a \
     lightweight client.
-homepage        http://gmpclient.org
 
+homepage        http://gmpclient.org
 master_sites    sourceforge:musicpd
-checksums       md5     902fd69b0b6bb40abb647604080dd7ef \
-                sha1    3b160bb1e196760b0148faa6493c66083e1fe53d \
-                rmd160  fd1278dbec1eb7ca2efd1e0545b0e37ff1fad34f
 
+checksums       md5 223aeb000e41697d8fdf54ccedee89d5 \
+                sha1 f61845cb8d9a1c1970ecb65565bd4eefc73b0c0a
+
 depends_build   port:intltool \
                 port:vala \
+                port:gob2 \
                 port:pkgconfig
 depends_lib     port:libmpd \
                 port:libglade2 \
-                port:gob2 \
+                port:libunique \
                 port:gettext \
                 port:zlib \
                 port:openssl \
                 port:curl \
                 port:libsoup
 
-patchfiles      patch-bacon-buffer-overflow.diff
-
-post-patch {
-    # restore timestamp to avoid rebuilding .vala source files
-    system "cd ${worksrcpath} && touch -r src/bacon/bacon-message-connection.h src/bacon/bacon-message-connection.c"
-}
-
 configure.args  --disable-macige
 
+# intltool needs to be run with the correct version of perl
+configure.env-append INTLTOOL_PERL=${prefix}/bin/perl5.12
+
 variant quartz {
     depends_lib-append    port:ige-mac-integration
     configure.args-delete --disable-macige
@@ -53,4 +49,4 @@
 
 livecheck.type regex
 livecheck.url  http://sourceforge.net/projects/musicpd/files/gmpc/
-livecheck.regex {gmpc-(\d+.\d+(?:.\d+))\.tar}
+livecheck.regex {gmpc/(\d+.\d+(?:.\d+))[^-]}

Modified: branches/pixilla-mysqls-55/dports/audio/libmpd/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/audio/libmpd/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/audio/libmpd/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name            libmpd
-version         0.20.0
+version         11.8.17
 categories      audio
 platforms       darwin
 license         GPL-2+
@@ -13,15 +13,16 @@
 description    libmpd provides higher level access to MPD functions.
 long_description \
     libmpd provides higher level access to MPD (Music Player Daemon) functions.
-homepage        http://mpd.wikia.com/wiki/ClientLib:libmpd
 
+homepage        http://gmpclient.org
 master_sites    sourceforge:musicpd
-checksums       md5     2f1c99e12c69f7d95cfd1e27368056ed \
-                sha1    cb7c9b5dff0e7f560a75d1904a97f316347e7d7b \
-                rmd160  d4462aa0fdc01f985f35f7eeaec4b2173b933a91
 
+checksums       md5 5ae3d87467d52aef3345407adb0a2488 \
+                sha1 df129f15061662a6fec1b2ce19f9dbc8b7a7d1ba
+
 depends_build   port:pkgconfig
-depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2
+depends_lib     port:gettext \
+                path:lib/pkgconfig/glib-2.0.pc:glib2
 
 livecheck.type regex
 livecheck.url http://sourceforge.net/api/file/index/project-id/81117/rss?path=%2Flibmpd

Modified: branches/pixilla-mysqls-55/dports/audio/sphinxbase/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/audio/sphinxbase/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/audio/sphinxbase/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+
 name                sphinxbase
 version             0.7
 description         Support library for CMU Sphinx
@@ -11,6 +12,7 @@
 
 maintainers         nomaintainer
 categories          audio
+license             BSD MIT
 platforms           darwin freebsd
 homepage            http://cmusphinx.sourceforge.net/
 master_sites        sourceforge:cmusphinx

Modified: branches/pixilla-mysqls-55/dports/cad/gerbv/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/cad/gerbv/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/cad/gerbv/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,3 +1,4 @@
+# -*- 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
@@ -2,4 +3,3 @@
 name                gerbv
-version             2.4.0
-revision            2
+version             2.6.0
 categories          cad science electronics
@@ -14,18 +14,13 @@
                     The standard supported by gerbv is RS-274X.
 
 homepage            http://gerbv.gpleda.org/
+master_sites        sourceforge:project/gerbv/gerbv/gerbv-${version}
 
-master_sites        sourceforge
-checksums           md5     56431417df2d246db87e225783097d75 \
-                    sha1    f0403ca8345bc765442a976188cff68b4e7bc595 \
-                    rmd160  37c6b05da1c608ac4cd8deff0e57ce91e00e8286
+checksums           rmd160  5f5596689bb7356a35dab19d5c0f51e6ec989212 \
+                    sha256  5c55425c3493bc8407949be8b4e572434a6b378f5727cc0dcef97dc2e7574dd0
 
 depends_build       port:pkgconfig
 depends_lib         port:gtk2 port:libpng
 
 configure.args      --enable-gtk2 \
-                    --mandir=\\\${prefix}/share/man \
                     --disable-update-desktop-database
-
-destroot.destdir    prefix=${destroot}${prefix}
-

Modified: branches/pixilla-mysqls-55/dports/comms/telepathy-haze/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/comms/telepathy-haze/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/comms/telepathy-haze/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -41,4 +41,4 @@
 
 livecheck.type  regex
 livecheck.url   ${master_sites}
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
+livecheck.regex ${name}-(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*)${extract.suffix}

Modified: branches/pixilla-mysqls-55/dports/comms/telepathy-idle/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/comms/telepathy-idle/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/comms/telepathy-idle/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name            telepathy-idle
-version         0.1.12
+version         0.1.14
 license         LGPL-2.1
 description     The ${name} IRC connection manager component of Telepathy - a Flexible Communications Framework
 
@@ -18,8 +18,8 @@
 homepage        http://telepathy.freedesktop.org/wiki/
 master_sites    http://telepathy.freedesktop.org/releases/${name}/
 
-checksums       sha1    b350fe02abec01c020996d2ef2f70062a3bf0dc7 \
-                rmd160  565249f1d57c0dee63ac89101a6568c3feee1576
+checksums       sha1    db65de0f2b20ebb138a3bbf339dd8bce8a78ed2d \
+                rmd160  0b7b7874dc4fb059622ad0d1fdcc09ad5f5d8000
 
 depends_build   port:pkgconfig \
                 port:libxslt \

Modified: branches/pixilla-mysqls-55/dports/comms/telepathy-idle/files/patch-src-idle-parser.c.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/comms/telepathy-idle/files/patch-src-idle-parser.c.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/comms/telepathy-idle/files/patch-src-idle-parser.c.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,6 @@
---- src/idle-parser.c.orig	2011-05-10 10:08:19.000000000 -0700
-+++ src/idle-parser.c	2011-09-13 11:04:07.000000000 -0700
-@@ -226,14 +226,22 @@
+--- src/idle-parser.c.orig	2012-11-16 00:49:32.000000000 -0800
++++ src/idle-parser.c	2012-11-16 13:42:55.000000000 -0800
+@@ -230,14 +230,22 @@
  	IdleParserPrivate *priv = IDLE_PARSER_GET_PRIVATE(parser);
  	guint i;
  	guint lasti = 0;

Modified: branches/pixilla-mysqls-55/dports/comms/telepathy-salut/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/comms/telepathy-salut/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/comms/telepathy-salut/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name            telepathy-salut
-version         0.8.0
+version         0.8.1
 license         LGPL-2.1+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     The ${name} component of Telepathy - a Flexible Communications Framework
@@ -16,8 +16,8 @@
 homepage        http://telepathy.freedesktop.org/wiki/
 master_sites    http://telepathy.freedesktop.org/releases/${name}/
 
-checksums       sha256  f504faf472e81c17c2707696124d4219fe869c83d7cdbbe53a035eb724bfb5ce \
-                rmd160  a0c860650ad6217a135a2fe23be825a0e63e1ed2
+checksums       sha256  70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e \
+                rmd160  9c2ad3b480a95339fef98c2f80e9d57309543c81
 
 depends_build   port:pkgconfig \
                 port:gtk-doc

Modified: branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-configure.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-configure.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-configure.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,6 @@
---- configure.orig	2012-04-04 09:37:34.000000000 -0700
-+++ configure	2012-09-18 12:32:29.000000000 -0700
-@@ -13661,9 +13661,9 @@
+--- configure.orig	2012-11-16 07:30:37.000000000 -0800
++++ configure	2012-11-16 13:26:42.000000000 -0800
+@@ -13662,9 +13662,9 @@
  
  
  
@@ -12,7 +12,7 @@
  
  
  
-@@ -15380,6 +15380,7 @@
+@@ -15381,6 +15381,7 @@
  	HAVE_UUID=yes
  fi
  

Modified: branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-lib-ext-wocky-Makefile.in.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-lib-ext-wocky-Makefile.in.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/comms/telepathy-salut/files/patch-lib-ext-wocky-Makefile.in.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,6 @@
---- lib/ext/wocky/Makefile.in.orig	2012-04-04 09:37:45.000000000 -0700
-+++ lib/ext/wocky/Makefile.in	2012-09-18 20:48:59.000000000 -0700
-@@ -275,7 +275,7 @@
+--- lib/ext/wocky/Makefile.in.orig	2012-11-16 07:30:52.000000000 -0800
++++ lib/ext/wocky/Makefile.in	2012-11-16 13:26:42.000000000 -0800
+@@ -297,7 +297,7 @@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
  EXTRA_DIST = autogen.sh

Modified: branches/pixilla-mysqls-55/dports/databases/groonga/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/groonga/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/databases/groonga/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                groonga
-version             2.0.8
+version             2.0.9
 categories          databases
 maintainers         hum clear-code.com:kou openmaintainer
 
@@ -20,8 +20,8 @@
 license             LGPL-2.1
 
 master_sites        http://packages.groonga.org/source/groonga/
-checksums           rmd160  5ad765173928dd281d57ef0f6d2419326715e1fb \
-                    sha256  a92c2d0f3a2129500de52047b9068da433a37b3c4221847b01debb1580095288
+checksums           rmd160  07464d4fbff05363c6f16430b8d67508d5843f95 \
+                    sha256  638a94f8c98849c63de6adc2f2799abdcda92c7db12351c540ca7cd2839da270
 
 depends_build       port:pkgconfig
 

Modified: branches/pixilla-mysqls-55/dports/databases/mongodb/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mongodb/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/databases/mongodb/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,10 +2,11 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           compiler_blacklist_versions 1.0
 
 name                mongodb
 epoch               1
-version             2.2.1
+version             2.2.2
 license             AGPL-3
 categories          databases
 maintainers         ryandesign
@@ -19,8 +20,8 @@
 master_sites        http://downloads.mongodb.org/src/
 distname            ${name}-src-r${version}
 
-checksums           rmd160  55f23013edd3796cc0d5eedfaa29656eb3bd15ce \
-                    sha256  6ddc92c859c8d018bbdf5191c15e621dfe1505f71ddd039c26b20070f634a567
+checksums           rmd160  189519fa17dd2c4119ae15cf6c79cd6d61cb3c26 \
+                    sha256  e646abd0a9839dec11fa4f35089aad8e9aeef628bce7832ab40a3138c7462127
 
 depends_build       port:scons
 
@@ -49,10 +50,7 @@
 
 variant universal {}
 
-compiler.blacklist gcc-4.0
-if {[vercmp ${xcodeversion} 4.3] < 0} {
-    compiler.blacklist-append clang
-}
+compiler.blacklist  gcc-4.0 {clang < 318.0.45}
 
 build.env           TERM=xterm \
                     ARCHFLAGS="[get_canonical_archflags]" \


Property changes on: branches/pixilla-mysqls-55/dports/databases/mysql5-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/databases/mysql5:39951
   + /trunk/dports/databases/mysql5:39951
/trunk/dports/databases/mysql5-devel:99672-100173

Modified: branches/pixilla-mysqls-55/dports/databases/mysql5-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mysql5-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/databases/mysql5-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -10,7 +10,7 @@
 name                    mysql5-devel
 conflicts               mysql5 mysql4
 version                 5.5.2-m2
-revision        1
+revision        2
 set branch              [join [lrange [split ${version} .] 0 1] .]
 homepage                http://www.mysql.com/
 categories              databases
@@ -42,10 +42,12 @@
 
 depends_lib \
     port:zlib \
-    port:openssl
+    port:openssl \
+    port:tcp_wrappers
 
 archcheck.files         lib/libz.dylib \
-                        lib/libssl.dylib
+                        lib/libssl.dylib \
+                        lib/libwrap.dylib
 
 set major_version       [strsed ${version} {s/\..*$//}]
 set mysql               mysql${major_version}

Modified: branches/pixilla-mysqls-55/dports/databases/mysql51/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mysql51/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/databases/mysql51/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 set name_mysql      ${name}
 version             5.1.66
 # Please set revision_client and revision_server to 0 if you bump version.
-set revision_client 0
+set revision_client 1
 set revision_server 0
 categories          databases
 platforms           darwin
@@ -54,13 +54,13 @@
     checksums           rmd160  27e7faea4d0ec1ea183eb70b7b29b7e8a864aa53 \
                         sha256  eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907
     
-    depends_lib         port:zlib
+    depends_lib         port:zlib port:tcp_wrappers
     depends_run         port:mysql_select
     
     select.group        mysql
     select.file         ${filespath}/${name_mysql}
     
-    archcheck.files     lib/libz.dylib
+    archcheck.files     lib/libz.dylib lib/libwrap.dylib
     
     post-extract {
         file mkdir ${worksrcpath}/build_macports/macports
@@ -168,12 +168,8 @@
             && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
             && [vercmp [lindex $vers 1] 5.1.63] < 1
             && [vercmp [lindex $vers 2] 3] < 0 } {
-        
-            set deactivate_proc registry_deactivate_composite
-            if {[info commands registry_deactivate_composite] == {}} {
-                set deactivate_proc registry_deactivate
-            }
-            $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
+
+            registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
         }
     }
 


Property changes on: branches/pixilla-mysqls-55/dports/devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel:96570-97031
   + /branches/mld-qt-481/dports/devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel:99672-100173
/users/cal/ports/devel:96570-97031

Modified: branches/pixilla-mysqls-55/dports/devel/akonadi/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/akonadi/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/akonadi/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,10 +5,9 @@
 PortGroup           kde4    1.1
 
 name                akonadi
-version             1.8.0
-revision            1
+version             1.8.80
 categories          devel kde kde4
-maintainers         nomaintainer
+maintainers         nicos openmaintainer
 license             LGPL-2+
 description         A personal information management storage service.
 long_description    Akonadi is an extensible cross-desktop storage service \
@@ -18,8 +17,8 @@
 master_sites        kde:stable/${name}/src/
 use_bzip2           yes
 
-checksums           sha256 1644040ccc62c39325127cd32d19e846f62ffb1efa90b8d5e6a137a2545fa66d \
-                    rmd160 20954cfa63965b2e757c781585e4bacde87b0d5c
+checksums           rmd160  204bf7a03c23e2df36ca7d0d7a580a63422c5f3e \
+                    sha256  1b01b5b9c1f44f79cc8ca9b13f01b561e9852ca4253811f4814ea4511b2e13bd
 
 depends_lib-append  port:soprano \
                     port:boost \

Modified: branches/pixilla-mysqls-55/dports/devel/astyle/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/astyle/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/astyle/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name              astyle
 version           2.02.1
-revision          1
+revision          2
 categories        devel
 platforms         darwin
 maintainers       wyuenho openmaintainer
@@ -25,6 +25,7 @@
 worksrcdir        ${name}/build/mac
 patchfiles        patch-Makefile.diff
 use_configure     no
+conflicts		  astyle-dev
 
 variant universal {}
 

Modified: branches/pixilla-mysqls-55/dports/devel/autoconf263/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/autoconf263/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/autoconf263/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -23,6 +23,7 @@
 master_sites    gnu:autoconf
 use_bzip2       yes
 distname        autoconf-${version}
+dist_subdir     autoconf
 universal_variant       no
 
 checksums       rmd160 273448a60bc4dfcfcb3ee455ef012333eeca3256

Modified: branches/pixilla-mysqls-55/dports/devel/automake/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/automake/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/automake/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                automake
-version             1.12.4
+version             1.12.5
 categories          devel
 license             {GPL-2+ Permissive}
 installs_libs       no
@@ -20,8 +20,8 @@
 
 homepage            http://www.gnu.org/software/automake/
 master_sites        gnu
-checksums           rmd160  8fd8fa7bb891c024c417edfb28e5ecd5d8156da2 \
-                    sha256  9a3cbb21e7a96d93f726129e8aa4bc3c43ed422da661f70a6eb21d1b49327aca
+checksums           rmd160  9d31e1613031094e3b73a72ffc60d8064ddc10e5 \
+                    sha256  82089e23b384d3e64efa4f09f133a02dadb91c0593d4f1d4e12c29d806be9925
 
 depends_build       port:autoconf
 depends_lib         path:bin/perl:perl5

Modified: branches/pixilla-mysqls-55/dports/devel/boost/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/boost/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/boost/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 
 name            boost
 version         1.52.0
+revision        1
 license         Boost-1
 categories      devel
 platforms       darwin
@@ -178,6 +179,16 @@
     }]
 }
 
+if {![variant_isset debug]} {
+    set selected_python python27
+    foreach s ${pythons_suffixes} {
+        if {[variant_isset python${s}]} {
+            set selected_python python${s}
+        }
+    }
+    default_variants +${selected_python}
+}
+
 default_variants +no_single +no_static
 
 variant debug description {Builds debug versions of the libraries as well} {

Modified: branches/pixilla-mysqls-55/dports/devel/buildbot/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/buildbot/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/buildbot/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,12 +4,12 @@
 PortGroup          python27 1.0
 
 name               buildbot
-version            0.8.7
+version            0.8.7p1
 categories         devel python
 platforms          darwin
 supported_archs    noarch
 license            GPL-2
-maintainers        ram openmaintainer
+maintainers        nomaintainer
 
 description        compile/test cycle automation system
 long_description   The BuildBot is a system to automate the compile/test \
@@ -19,8 +19,8 @@
 master_sites       googlecode:buildbot
 dist_subdir        ${name}
 
-checksums          rmd160 430e5c88cfd726d08c63545f9f5c89ae18545ddb \
-                   sha256 1f4539d2da282aa39495c7e2e4cef7abb3a3bd3617524650846116f2bcc63b2f
+checksums          rmd160 503feeae40e5f05b2a6aff448ff22b03a5b84a15 \
+                   sha256 8dee3f887bce55a7f7cf01e6c421a2511898c2f89f55f202f5193a100a9a5776
 
 depends_lib-append port:py27-twisted \
                    port:py27-jinja2 \

Modified: branches/pixilla-mysqls-55/dports/devel/buildbot-slave/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/buildbot-slave/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/buildbot-slave/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,12 +4,12 @@
 PortGroup          python27 1.0
 
 name               buildbot-slave
-version            0.8.7
+version            0.8.7p1
 categories         devel python
 platforms          darwin
 supported_archs    noarch
 license            GPL-2
-maintainers        ram openmaintainer
+maintainers        nomaintainer
 
 description        buildslave for buildbot continuous integration system
 long_description   Buildbot is a system to automate the \
@@ -20,8 +20,8 @@
 master_sites       googlecode:buildbot
 dist_subdir        ${name}
 
-checksums          rmd160 c8be0f63f64641f7bffa2f0abd9575debaa5805d \
-                   sha256 fd5436bf3686afb2e4e826fa0a3204f7e40c4e0863815989ecf7495a8b361236
+checksums          rmd160 dcf33994816786b6760e9d2b0a0d391f5e77ae42 \
+                   sha256 bbdb07a3847efa186f942142a09394b467d7375745c49da0a42e9aa5b206eadc
 
 depends_lib-append port:py27-twisted
 

Modified: branches/pixilla-mysqls-55/dports/devel/clucene/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/clucene/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/clucene/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,9 +3,11 @@
 
 PortSystem 1.0
 PortGroup               cmake 1.0
+PortGroup               muniversal 1.0
 
 name                    clucene
 version                 2.3.3.4
+set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              devel
 platforms               darwin
 maintainers             free.fr:dinh.viet.hoa openmaintainer
@@ -16,7 +18,7 @@
 
 distname                ${name}-core-${version}
 homepage                http://clucene.sourceforge.net/
-master_sites            sourceforge
+master_sites            sourceforge:project/clucene/clucene-core-unstable/${branch}
 
 checksums               rmd160  5acfc9c8acd167b3684cfc731a60fd9c5465cc9b \
                         sha256  ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab

Modified: branches/pixilla-mysqls-55/dports/devel/cmake/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/cmake/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/cmake/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 
 name		cmake
 version		2.8.9
-revision	1
+revision	2
 set branch	[join [lrange [split ${version} .] 0 1] .]
 categories	devel
 license		BSD
@@ -70,11 +70,21 @@
 		xinstall -m 0644 -W ${worksrcpath}/Docs cmake-${type}.vim \
 			${destroot}${prefix}/share/vim/vimfiles/${type}
 	}
+	if ([variant_isset gui]) {
+		set app CMake
+		xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
+			${destroot}${applications_dir}/${app}.app/Contents/Resources
+		xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+		reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+		reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+		ln -s ${prefix}/bin/cmake-gui ${destroot}${applications_dir}/${app}.app/Contents/MacOS/cmake-gui
+		xinstall -m 644 ${worksrcpath}/Source/QtDialog/CMakeSetup.icns ${destroot}${applications_dir}/${app}.app/Contents/Resources/CMakeSetup.icns
+	}
 }
 
 variant gui description {Qt4 based cmake-gui} {
 	PortGroup qt4 1.0
-#	patchfiles-append patch-CMakeLists.txt.diff
+	patchfiles-append patch-CMakeLists.txt.diff
 	configure.args-append --qt-gui --qt-qmake=${qt_qmake_cmd}
 }
 

Copied: branches/pixilla-mysqls-55/dports/devel/cmake/files/Info.plist.in (from rev 100173, trunk/dports/devel/cmake/files/Info.plist.in)
===================================================================
(Binary files differ)

Modified: branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,6 @@
---- CMakeLists.txt	2012-05-11 11:39:53.000000000 +0200
-+++ CMakeLists.txt	2012-05-11 11:48:15.000000000 +0200
-@@ -542,7 +542,7 @@
+--- CMakeLists.txt	2012-10-07 15:26:05.000000000 +0200
++++ CMakeLists.txt	2012-10-07 15:52:38.000000000 +0200
+@@ -528,7 +528,7 @@
  ENDIF(BUILD_CursesDialog)
  
  IF(BUILD_QtDialog)
@@ -9,7 +9,7 @@
      SET(CMAKE_BUNDLE_NAME
        "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
      SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-@@ -555,7 +555,7 @@
+@@ -541,7 +541,7 @@
      ENDIF(NOT "${ENDCH}" STREQUAL "/")
      SET(CMAKE_INSTALL_PREFIX 
        "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
@@ -18,8 +18,9 @@
    
    SET(QT_NEED_RPATH FALSE)
    IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
---- Source/QtDialog/CMakeLists.txt	2012-05-11 11:39:53.000000000 +0200
-+++ Source/QtDialog/CMakeLists.txt	2012-05-11 11:48:15.000000000 +0200
+diff -u -r cmake-2.8.9-orig/Modules/CMakeFindFrameworks.cmake cmake-2.8.9/Modules/CMakeFindFrameworks.cmake
+--- Source/QtDialog/CMakeLists.txt	2012-10-07 15:26:05.000000000 +0200
++++ Source/QtDialog/CMakeLists.txt	2012-10-07 15:57:54.000000000 +0200
 @@ -59,23 +59,23 @@
    IF(Q_WS_WIN)
      SET(SRCS ${SRCS} CMakeSetup.rc)
@@ -46,7 +47,7 @@
         OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
 -    ENDIF(APPLE)
 +    ENDIF(FALSE)
-     SET(CMAKE_INSTALL_DESTINATION_ARGS 
+     SET(CMAKE_INSTALL_DESTINATION_ARGS
        BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
    ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
 @@ -90,7 +90,7 @@
@@ -70,12 +71,12 @@
      # install rules for including 3rd party libs such as Qt
      # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
      set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
-@@ -114,7 +114,7 @@
-       include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
+@@ -115,7 +115,7 @@
+       set(BU_CHMOD_BUNDLE_ITEMS ON)
        fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
      ")
 -  endif(APPLE OR WIN32)
 +  endif(WIN32)
  
    CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
-     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)    
+     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)

Modified: branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,16 +1,18 @@
---- Modules/FindQt4.cmake	2012-05-11 11:39:53.000000000 +0200
-+++ Modules/FindQt4.cmake	2012-05-11 11:49:04.000000000 +0200
-@@ -526,7 +526,8 @@
+--- Modules/FindQt4.cmake	2012-10-07 15:26:05.000000000 +0200
++++ Modules/FindQt4.cmake	2012-10-07 15:46:05.000000000 +0200
+@@ -539,8 +539,9 @@
      SET(QT_MKSPECS_DIR NOTFOUND)
      FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
        HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
 -      DOC "The location of the Qt mkspecs containing qconfig.pri")
+-  ENDIF()
 +      DOC "The location of the Qt mkspecs containing qconfig.pri"
 +      NO_DEFAULT_PATH)
-   ENDIF()
++   ENDIF()
  
    IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -620,6 +621,7 @@
+     FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
+@@ -633,6 +634,7 @@
        FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
                  HINTS ${qt_headers} ${QT_LIBRARY_DIR}
                  PATH_SUFFIXES QtCore qt4/QtCore
@@ -18,7 +20,7 @@
          )
  
        # Set QT_HEADERS_DIR based on finding QtCore header
-@@ -672,7 +674,8 @@
+@@ -685,7 +687,8 @@
      endforeach(qt_cross_path)
      FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
        HINTS ${qt_cross_paths} ${qt_plugins_dir}
@@ -28,7 +30,7 @@
    ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
  
    # ask qmake for the translations directory
-@@ -692,8 +695,7 @@
+@@ -705,8 +708,7 @@
        FIND_PATH(QT_IMPORTS_DIR NAMES Qt
          HINTS ${qt_cross_paths} ${qt_imports_dir}
          DOC "The location of the Qt imports"

Modified: branches/pixilla-mysqls-55/dports/devel/codeblocks/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/codeblocks/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/codeblocks/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,9 +4,10 @@
 
 name			codeblocks
 version			10.05
-revision		1
+revision		2
 platforms		darwin freebsd
 categories		devel aqua x11
+license			GPL-3+
 maintainers		afb
 description		Open Source, Cross-platform, Free C/C++/D IDE
 long_description	Code::Blocks is a free C++ IDE built specifically \
@@ -24,6 +25,10 @@
 			sha1 b7697f512de69ad731f0febac4b91bb6c605fa57 \
 			rmd160 a1b4e93f4cc41ae6b7fd955689dae8648f0fd2f9
 
+if {${configure.compiler} == "clang"} {
+    configure.compiler llvm-gcc-4.2
+}
+
 configure.args  --with-contrib-plugins=all
 
 patchfiles	patch-HexEditor-HexEditPanel.cpp patch-MouseSap-Makefile.am patch-sdk-configmanager.cpp
@@ -53,6 +58,15 @@
 	supported_archs	i386 ppc
 	depends_lib port:wxWidgets
 
+platform darwin 11 {
+    macosx_deployment_target 10.6
+    if {[vercmp $xcodeversion 4.3] >= 0} {
+        configure.sdkroot ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
+    } else {
+        configure.sdkroot ${developer_dir}/SDKs/MacOSX10.6.sdk
+    }
+}
+
     patchfiles-append codeblocks-splashscreen.diff codeblocks-keybinder.diff codeblocks-debugger.diff
 
     post-destroot {

Modified: branches/pixilla-mysqls-55/dports/devel/ctags/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/ctags/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/ctags/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 
 name             ctags
 version          5.8
+revision         1
 categories       devel
 maintainers      mww openmaintainer
 license          GPL-2
@@ -24,6 +25,9 @@
 checksums           md5     c00f82ecdcc357434731913e5b48630d \
                     sha1    482da1ecd182ab39bbdc09f2f02c9fba8cd20030 \
                     rmd160  191495869fbfa2f77a9619a4920eba26d02eface
+
+patchfiles          patch-php.c.diff
+
 configure.args   --enable-macro-patterns \
                  --mandir=\\\${prefix}/share/man \
                  --with-readlib

Modified: branches/pixilla-mysqls-55/dports/devel/dbus/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/dbus/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/dbus/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,8 +6,7 @@
 
 name            dbus
 conflicts       dbus-devel
-version         1.4.20
-revision        1
+version         1.6.8
 maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
@@ -20,8 +19,8 @@
 homepage        http://www.freedesktop.org/Software/dbus
 master_sites    http://dbus.freedesktop.org/releases/dbus
 
-checksums           rmd160  c0e88ab6bf6afe93a243a42d26f3b6c03e7892cd \
-                    sha256  103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf
+checksums           rmd160  063d855945bae0124a10b2fa98d64fd09e3b8eda \
+                    sha256  fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac
 
 # See r59386
 # See r68276

Modified: branches/pixilla-mysqls-55/dports/devel/dbus-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/dbus-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/dbus-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,14 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           muniversal 1.0
 
+replaced_by         dbus
+PortGroup           obsolete 1.0
+
 name                dbus-devel
-set name_package    dbus
-conflicts           ${name_package}
 version             1.5.8
-distname            ${name_package}-${version}
+revision            1
 maintainers         pixilla openmaintainer
 categories          devel
 platforms           darwin
 license             {AFL-2.1 GPL-2+}
-description         A message bus system, a simple way for applications to talk to one another. (Development version)
-
-long_description    ${description}
-
-homepage            http://www.freedesktop.org/Software/dbus
-master_sites        http://dbus.freedesktop.org/releases/dbus
-
-checksums           rmd160  e83cbc25adcded4e94fa4dcc0cd063bddb2b764e \
-                    sha256  6e1cd5248562b5362e9a1ad8314459fe2f60ee3b9622ce0afd68cc9df8ae7c5e
-
-depends_lib         port:expat
-
-depends_build       port:pkgconfig
-
-configure.args      --disable-doxygen-docs \
-                    --disable-xml-docs \
-                    --without-x \
-                    --enable-launchd \
-                    --with-session-socket-dir=/tmp
-
-use_parallel_build  yes
-
-destroot.keepdirs \
-    ${destroot}${prefix}/share/dbus-1/services \
-    ${destroot}${prefix}/var/run/dbus \
-    ${destroot}${prefix}/etc/dbus-1/system.d \
-    ${destroot}${prefix}/etc/dbus-1/session.d
-
-# universal_archs_to_use might not be set before pre-fetch.
-pre-destroot {
-    global merger_dont_diff merger_configure_env
-
-    # PortGroup muniversal has difficulty merging three files.
-    if {[info exists universal_archs_to_use] && [llength ${universal_archs_to_use}] == 3} {
-        set merger_dont_diff "${prefix}/lib/dbus-1.0/include/dbus/dbus-arch-deps.h"
-    }
-}
-
-livecheck.type      regex
-livecheck.url       [lindex ${master_sites} 0]
-livecheck.regex     ">${name_package}-((?!\${extract.suffix}).*)${extract.suffix}<"
-
-
-variant no_startupitem description {Do not install startup files.} {
-    configure.args-delete --enable-launchd
-}
-
-if {![variant_isset no_startupitem]} {
-    notes "
-
-##################################################################################
-# A LaunchAgent plist has been generated that will aid in starting dbus.
-#
-# Execute the following command to start dbus on demand with launchd:
-# launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist
-#
-##################################################################################
-
-"
-}

Modified: branches/pixilla-mysqls-55/dports/devel/e_dbus/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/e_dbus/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/e_dbus/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    e_dbus
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 maintainers             ryandesign openmaintainer
 categories              devel
 platforms               darwin
@@ -20,8 +20,8 @@
 master_sites            http://download.enlightenment.org/releases/
 use_bzip2               yes
 
-checksums               rmd160  0a8259e9985d6fe6d23e6926937114a5830152b0 \
-                        sha256  d3a3e0b81f6bb69d2fc3886c9885dad27ebf14b60c4a0bbd5a2a510b5a5ff2d1
+checksums               rmd160  850cc30c94ed348154f99dfa9b605d3be7a9ddd5 \
+                        sha256  46417461643e968a9bf89ae03003e43df86b1d23e6f19abbf5706ed97c95b5b3
 
 depends_build           port:pkgconfig
 depends_lib             port:ecore \

Modified: branches/pixilla-mysqls-55/dports/devel/ecore/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/ecore/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/ecore/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    ecore
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 license                 BSD
 
 description             Ecore is a core event abstraction layer.
@@ -24,8 +24,8 @@
 master_sites            http://download.enlightenment.org/releases/
 use_bzip2               yes
 
-checksums               rmd160  b730dee4cc0d78bbabbcf76a55eba2bf1f389749 \
-                        sha256  fb5f547a0a6556b5f0e274b65cfbe42f4eb8371f20d00005cd4f5a78a6b6a5d8
+checksums               rmd160  ecee8fd6fd0df5daf529080cc131f9b5fd01a55d \
+                        sha256  837f5f02baf2569e42d838e5acd4834209bb2573e051002be80b6dc385874f75
 
 depends_build           port:pkgconfig
 depends_lib             port:evas \

Modified: branches/pixilla-mysqls-55/dports/devel/eet/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/eet/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/eet/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    eet
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 maintainers             ryandesign openmaintainer
 categories              devel x11
 platforms               darwin
@@ -26,8 +26,8 @@
 master_sites            http://download.enlightenment.org/releases/
 use_bzip2               yes
 
-checksums               rmd160  c9fbea3ff492a13c2cffe013508487499bf6ebad \
-                        sha256  3e5679c06792f0a1c4b5b158468afbcec3b510c60345055d5964fdbe2abba3eb
+checksums               rmd160  c6bafbc0699aecfcddf66eb78b454aa35b3c30cd \
+                        sha256  e8ec6e02c3dbb050d23fa2e6985019c8e1005c7dde31a047ed193974d04bd86f
 
 depends_build           port:pkgconfig
 depends_lib             port:jpeg port:zlib port:eina port:openssl

Modified: branches/pixilla-mysqls-55/dports/devel/eina/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/eina/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/eina/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    eina
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 categories              devel
 platforms               darwin
 maintainers             ryandesign openmaintainer
@@ -19,8 +19,8 @@
 master_sites            http://download.enlightenment.org/releases/
 use_bzip2               yes
 
-checksums               rmd160  9ceb645b20a67dedf2a23f58d664323d5f1ea35f \
-                        sha256  af0b316734ba72d92fa7716005efd380f28677c76f0e0b6a3c5a9b524575a6ce
+checksums               rmd160  9167e9b9326dd8d6bef063af42d96e76b0c267f3 \
+                        sha256  34a6689e063abeb44ea6d60507d96c8a82113705aabf9ae38f0b31d622cfbaa4
 
 depends_lib             port:libiconv
 

Modified: branches/pixilla-mysqls-55/dports/devel/embryo/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/embryo/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/embryo/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    embryo
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 maintainers             ryandesign openmaintainer
 categories              devel lang
 platforms               darwin
@@ -25,8 +25,8 @@
 master_sites            http://download.enlightenment.org/releases/
 use_bzip2               yes
 
-checksums               rmd160  539e5e709515f36e592ff85847c83d4e2a4feac3 \
-                        sha256  043563b8c1a66de117cfaaf76a4d9736e111007ce5c0cdcf2b1d83dd8b4df575
+checksums               rmd160  2d10ede19c9b8d81e755f461981a8a812892b13f \
+                        sha256  acd6f565e4806b5c26bcd563756baaf976a139ff9e16eaf5205eca2066c32697
 
 depends_build           port:pkgconfig
 

Modified: branches/pixilla-mysqls-55/dports/devel/evas/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/evas/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/evas/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    evas
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 categories              devel x11
 platforms               darwin
 maintainers             ryandesign openmaintainer
@@ -20,8 +20,8 @@
                         pixmaps, lines and rectangles for speed if your CPU \
                         or graphics hardware are too slow.
 
-checksums               rmd160  fe0dd231a01d2bfee7f7589fd11669216ded9eaa \
-                        sha256  57966a16fdb20e94deefe83ec0f990607413f7952f9755ed23ce81aea49b670c
+checksums               rmd160  3f7f972396e00a9503cbb3baad444c6e5f8b0061 \
+                        sha256  94a3aeb424b5cbd9e65dcbc936f2739559cab44de721aa2eab48ea9360e76a5a
 
 homepage                http://trac.enlightenment.org/e/wiki/Evas
 master_sites            http://download.enlightenment.org/releases/

Modified: branches/pixilla-mysqls-55/dports/devel/git-core/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/git-core/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/git-core/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                git-core
-version             1.8.0
+version             1.8.0.1
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
                     control system focusing on speed and efficiency.
@@ -19,11 +19,11 @@
                     git-manpages-${version}${extract.suffix}
 
 checksums           git-${version}${extract.suffix} \
-                    rmd160  84fc876984629b05042a0f4c418a340503862120 \
-                    sha256  ccc32f18ea12ea730a7d1d9d3d7bf51447439299a99d4d326f49f1f8bb488974 \
+                    rmd160  0a8f66aa2e687a093f6c68f16d930f5bb2d348a2 \
+                    sha256  768191692f28bc9dce0ab5882478d30b220a5733a12ad571eadc83fa0822c2ea \
                     git-manpages-${version}${extract.suffix} \
-                    rmd160  17374e966be51f732d7c0cc8f5094cb6c3a932db \
-                    sha256  8914907f9d22b9a6a0ade9a8addda9a84a2db35b23cbd404f2682cebc9114205 \
+                    rmd160  830059bf233934e26523bb887dfc20686f4b58b0 \
+                    sha256  99ed5abfedbfc66372dd1c62e018ce14db2ad83dfe898eca9987c03cb6aef3ad \
 
 depends_run         port:rsync \
                     port:p5.12-error \
@@ -132,8 +132,8 @@
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append        git-htmldocs-${version}${extract.suffix}
     checksums-append        git-htmldocs-${version}${extract.suffix} \
-                            rmd160  a3df2a28bcac00010ba316fd20cd3369e01614ec \
-                            sha256  b5837f19815c5259355fc2ac1ea320bd869680218b82b9a0802ca015c0e24363
+                            rmd160  c0fa1466464f3ae46235c48bcf38297b383c76e5 \
+                            sha256  d52f2328f74fda95af2d29ed5a03f51ba4e001abf30ef6aed33a904cddff4c89
 
     post-extract {
         file mkdir ${workpath}/htmldocs

Modified: branches/pixilla-mysqls-55/dports/devel/git-core/files/git-subtree.1.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/git-core/files/git-subtree.1.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/git-core/files/git-subtree.1.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,17 +1,17 @@
 diff -urN a/contrib/subtree/git-subtree.1 b/contrib/subtree/git-subtree.1
 --- a/contrib/subtree/git-subtree.1	1970-01-01 01:00:00.000000000 +0100
-+++ b/contrib/subtree/git-subtree.1	2012-10-22 22:16:32.000000000 +0200
++++ b/contrib/subtree/git-subtree.1	2012-11-27 11:02:28.000000000 +0100
 @@ -0,0 +1,605 @@
 +'\" t
 +.\"     Title: git-subtree
 +.\"    Author: [see the "AUTHOR" section]
 +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-+.\"      Date: 10/21/2012
++.\"      Date: 11/25/2012
 +.\"    Manual: Git Manual
-+.\"    Source: Git 1.8.0
++.\"    Source: Git 1.8.0.1
 +.\"  Language: English
 +.\"
-+.TH "GIT\-SUBTREE" "1" "10/21/2012" "Git 1\&.8\&.0" "Git Manual"
++.TH "GIT\-SUBTREE" "1" "11/25/2012" "Git 1\&.8\&.0\&.1" "Git Manual"
 +.\" -----------------------------------------------------------------
 +.\" * Define some portability stuff
 +.\" -----------------------------------------------------------------

Modified: branches/pixilla-mysqls-55/dports/devel/git-ftp/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/git-ftp/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/git-ftp/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -10,6 +10,7 @@
 categories          devel
 description         Git powered FTP client written as shell script.
 long_description    ${name} is a ${description}
+license             GPL-3
 
 platforms           darwin
 

Modified: branches/pixilla-mysqls-55/dports/devel/glib2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/glib2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/glib2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,7 +8,7 @@
 name                        glib2
 conflicts                   glib2-devel
 set my_name                 glib
-version                     2.34.1
+version                     2.34.3
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -29,8 +29,8 @@
 master_sites                gnome:sources/${my_name}/${branch}/ \
                             ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
-checksums                   rmd160  41f6d447ff300161838df36a719c5feb5f44c614 \
-                            sha256  6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1
+checksums                   rmd160  94508de21d25634f794066de246e9eecf6cbd0f8 \
+                            sha256  855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See https://trac.macports.org/changeset/27148


Property changes on: branches/pixilla-mysqls-55/dports/devel/glib2-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791
   + /trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791
/trunk/dports/devel/glib2-devel:99672-100173

Modified: branches/pixilla-mysqls-55/dports/devel/glib2-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/glib2-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/glib2-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,7 +8,7 @@
 name                        glib2-devel
 conflicts                   glib2
 set my_name                 glib
-version                     2.35.1
+version                     2.35.2
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -29,8 +29,8 @@
 master_sites                gnome:sources/${my_name}/${branch}/ \
                             ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
-checksums                   rmd160  8e488fa5bcf1d00c0584e6f7adad365946cc3cec \
-                            sha256  0804dedd207e31ca3051e44f03df2faad9a132a862269ae782c4fdfca472a92d
+checksums                   rmd160  b3245977c3f40319fb39cc3367fa7bfd7c317db4 \
+                            sha256  84fffa2041850352b83a7b27c127f1c4e8b3d169aa3a000b100820ba10f8c19e
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See https://trac.macports.org/changeset/27148

Modified: branches/pixilla-mysqls-55/dports/devel/gob2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/gob2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/gob2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name             gob2
-version          2.0.17
+version          2.0.18
 set branch       [join [lrange [split ${version} .] 0 1] .]
 categories       devel
 license          GPL-2+
@@ -19,15 +19,19 @@
 platforms        darwin
 master_sites     gnome:sources/${name}/${branch}/ \
                  http://ftp.5z.com/pub/gob
+use_bzip2 yes
 
-checksums           md5     05fa7384b30ebb2921430b2615d2c2e5 \
-                    sha1    1a6c3f1689b24f4cf69506e6b57b7b4517a74e14 \
-                    rmd160  9f0b8e302dfee33fa734a39c9263c41fc12910d2
+checksums        rmd160 dc49d4a6291b8bf36bac4ab22cefce7d99a97eb2 \
+                 sha256 b126c5df6fc2376e7fcff0e4c40ea3f471df300f9b1c9663bdf363df36dfeb60
 
 depends_build    port:pkgconfig
 
 depends_lib      path:lib/pkgconfig/glib-2.0.pc:glib2
 
+# Do not output preprocessor statement '#line 0' which is an error for some
+# versions of clang
+patchfiles       patch-out-line0.diff
+
 configure.args   --mandir=${prefix}/share/man
 
 livecheck.type   regex

Modified: branches/pixilla-mysqls-55/dports/devel/gradle/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/gradle/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/gradle/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name				gradle
-version				1.2
+version				1.3
 categories			devel java groovy
 maintainers			breskeby
 description			An open-source build system that is based on the Groovy language
@@ -19,9 +19,9 @@
 distname			${name}-${version}-bin
 master_sites		http://services.gradle.org/distributions
 
-checksums 			md5     92ba58e05f0c0a6ce665d345afe09afe \
-                    sha1    eeb372596534a813dd9ae7ff2f619567030946da \
-                    rmd160  5a42c1a72eeeb29aaa982f6326a6edab53261519
+checksums 			md5     6b4cfa59152f7a999b4b31a73279259c \
+                    sha1    420815987176f66f51f7f03df73d309a0537a869 \
+                    rmd160  89f324b1db7869d1bb1872c0ffcb163f4596a088
 						
 worksrcdir			${name}-${version}
 set workTarget		""

Modified: branches/pixilla-mysqls-55/dports/devel/gsoap/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/gsoap/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/gsoap/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,11 +4,12 @@
 PortSystem          1.0
 
 name                gsoap
-version             2.8.8
+version             2.8.11
 set branch          [join [lrange [split ${version} .] 0 1] .]
 platforms           darwin
 categories          devel
 maintainers         nomaintainer
+license             GPL-2+
 
 description         offers an XML to C/C++ language binding to ease the \
                     development of SOAP/XML Web services in C and C/C++
@@ -26,8 +27,8 @@
 distname            ${name}_${version}
 worksrcdir          ${name}-${branch}
 
-checksums           rmd160  cc33c81cf316bee7e42ab01149262acdfc4db31a \
-                    sha256  8b1ad1cbd521bd5f85ff4c038bfd5a17a2530610c1ce8bf7318725bc568465cc
+checksums           rmd160  d96b07165f8e4885f1b2dd08589fd772a97ec8b5 \
+                    sha256  8de57a0ae5957cee01e46e3d166cfedf7f5d0b5dae797fe3d8b01c777567534c
 
 depends_lib         port:openssl
 

Modified: branches/pixilla-mysqls-55/dports/devel/gsoap/files/patch-configure.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/gsoap/files/patch-configure.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/gsoap/files/patch-configure.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,6 @@
---- configure.orig	2011-11-19 12:34:17.000000000 -0600
-+++ configure	2011-12-07 00:40:32.000000000 -0600
-@@ -4850,8 +4850,8 @@
+--- configure.orig	2012-10-13 15:59:34.000000000 -0500
++++ configure	2012-11-27 19:18:27.000000000 -0600
+@@ -4853,8 +4853,8 @@
  			;;
          *-apple-*)	platform=MACOSX
  			# Appease 10.7 Lion (OpenSSL deprecated)

Modified: branches/pixilla-mysqls-55/dports/devel/jubatus/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/jubatus/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/jubatus/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        jubatus jubatus 0.3.3 jubatus-
-revision            1
+github.setup        jubatus jubatus 0.3.4 jubatus-
 
 categories          devel math textproc
 maintainers         hum openmaintainer
@@ -21,8 +20,8 @@
 platforms           darwin
 license             LGPL-2.1
 
-checksums           rmd160  c44b91fb50850fa3f1744bec82cd142bf90fad5d \
-                    sha256  5e7d9a48c69f7e94b91f592f2f2977992f24ed5db728b3570378a11152712b10
+checksums           rmd160  a97add59236564c14ce40e6edf786921ec24c3e0 \
+                    sha256  6662d140244649cc354f25d7abfd365f222ec7d89fb3a97703fa85cbec3af5b9
 
 depends_lib         port:pkgconfig \
                     port:msgpack \

Modified: branches/pixilla-mysqls-55/dports/devel/lcov/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/lcov/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/lcov/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name            lcov
-version         1.9
+version         1.10
 categories      devel
 maintainers     kimuraw openmaintainer
 description		\
@@ -45,9 +45,10 @@
 				${destroot}${prefix}/bin/genpng \
 				${destroot}${prefix}/bin/lcov
 }
-checksums      	md5 8b88cfc0200a8c176b879ac115a31379 \
-				rmd160 8065012a49cc7e10c295093c9b0c6dee9efcac22 \
-				sha1 5aff4b998b1288896734326a0b74ab536339ec21
+checksums       md5     b9fe33b921016fc68852c8a6beb3a3b5 \
+                rmd160  515b9a26ffaa5716228fbb21436174aea7f064d7 \
+                sha1    70fb361bcfd7dd81ea30731d6fe532ddea56f283 \
+                sha256  8a4661becc95fafad7875786672f7f29b080437825c3ff31d55a49492c15b88f
 
 livecheck.type	regex
 livecheck.url	${homepage}

Modified: branches/pixilla-mysqls-55/dports/devel/libcdio/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/libcdio/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/libcdio/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name             libcdio
-version          0.83
+version          0.90
 categories       devel
 license          GPL-3+
 maintainers      nomaintainer
@@ -16,11 +16,9 @@
 homepage         http://www.gnu.org/software/libcdio/
 platforms        darwin
 master_sites     gnu
-checksums           md5     b9e0f1bccb142e697cd834fe56b6e6fb \
-                    sha1    43f55972b23fd196d15fd6db17354a1d28e2bb24 \
-                    rmd160  37a9acd3e56870367bf02034810e3b823bb2cea7
+checksums           rmd160  e960bfa2db9f19d62ef5e81acb2cf782d60b13fd \
+                    sha256  af7e73825cec045e7775a205924de4804fe8ce60ccd299d605234b5df233f74e
 configure.args   --infodir=${prefix}/share/info \
-                 --disable-vcd-info \
 		 --mandir=${prefix}/share/man
 depends_build    port:pkgconfig
 depends_lib      port:libcddb port:libiconv port:gettext port:popt port:ncurses

Modified: branches/pixilla-mysqls-55/dports/devel/libmemcached/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/libmemcached/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/libmemcached/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,9 @@
 PortGroup           conflicts_build 1.0
 
 name                libmemcached
+if {[file exists ${prefix}/bin/MemParse]} {
+    conflicts-append xercesc3
+}
 version             1.0.10
 set branch          [join [lrange [split ${version} .] 0 1] .]
 revision            0

Modified: branches/pixilla-mysqls-55/dports/devel/libzookeeper/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/libzookeeper/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/libzookeeper/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,11 +4,12 @@
 PortSystem          1.0
 
 name                libzookeeper
-version             3.4.4
+version             3.4.5
 categories          devel
 maintainers         hum openmaintainer
 
 description         C bindings for ZooKeeper, the high-performance coordination service
+
 long_description    ZooKeeper is a distributed, open-source coordination service for \
                     distributed applications. It exposes a simple set of primitives \
                     that distributed applications can build upon to implement higher \
@@ -25,8 +26,8 @@
 distname            zookeeper-${version}
 dist_subdir         zookeeper
 master_sites        apache:zookeeper/stable
-checksums           rmd160  775365acd30af63483ac28026a5b0a9a25b24995 \
-                    sha256  aff33717de58fba95825ebea734572472d95470ca3c8e8e219da43de6db5cf25
+checksums           rmd160  3ee0066330eed4843f39d5244def5f9fef37df00 \
+                    sha256  e92b634e99db0414c6642f6014506cc22eefbea42cc912b57d7d0527fb7db132
 
 worksrcdir          ${distname}/src/c
 

Modified: branches/pixilla-mysqls-55/dports/devel/mercurial/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/mercurial/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/mercurial/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,8 +5,7 @@
 PortGroup           python 1.0
 
 name                mercurial
-version             2.3.1
-revision            0
+version             2.4
 categories          devel python
 license             GPL-2+
 maintainers         deric
@@ -28,16 +27,14 @@
 homepage            http://www.selenic.com/mercurial/
 platforms           darwin
 master_sites        http://mercurial.selenic.com/release/
-checksums           rmd160  44d4102c405137f6a5c36ce48349bfb6af88bfed \
-                    sha256  ef587fdd3b062e08eb4012e7870f4d0a00fd834f11578bfba80313b10f808541
+checksums           rmd160  14451a60ab38de1c24eb1b4f1f2f3da907fa9dfd \
+                    sha256  388785358881ceb4409baa1b8180c2c84d5f354ea8cef18923dd49100cd52103
 depends_run         port:curl-ca-bundle
 
-patchfiles          patch-setup.py.diff \
+patchfiles          patch-setup.py.diff
 
 python.default_version 27
 
-variant universal {}
-
 post-destroot {
     # configure ssl certificates
     xinstall -d -m 755 ${destroot}${prefix}/etc/mercurial

Modified: branches/pixilla-mysqls-55/dports/devel/mspdebug/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/mspdebug/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/mspdebug/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    mspdebug
-version                 0.20
+version                 0.21
 maintainers             g5pw
 
 categories              devel cross
@@ -21,8 +21,8 @@
 
 master_sites            sourceforge
 
-checksums               rmd160  5aaf38dbf6001eb8e94fca1902b59b9283b98d4a \
-                        sha256  4514305994ad8962d5568652f74d6c26357f192583d8840fbf2f3c62dd3bff04
+checksums		rmd160  44e3d7b1dc02772c0bb71bba6f18898ef0048c00 \
+			sha256  37c0c83851e1ff7048012c733e21cd2fe5bef21f67814a462c6a7049dc709988
 
 depends_lib             port:libusb-compat port:libelf
 

Modified: branches/pixilla-mysqls-55/dports/devel/nodejs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/nodejs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/nodejs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    nodejs
-version                 0.8.14
+version                 0.8.15
 categories              devel net
 platforms               darwin
 license                 {MIT BSD}
@@ -22,8 +22,8 @@
 homepage                http://nodejs.org/
 master_sites            ${homepage}dist/v${version}
 
-checksums               rmd160  eecf3c3a400f54ef5ac6ef12b7539e1cca87291c \
-                        sha256  e5ce2aadb4df3ea4ca7a021106ffe09d286474476454038e9ed0135eac18e6d0
+checksums               rmd160  24106ee022a5f17c122aba3faec1f71ebe3c6f96 \
+                        sha256  1758639c6df3e081fe26585472d0f1961c5703b44ba6c57ecdf66a4c015792b1
 
 
 distname                node-v${version}

Modified: branches/pixilla-mysqls-55/dports/devel/npm/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/npm/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/npm/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,8 @@
 PortSystem          1.0
 
 name                npm
-version             1.1.65
+version             1.1.68
+
 categories          devel
 platforms           darwin
 license             MIT
@@ -23,8 +24,8 @@
 
 extract.suffix      .tgz
 
-checksums           rmd160  3923fc961e84883f4942389c260215803afed305 \
-                    sha256  d8d899f364acfb755f56eb7072de7a066c3dc603d8b28027a10b16a1df56c233
+checksums           rmd160  69e61944c36c4846d0d00e9612dc6d0f6e73edbe \
+                    sha256  71e827ec33290d99ada993ae8140ec22a73c8d3bfdddad5c749dd464f946ffe2
 
 worksrcdir          "package"
 

Modified: branches/pixilla-mysqls-55/dports/devel/pb2make/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/pb2make/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/pb2make/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,34 +1,12 @@
 # $Id$
 
 PortSystem 1.0
+replaced_by	pbtomake
+PortGroup	obsolete 1.0
 
 name		pb2make
-version		3
+version		4.0
 categories	devel
 platforms	darwin
 maintainers	nomaintainer
-description	Project Builder pbproj file to standard Makefile converter
-long_description	PTOMAKE is an application to convert from a Apples \
-			Project Builder pbproj file to standard Makefile. It \
-			will convert simple projects to allow them to be built \
-			on other platforms.
-
-homepage	http://members.bellatlantic.net/%7Evze35xda/software.html
-master_sites	http://members.bellatlantic.net/%7Evze35xda/Load/
-distname	TOMAKE10.3
-checksums	md5 0c506b3223237eac478464e2d0998759
-use_zip		yes
-
-worksrcdir	${worksrcdir}/Source/PBTOMAKE
-
-use_configure	no
-
-build.target
-
-destroot	{
-	xinstall -s -m 755 ${worksrcpath}/pbtomake \
-		${destroot}${prefix}/bin/pb2make
-	xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
-	xinstall -m 644 -W ${worksrcpath}/../../Docs article.rtf manual.rtf \
-		readme.rtf ${destroot}${prefix}/share/doc/${name}
-}
+homepage	http://members.bellatlantic.net/~vze35xda/software.html

Modified: branches/pixilla-mysqls-55/dports/devel/pev/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/pev/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/pev/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                pev
-version             0.50
+version             0.60
 maintainers         g5pw openmaintainer
 
 categories          devel
@@ -12,19 +12,19 @@
 long_description    ${description}
 
 platforms           darwin
+license             GPL-3+
 
 homepage            http://sourceforge.net/projects/pev/
 
+depends_lib         port:pcre
 
 master_sites        sourceforge:project/pev/pev-${version}
 
+checksums           rmd160  27d88a10dfedd68c46163d17ba483b45f57389d4 \
+                    sha256  133d4698a25f3b40b95f203d30ddea5895b41db2c8cb7724433cc4ce165c2b43
 
-checksums           rmd160  d1dbcab5e52a7f2661eb042cc4a7df506364fee7 \
-                    sha256  6ba1a653664a5f98dd016e0d850d6c931965d08914ac008a18b7357520c1aef8
+patchfiles          lib_libpe_Makefile.patch
 
-patchfiles			lib_libpe_Makefile.patch \
-                    src_Makefile.patch \
-
 use_configure       no
 
 variant universal {}

Modified: branches/pixilla-mysqls-55/dports/devel/pev/files/lib_libpe_Makefile.patch
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/pev/files/lib_libpe_Makefile.patch	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/pev/files/lib_libpe_Makefile.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,39 +1,11 @@
---- lib/libpe/Makefile.new	2012-06-27 20:17:53.000000000 +0200
-+++ lib/libpe/Makefile	2012-06-25 21:23:28.000000000 +0200
-@@ -1,28 +1,28 @@
- PREFIX=/usr
-+DEST=$(DESTDIR)/$(PREFIX)/lib
--DEST=$(PREFIX)/lib
- VERSION=1.0
- CFLAGS=-W -Wall -Wextra -pedantic -std=c99
- SRC=pe.c
- RM=rm -f
- CC=gcc
- LN=ln -sf
-+STRIP=strip -x
--STRIP=strip --strip-unneeded
- LIBNAME=libpe
- INSTALL=install -m 0644
- 
- all: pe.c pe.h
- 	$(CC) -o $(LIBNAME).o -c $(CFLAGS) -fPIC $(SRC)
-+	$(CC) -shared -Wl,-install_name,$(PREFIX)/lib/$(LIBNAME).dylib.1 -o $(LIBNAME).dylib $(LIBNAME).o
--	$(CC) -shared -Wl,-soname,$(LIBNAME).so.1 -o $(LIBNAME).so $(LIBNAME).o
- 
- install:
-+	$(STRIP) $(LIBNAME).dylib
--	$(STRIP) $(LIBNAME).so
- 	test -d $(DEST) || mkdir -p $(DEST)
-+	$(INSTALL) $(LIBNAME).dylib $(DEST)/$(LIBNAME).dylib.$(VERSION)
-+	cd $(DEST); $(LN) $(LIBNAME).dylib.$(VERSION) $(LIBNAME).dylib
-+	cd $(DEST); $(LN) $(LIBNAME).dylib.$(VERSION) $(LIBNAME).dylib.1
--	$(INSTALL) $(LIBNAME).so $(DEST)/$(LIBNAME).so.$(VERSION)
--	$(LN) $(DEST)/$(LIBNAME).so.$(VERSION) $(DEST)/$(LIBNAME).so
--	$(LN) $(DEST)/$(LIBNAME).so.$(VERSION) $(DEST)/$(LIBNAME).so.1
- 
- uninstall:
-+	$(RM) $(DEST)/$(LIBNAME).dylib*
--	$(RM) $(DEST)/$(LIBNAME).so*
- 
- clean:
- 	$(RM) $(LIBNAME).*o*
+--- lib/libpe/Makefile	2012-10-31 04:59:14.000000000 +0100
++++ lib/libpe/Makefile.new	2012-11-14 09:41:21.000000000 +0100
+@@ -32,7 +32,7 @@
+ 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.1 -o $(LIBNAME).so $(LIBNAME).o
+ else ifeq ($(PLATFORM_OS), Darwin)
+ 	$(CC) -headerpad_max_install_names -dynamiclib \
+-		-flat_namespace -install_name $(LIBNAME).$(VERSION).dylib \
++		-flat_namespace -install_name $(PREFIX)/lib/$(LIBNAME).$(VERSION).dylib \
+ 		-current_version $(VERSION) -compatibility_version $(VERSION) \
+ 		-o $(LIBNAME).dylib $(LIBNAME).o
+ else ifeq ($(PLATFORM_OS), CYGWIN)

Deleted: branches/pixilla-mysqls-55/dports/devel/pev/files/src_Makefile.patch
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/pev/files/src_Makefile.patch	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/pev/files/src_Makefile.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,9 +0,0 @@
---- src/Makefile	2012-06-27 19:00:44.000000000 +0200
-+++ src/Makefile.old	2012-06-27 18:58:33.000000000 +0200
-@@ -1,5 +1,5 @@
- PREFIX=/usr
-+DEST=$(DESTDIR)$(PREFIX)/bin
--DEST=$(PREFIX)/bin
- LIBPE=../lib/libpe
- LIBUDIS86=../lib/libudis86
- CFLAGS=-W -Wall -Wextra -std=c99 -pedantic

Modified: branches/pixilla-mysqls-55/dports/devel/pure-readline/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/pure-readline/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/pure-readline/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem                      1.0
 PortGroup                       pure 1.0
 
-pure.setup                      readline 0.1
-revision                        3
+pure.setup                      readline 0.2
 categories                      devel
 platforms                       darwin
 maintainers                     ryandesign
@@ -15,10 +14,7 @@
 
 long_description                ${name} provides ${description}.
 
-# 0.1 was stealth-updated 2011-10-20
-dist_subdir                     ${name}/${version}_1
+checksums                       rmd160  9868b22cf5839553f0c88b818ea8eb7568036805 \
+                                sha256  543686305921de4a6c295c8320be0c8fb273ae5219dbda9e17a85c27d9cd1baf
 
-checksums                       rmd160  c69a4dd2f7fd3584afd681df762ae71477fc6747 \
-                                sha256  a8721d58d2d34c803967923a2ebd1b8f612abfe8d4ad75d6796bee5bbc3c45a2
-
 depends_lib-append              port:readline

Modified: branches/pixilla-mysqls-55/dports/devel/qt-assistant/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/qt-assistant/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/qt-assistant/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,6 +8,7 @@
 version             4.6.3
 revision            1
 categories          devel aqua
+license             LGPL-2.1
 platforms           macosx
 maintainers         michaelld openmaintainer
 

Modified: branches/pixilla-mysqls-55/dports/devel/quickfix/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/quickfix/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/quickfix/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -16,7 +16,7 @@
 platforms           darwin
 
 homepage            http://www.quickfixengine.org/
-master_sites        sourceforge
+master_sites        sourceforge:project/quickfix/quickfix/${version}
 worksrcdir          ${name}
 
 checksums           md5     1e569a32107ecfc1de9c15bdcb5dc360 \
@@ -25,8 +25,16 @@
 
 depends_lib         port:libxml2
 
+# error: Failure in test: Expected 2 but was 0
+# https://sourceforge.net/tracker/?func=detail&aid=3556800&group_id=37535&atid=1126912
+compiler.blacklist  clang
+
+patchfiles          patch-UnitTest++-Makefile.diff
+
 post-patch {
    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
+   reinplace "s|@CXX@|${configure.cxx}|g" ${worksrcpath}/UnitTest++/Makefile
+   reinplace "s|@ARCHFLAGS@|${configure.cxx_archflags}|g" ${worksrcpath}/UnitTest++/Makefile
 }
 
 configure.args      --with-java

Copied: branches/pixilla-mysqls-55/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff (from rev 100173, trunk/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/devel/quickfix/files/patch-UnitTest++-Makefile.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,12 @@
+--- UnitTest++/Makefile.orig	2010-03-25 09:58:41.000000000 -0500
++++ UnitTest++/Makefile	2012-12-01 03:36:40.000000000 -0600
+@@ -1,6 +1,6 @@
+-CXX = g++
+-CXXFLAGS ?= -g -Wall -W -Winline -ansi 
+-LDFLAGS ?= 
++CXX = @CXX@
++CXXFLAGS ?= -g -Wall -W -Winline -ansi @ARCHFLAGS@
++LDFLAGS ?= @ARCHFLAGS@
+ SED = sed
+ MV = mv
+ RM = rm

Modified: branches/pixilla-mysqls-55/dports/devel/re2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/re2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/re2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                re2
-version             20121029
+version             20121127
 categories          devel textproc
 maintainers         hum openmaintainer
 
@@ -19,8 +19,8 @@
 license             BSD
 
 master_sites        googlecode
-checksums           rmd160  9054fcaed53356212f27afc53f49489184356bdf \
-                    sha256  197f3169e23f18367a8b9148c5d622faf19b72d844b2df2c9ec4475e68492882
+checksums           rmd160  6394e7c367c0583f3c365b5a92a6667cfa4db8a1 \
+                    sha256  1f3940357d38ab949901a5c3177a2b40f82c314ed39f20892f1b56376c5edef0
 
 extract.suffix      .tgz
 

Modified: branches/pixilla-mysqls-55/dports/devel/slib-guile16/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/slib-guile16/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/slib-guile16/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,9 +6,11 @@
 version		1.0
 revision	4
 categories	devel
+license		BSD
 maintainers	nomaintainer
 platforms	darwin
 supported_archs	noarch
+homepage	http://www.swiss.ai.mit.edu/~jaffer/SLIB.html
 description	Wrapper port to properly set up slib and guile16 together
 long_description	Create a symbolic link and a catalog file \
 			so that guile16 can find the slib library files.

Modified: branches/pixilla-mysqls-55/dports/devel/talloc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/talloc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/talloc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,8 @@
 conflicts           samba3
 version             2.0.1
 categories          devel
+# mostly LGPL, but a few files are GPL
+license             GPL-3+
 platforms           darwin
 maintainers         nomaintainer
 description         Hierarchical memory allocation library

Modified: branches/pixilla-mysqls-55/dports/devel/thrift/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/thrift/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/thrift/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,11 +2,11 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       conflicts_build 1.0
 
 name            thrift
 conflicts       thrift-devel
-version         0.8.0
-revision        3
+version         0.9.0
 categories      devel
 license         Apache-2
 maintainers     gmail.com:naoya.n blair openmaintainer
@@ -23,9 +23,9 @@
 homepage        http://thrift.apache.org/
 master_sites    apache:${name}/${version}
 
-checksums       md5     d29dfcd38d476cbc420b6f4d80ab966c \
-                sha1    1d652d7078d9cc70e2a45d3119b13e86ebd446da \
-                rmd160  bb0e1d2b6d30b70590752a7f9318e14de285c505
+checksums           sha1    fefcf4d729bf80da419407dfa028740aa95fa2e3 \
+                    rmd160  a507447718048bec2e7a4077658c43b07714ddb1 \
+                    sha256  71d129c49a2616069d9e7a93268cdba59518f77b3c41e763e09537cb3f3f0aac
 
 use_parallel_build  no
 
@@ -33,6 +33,10 @@
                     port:pkgconfig
 depends_lib-append  port:openssl
 
+patchfiles          r1410127.diff
+
+conflicts_build     ${name}
+
 configure.args  --with-c_glib=no \
                 --with-csharp=no \
                 --with-d=no \

Modified: branches/pixilla-mysqls-55/dports/devel/trac/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/trac/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/trac/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,7 +1,7 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup python26 1.0
+PortGroup python 1.0
 
 name			trac
 version			1.0
@@ -26,38 +26,48 @@
 		sha1	c9720d28704b43a605620de2eb870ddc9073cd12 \
 		rmd160	d87d87d809fdad35845cbcad5f81fc2d5c9830a1
 
-depends_lib	port:python26 port:sqlite3 \
-		port:py26-pygments port:py26-genshi \
-		port:py26-babel port:py26-sqlite
+python.versions 26 27
 
+variant python26 description {Use Python 2.6} {}
+variant python27 description {Use Python 2.7} {}
+if {[variant_isset python26]} {
+    python.default_version 26
+} else {
+    default_variants +python27
+    python.default_version 27
+}
+
+depends_lib	port:py${python.version}-pygments port:py${python.version}-genshi \
+		port:py${python.version}-babel port:py${python.version}-sqlite
+
 notes		"See http://projects.edgewall.com/trac/wiki/TracInstall for information on setting up a new trac environment."
 
 variant postgres description {Build with postgresql support instead of sqlite} {
-				depends_lib-delete port:sqlite3 port:py26-sqlite
-				depends_lib-append port:py26-psycopg2 port:py26-mx-base
+				depends_lib-delete port:py${python.version}-sqlite
+				depends_lib-append port:py${python.version}-psycopg2 port:py${python.version}-mx-base
 			}
 
 variant mysql description {Build with mysql support instead of sqlite} {
-				depends_lib-delete port:sqlite3 port:py26-sqlite
-				depends_lib-append port:py26-mysql
+				depends_lib-delete port:py${python.version}-sqlite
+				depends_lib-append port:py${python.version}-mysql
 
 				ui_msg "Warning: MySQL support is currently experimental. That means it works for some people, but several issues remain, in particular regarding the use of unicode and the key length in the repository cache."
 				ui_msg "See http://trac.edgewall.org/wiki/MySqlDb for more detailed information."
 			}
 
 variant subversion description {Build with subversion support} {
-				depends_lib-append port:subversion-python26bindings
+				depends_lib-append port:subversion-python${python.version}bindings
 			}
 
-default_variants +subversion
+default_variants-append +subversion
 
 post-destroot	{
 			file mkdir ${destroot}${prefix}/share/trac/
 			file copy ${worksrcpath}/contrib \
 				${destroot}${prefix}/share/trac/contrib
-			system "ln -sf ${frameworks_dir}/Python.framework/Versions/2.6/bin/trac-admin \
+			system "ln -sf ${python.prefix}/bin/trac-admin \
 				${destroot}${prefix}/bin/trac-admin"
-			system "ln -sf ${frameworks_dir}/Python.framework/Versions/2.6/bin/tracd \
+			system "ln -sf ${python.prefix}/bin/tracd \
 				${destroot}${prefix}/bin/tracd"
 		}
 

Modified: branches/pixilla-mysqls-55/dports/devel/zmq22/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/devel/zmq22/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/devel/zmq22/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -36,11 +36,7 @@
     if {[vercmp $version 3.2] < 0} {
         pre-activate {
             # provide an upgrade path for the zmq-update to 3.2
-            set deactivate_proc registry_deactivate_composite
-            if {[info commands registry_deactivate_composite] == {}} {
-                set deactivate_proc registry_deactivate
-            }
-            $deactivate_proc zmq "" [list ports_nodepcheck 1]
+            registry_deactivate_composite zmq "" [list ports_nodepcheck 1]
         }
     } else {
         conflicts   zmq


Property changes on: branches/pixilla-mysqls-55/dports/devel/zmq22/Portfile
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/sysutils/zmq/Portfile:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
   + /branches/mld-qt-481/dports/sysutils/zmq/Portfile:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/zmq22/Portfile:99672-100173

Modified: branches/pixilla-mysqls-55/dports/editors/elvis/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/elvis/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/editors/elvis/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -9,7 +9,7 @@
 homepage        http://elvis.the-little-red-haired-girl.org/
 description     A vi/ex clone
 categories      editors
-maintainers     nomaintainer
+maintainers     gmail.com:crosma
 platforms       darwin
 master_sites    ftp://ftp.cs.pdx.edu/pub/elvis/ \
                   ftp://ftp.false.com/pub/elvis/ \
@@ -21,6 +21,8 @@
 universal_variant no
 configure.args  --without-x
 
+patchfiles      patch-src-ref.c.diff
+
 # The x11 variant is seriously borked and needs patching to compile
 #variant         x11 {  depends_lib port:xorg-libX11 port:xorg-libOTHERS???
 #                       configure.args-delete --without-x

Modified: branches/pixilla-mysqls-55/dports/editors/emacs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/emacs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/editors/emacs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 name            emacs
 conflicts       xemacs
 version         24.2
-revision        1
+revision        2
 
 categories      editors
 license         GPL-3+
@@ -58,6 +58,7 @@
     configure.args-delete   --without-x
     configure.args-append   --with-x-toolkit=lucid \
                             --without-xaw3d \
+                            --without-imagemagick \
                             --with-xpm \
                             --with-jpeg \
                             --with-tiff \


Property changes on: branches/pixilla-mysqls-55/dports/editors/sigil
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/dports/editors/sigil:99672-100173

Modified: branches/pixilla-mysqls-55/dports/editors/sigil/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/sigil/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/editors/sigil/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,57 +1,49 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- 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$
-# vim: set fileencoding=utf-8 tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab filetype=tcl :
 
-PortSystem	    1.0
-PortGroup       qt4 1.0
+PortSystem          1.0
+PortGroup           cmake 1.0
+PortGroup           qt4 1.0
 
-name		    sigil
-conflicts	    tidy
-version		    0.5.3
-platforms	    darwin
-categories	    editors
-maintainers	    openmaintainer krischik
-description	    Sigil, the ePub editor
-long_description					\
-    Sigil is a multi-platform WYSIWYG ebook editor. It	\
-    is designed to edit books in ePub format
+name                sigil
+conflicts           tidy
+version             0.6.0
+platforms           darwin
+categories          editors
+maintainers         openmaintainer krischik
+license             GPL-3+
 
-homepage	    http://code.google.com/p/sigil
-master_sites	    googlecode
-distfiles	    Sigil-${version}-Code.zip
-worksrcdir	    build 
-use_parallel_build  yes
-universal_variant   no
+description         Sigil, the ePub editor
 
-checksums           md5     83c1a5608a2ec59a83c86ccc1429b5cc \
-                    sha1    e43861b2979f11e2abefedad454623e2685c781f \
-                    rmd160  cb400fec5b2453a2cd076c1821e2962df7d011c8
+long_description    Sigil is a multi-platform WYSIWYG ebook editor. It is \
+                    designed to edit books in ePub format
 
-depends_build-append bin:cmake:cmake \
-		    bin:gmake:gmake
+homepage            http://code.google.com/p/sigil
+master_sites        googlecode
+distname            Sigil-${version}-Code
+use_zip             yes
+use_parallel_build  yes
 
-extract.mkdir	    yes
-extract.suffix      .zip
-extract.cmd         unzip
-extract.pre_args    -q
-extract.post_args   "-d ${workpath}/Sigil-${version}-Code"
+checksums           rmd160  5c41cf2025c696c2cb77a4d266f749aa1856775d \
+                    sha256  02b95d3d1d5ad8a186212c6c60ae76fa17a98da83a748965db9546ff51903308
 
-configure.cmd	    "cmake"
-configure.args	    "-G \"Unix Makefiles\" ${workpath}/Sigil-${version}-Code"
+depends_lib-append  port:boost \
+                    port:hunspell \
+                    port:xercesc3 \
+                    port:zlib
 
-build.cmd	    "gmake"
-build.args	    ""
-build.target	    "Sigil"
+extract.mkdir       yes
 
-pre-configure {
-	reinplace "s|ppc;i386|${configure.build_arch}|g" ${workpath}/Sigil-${version}-Code/CMakeLists.txt
-	file mkdir ${worksrcpath}
+post-extract {
+    file mkdir ${build.dir}
 }
 
-destroot {
-    xinstall -d ${destroot}${applications_dir}
+configure.dir       ${worksrcpath}/build
+configure.args-append ${worksrcpath}
 
-    copy					\
-	${worksrcpath}/bin/Sigil.app		\
-	${destroot}${applications_dir}
+build.dir           ${configure.dir}
+build.target        Sigil
+
+destroot {
+    copy ${destroot.dir}/bin/Sigil.app ${destroot}${applications_dir}
 }

Modified: branches/pixilla-mysqls-55/dports/editors/texstudio/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/texstudio/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/editors/texstudio/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup               qt4 1.0
 
 name                    texstudio
-version                 2.5
+version                 2.5.1
 categories              editors
 platforms               darwin
 license                 GPL-2+
@@ -18,9 +18,10 @@
 
 homepage                http://texstudio.sourceforge.net/
 master_sites            sourceforge:project/texstudio/texstudio/TeXstudio%20${version}
+extract.suffix          .orig.tar.gz
 
-checksums               rmd160  f72a092657f4f401841611f717f99e7840ca2f63 \
-                        sha256  0e24af04aa6ab6e4b52c6c787c4a5687c3208457ad3bb5eb670b9703bb529d2a
+checksums               rmd160  e2b90518a60b4c70771a4885e920a324d68ceb60 \
+                        sha256  7f7ae53818d74a06fffef81e1aa9552badd85045a9953b13f28d15b393962015
 
 depends_lib-append      port:poppler
 
@@ -40,8 +41,6 @@
     }
 }
 
-worksrcdir              ${name}${version}
-
 pre-patch {
     # DOS to UNIX line endings so we can patch
     reinplace "s|\r||g" ${worksrcpath}/texstudio.pro

Modified: branches/pixilla-mysqls-55/dports/editors/texstudio/files/patch-texstudio.pro.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/texstudio/files/patch-texstudio.pro.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/editors/texstudio/files/patch-texstudio.pro.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,5 +1,5 @@
---- texstudio.pro.orig	2012-10-20 17:38:24.000000000 -0500
-+++ texstudio.pro	2012-10-20 17:38:24.000000000 -0500
+--- texstudio.pro.orig	2012-11-30 15:18:01.000000000 -0600
++++ texstudio.pro	2012-11-30 15:18:01.000000000 -0600
 @@ -2,6 +2,7 @@
  LANGUAGE = C++
  DESTDIR = ./
@@ -8,7 +8,7 @@
  exists(texmakerx_my.pri):include(texmakerx_my.pri)
  QT += network \
      xml \
-@@ -255,8 +256,7 @@
+@@ -262,8 +263,7 @@
      config += unix
      
      # #universal tiger
@@ -18,7 +18,7 @@
      
      # QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
      # QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-@@ -524,9 +524,8 @@
+@@ -532,9 +532,8 @@
              -lz
      }
      macx { 

Modified: branches/pixilla-mysqls-55/dports/editors/textmate2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/textmate2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/editors/textmate2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -25,21 +25,18 @@
 supported_archs         x86_64
 license                 GPL-3+
 
-pre-fetch {
-    if {${os.platform} == "darwin" && ${os.major} < 11} {
-        ui_error "${name} only works with Mac OS X 10.7 Lion or later."
-        return -code error "incompatible Mac OS X version"
-    }
-}
 fetch.type              git
 post-fetch {
     system -W ${worksrcpath} "git submodule update --init"
 }
 
-patchfiles              patch-configure-versionnumber.diff
+patchfiles              patch-configure-versionnumber.diff \
+                        patch-create_default_bundles_tbz-verbose.diff \
+                        patch-configure-mdt.diff
 
 post-patch {
     reinplace "s/@REVISION@/${github.version}/" ${worksrcpath}/configure
+    reinplace "s/__MACOSX_DEPLOYMENT_TARGET__/${macosx_deployment_target}/" ${worksrcpath}/configure
     fs-traverse file ${worksrcpath} {
         if {[file tail ${file}] == "target"} {
             reinplace "/TEST_SOURCES =/d" ${file}
@@ -51,7 +48,7 @@
                         port:ragel \
                         port:proctools
 
-set depends_skip_archcheck {ninja ragel proctools}
+depends_skip_archcheck  ninja ragel proctools
 
 minimum_xcodeversions   {11 4.4}
 
@@ -62,11 +59,21 @@
                         port:libiconv \
                         port:zlib
 
+if {${os.platform} != "darwin" || ${os.major} < 11} {
+    depends_fetch
+    depends_build
+    depends_lib
+    pre-fetch {
+        ui_error "${name} only works with Mac OS X 10.7 Lion or later."
+        return -code error "incompatible Mac OS X version"
+    }
+}
+
 configure.env-append    builddir=${worksrcpath}/build \
                         tag=-macports
 
 build.cmd               ninja
-build.args              -j ${build.jobs}
+build.args              -v -j ${build.jobs}
 build.target            TextMate mate
 
 destroot {

Copied: branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-configure-mdt.diff (from rev 100173, trunk/dports/editors/textmate2/files/patch-configure-mdt.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-configure-mdt.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-configure-mdt.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- configure.orig	2012-12-01 16:55:18.000000000 +1100
++++ configure	2012-12-01 16:54:47.000000000 +1100
+@@ -17,7 +17,7 @@
+ name=TextMate
+ ver=2.0.0-alpha.\$APP_REVISION${tag:-+git.$(git rev-parse --short HEAD)}
+ rev=@REVISION@
+-min_os=10.7
++min_os=__MACOSX_DEPLOYMENT_TARGET__
+ 
+ # ===============================================
+ # = Find clang via xcrun, MacPorts, or Homebrew =

Copied: branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff (from rev 100173, trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- bin/create_default_bundles_tbz.orig	2012-11-29 14:31:53.000000000 +1100
++++ bin/create_default_bundles_tbz	2012-11-29 14:44:48.000000000 +1100
+@@ -11,7 +11,7 @@
+ 	BZIP2_FLAG="--use-compress-prog=pbzip2"
+ fi
+ 
+-ninja "$bl" && \
++ninja -v "$bl" && \
+ 	mkdir -p "$BUNDLES_DST/Managed" && \
+ 	"$bl" -C "$BUNDLES_DST/Managed" install Apache Bundle\ Development Bundle\ Support C CSS Diff Git HTML Hyperlink\ Helper JavaScript JSON Mail Make Markdown Math Mercurial Objective-C PHP Property\ List Python Ruby SCM Shell\ Script Source SQL Subversion Text TextMate Themes TODO XML && \
+ 	gnutar -cf "$TBZ_DST" "$BZIP2_FLAG" -C "$BUNDLES_DST" "Managed"

Modified: branches/pixilla-mysqls-55/dports/emulators/mednafen/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/emulators/mednafen/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/emulators/mednafen/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 
 name		mednafen
 version		0.8.D.3
+revision	1
 epoch       1
 platforms	darwin
 categories	emulators games

Modified: branches/pixilla-mysqls-55/dports/emulators/qemu/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/emulators/qemu/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/emulators/qemu/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name                    qemu
-version                 1.2.0
-revision                2
+version                 1.2.1
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -20,8 +19,8 @@
 master_sites            ${homepage}/download
 use_bzip2 yes
 
-checksums               rmd160  f6ebeeca42e2e694f17ab83cca3652baf7e74d1c \
-                        sha256  c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936
+checksums               rmd160  52309f25d822d02cdc33405a5f1816b2dc24a981 \
+                        sha256  33b1e711790cd468bda703c2b101d7b961d8e6d745c67c07ef63945f967fb046
 
 patchfiles              patch-configure.diff \
                         patch-net-tap-interface.diff

Modified: branches/pixilla-mysqls-55/dports/games/simutrans/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/games/simutrans/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/games/simutrans/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -9,6 +9,7 @@
 set my_version      [strsed ${version} {g/\./-/}]
 set my_branch       [strsed ${branch} {g/\./-/}]
 categories          games
+license             Artistic-1 MIT
 platforms           darwin
 maintainers         nomaintainer
 description         Simutrans is a freeware transport simulation game.
@@ -141,7 +142,7 @@
         if {[file exists ${prefix}/bin/simutrans]
             && ![catch {set vers [lindex [registry_active simutrans] 0]}]
             && [vercmp [lindex $vers 1] 111.2.2] < 0} {
-            registry_deactivate simutrans "" [list ports_nodepcheck 1]
+            registry_deactivate_composite simutrans "" [list ports_nodepcheck 1]
         }
     }
 }

Modified: branches/pixilla-mysqls-55/dports/gis/cgal/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/gis/cgal/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gis/cgal/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -48,7 +48,6 @@
                         -DWITH_CGAL_Qt4:BOOL=OFF \
 						-DBoost_DIR:PATH=${prefix} \
 						-DWITH_Eigen3:BOOL=ON \
-						-DCGAL_EIGEN3_ENABLED:BOOL=ON \
 						-DWITH_ZLIB:BOOL=ON
 
 # gcc 4.0 is too old to compile CGAL properly; see <http://www.cgal.org/FAQ.html#mac_optimization_bug>
@@ -60,9 +59,6 @@
         configure.compiler apple-gcc-4.2
     }
 } 
-#elseif {[string match "*clang*" ${configure.cc}]} {
-#	configure.compiler	llvm-gcc-4.2
-#}
 
 variant demos description {Create demos} requires qt4 {
 	depends_lib-append		port:libQGLViewer \
@@ -77,18 +73,14 @@
 	configure.args-append	-DWITH_OpenGL:BOOL=ON
 
   # MacPorts installs IPE version 7; make sure to use it.
-	configure.args-append	-DWITH_IPE_7:BOOL=ON
+	configure.args-append	-DWITH_IPE:BOOL=ON
 
   # include Qt's CMake defines, just in case
 	configure.args-append	${qt_cmake_defines}
-
+		
 	build.target-append		examples demos
 	use_parallel_build		no
 
-	pre-fetch {
-		return -code error "Demo option is disabled until Boost 1.52 is released."
-	}
-
 	post-destroot {			xinstall -d ${destroot}${prefix}/share/${name}
 							copy ${worksrcpath}/demo ${destroot}${prefix}/share/${name}
 							copy ${worksrcpath}/examples ${destroot}${prefix}/share/${name}

Modified: branches/pixilla-mysqls-55/dports/gis/gdal/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/gis/gdal/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gis/gdal/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                gdal
-version             1.9.1
-revision            1
+version             1.9.2
 categories          gis
 license             MIT BSD
 platforms           darwin
@@ -26,8 +25,8 @@
 master_sites        http://www.gdal.org/dl/ \
                     http://download.osgeo.org/gdal/
 
-checksums           rmd160  c4d77975b753fae75c634662e5e572fc2308456e \
-                    sha256  5b829e91c5d6c6c9af23fe6322e51bae9339e8805d52724cb0ad0b741aef7fa9
+checksums           rmd160  1ab34a85946bae4313cbd925cdbbf728d23d7b57 \
+                    sha256  9f3b9ae968eaa8d06ee5448e5b65e7bfa940e2e345282a29d95275421f36c688
 
 depends_lib-append  port:zlib \
                     port:libpng \
@@ -95,7 +94,6 @@
 # Patch to ensure that the python installation respects DESTDIR
 patchfiles          patch-swig_python_GNUmakefile \
                     patch-gdalwarpkernel_opencl_c.diff \
-                    patch-frmts_gif_gifdataset.cpp.diff \
                     patch-gdalwarpkernel_opencl_h.diff
 
 # Patches for universal build

Deleted: branches/pixilla-mysqls-55/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,53 +0,0 @@
---- frmts/gif/gifdataset.cpp.orig	2012-05-22 17:29:20.000000000 +0400
-+++ frmts/gif/gifdataset.cpp	2012-05-22 17:29:28.000000000 +0400
-@@ -470,6 +470,28 @@
- }
- 
- /************************************************************************/
-+/*                        GDALPrintGifError()                           */
-+/************************************************************************/
-+
-+static void GDALPrintGifError(const char* pszMsg)
-+{
-+/* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
-+/* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
-+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
-+        ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
-+    /* Static string actually, hence the const char* cast */
-+    const char* pszGIFLIBError = (const char*) GifErrorString();
-+    if (pszGIFLIBError == NULL)
-+        pszGIFLIBError = "Unknown error";
-+    CPLError( CE_Failure, CPLE_AppDefined,
-+              "%s. GIFLib Error : %s", pszMsg, pszGIFLIBError );
-+#else
-+    PrintGifError();
-+    CPLError( CE_Failure, CPLE_AppDefined, "%s", pszMsg );
-+#endif
-+}
-+
-+/************************************************************************/
- /*                             CreateCopy()                             */
- /************************************************************************/
- 
-@@ -596,9 +618,7 @@
-                           psGifCT->ColorCount, 255, psGifCT) == GIF_ERROR)
-     {
-         FreeMapObject(psGifCT);
--        PrintGifError();
--        CPLError( CE_Failure, CPLE_AppDefined, 
--                  "Error writing gif file." );
-+        GDALPrintGifError("Error writing gif file.");
-         EGifCloseFile(hGifFile);
-         VSIFCloseL( fp );
-         return NULL;
-@@ -622,9 +642,7 @@
- 
-     if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR )
-     {
--        PrintGifError();
--        CPLError( CE_Failure, CPLE_AppDefined, 
--                  "Error writing gif file." );
-+        GDALPrintGifError("Error writing gif file.");
-         EGifCloseFile(hGifFile);
-         VSIFCloseL( fp );
-         return NULL;

Modified: branches/pixilla-mysqls-55/dports/gis/qgis/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/gis/qgis/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gis/qgis/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,232 +1,244 @@
 # -*- 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
+PortSystem          1.0
+PortGroup           cmake   1.0
 PortGroup           qt4     1.0
 
-name				qgis
-version				1.8.0
-categories			gis
-maintainers			vince
-description			QGIS is a user-friendly GIS based on Qt 4
-long_description	QGIS is a GIS. It can visualize, inject data into \
-					PostGres/PostGIS, or serve as a Qt front-end to Grass. \
-					Extended with Python plugins, it can become a quite \
-					powerful GIS on its own.
+name                qgis
+version             1.8.0
+categories          gis
+maintainers         vince
+description         QGIS is a user-friendly GIS based on Qt 4
+long_description    QGIS is a GIS. It can visualize, inject data into \
+                    PostGres/PostGIS, or serve as a Qt front-end to \
+                    Grass. Extended with Python plugins, it can become \
+                    a quite powerful GIS on its own.
 
-platforms			darwin
-license				GPL
+platforms           darwin
+license             GPL
 
-use_parallel_build	no
-homepage			http://www.qgis.org/
+use_parallel_build  no
+homepage            http://www.qgis.org/
 
-distname			${name}-${version}
-master_sites		http://qgis.org/downloads/
-use_bzip2			yes
+distname            ${name}-${version}
+master_sites        http://qgis.org/downloads/
+use_bzip2           yes
 
 checksums           md5     1d60520f81d7763c026d0af887ac9a05 \
                     sha1    99c0d716acbe0dd70ad0774242d01e9251c5a130 \
                     rmd160  93138574da56fee232ba006d8d8943e16a2a9959
 
-worksrcdir			${name}-${version}
+worksrcdir          ${name}-${version}
 
-patchfiles			patch-conversions_sip.diff \
-					patch-CMakeLists_txt.diff
+patchfiles          patch-conversions_sip.diff \
+                    patch-CMakeLists_txt.diff
 
-depends_lib-append 	port:libiconv \
-					port:expat \
-					port:openssl \
-					port:proj \
-					port:geos \
-					port:gdal \
-					port:sqlite3 \
-					port:gsl \
-					port:qwt52 \
-					port:fcgi \
-					port:spatialindex
+depends_lib-append  port:libiconv \
+                    port:expat \
+                    port:openssl \
+                    port:proj \
+                    port:geos \
+                    port:gdal \
+                    port:sqlite3 \
+                    port:gsl \
+                    port:qwt52 \
+                    port:fcgi \
+                    port:spatialindex
 
-depends_build-append	port:bison
+depends_build-append    port:bison \
+                        port:ld64
 
 post-extract {
-	system "cd ${worksrcpath} && mkdir build && mkdir Python.framework"
+    system "cd ${worksrcpath} && mkdir build && mkdir Python.framework"
 }
 
 # Overrides default
 
 if {![variant_isset postgis] && ![variant_isset postgis2]} {
-	default_variants		+postgis2
+    default_variants    +postgis2
 }
 
 if {![variant_isset python25] && ![variant_isset python26] &&
-	![variant_isset python27]} {
-	
-	default_variants		+python27
+    ![variant_isset python27]} {
+    
+    default_variants    +python27
 }
 
 if {![variant_isset postgresql90] && ![variant_isset postgresql91] && \
     ![variant_isset postgresql92]} {
-	
-	default_variants		+postgresql91
+
+    default_variants    +postgresql91
 }
 
-set Py_own_FRM	${worksrcpath}/Python.framework
+set Py_own_FRM  ${worksrcpath}/Python.framework
 
 # Python related stuff
 
-variant python25	conflicts universal python26 python27 \
-					description use Python 2.5 {	
+variant python25    conflicts universal python26 python27 \
+                    description use Python 2.5 {    
 
-	depends_lib-append		port:py25-pyqt4
-	depends_build-append	port:py25-sip
-	
-	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.5"
-	configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.5"
-	configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.5"
-	configure.args-append \
-				"-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.5/bin/sip"
+    depends_lib-append      port:py25-pyqt4
+    depends_build-append    port:py25-sip
+    depends_run-append      port:py25-psycopg2 \
+                            port:py25-spatialite
+
+    
+    configure.args-append  "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.5"
+    configure.args-append  "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.5"
+    configure.args-append  "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.5"
+    configure.args-append  \
+                "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.5/bin/sip"
 }
 
-variant python26	conflicts python25 python27 \
-					description use Python 2.6 {
-	
-	depends_lib-append		port:py26-pyqt4
-	depends_build-append	port:py26-sip
-	
-	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6"
-	configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.6"
-	configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.6"
-	configure.args-append \
-				"-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.6/bin/sip"
+variant python26    conflicts python25 python27 \
+                    description use Python 2.6 {
 
+    depends_lib-append      port:py26-pyqt4
+    depends_build-append    port:py26-sip
+    depends_run-append      port:py26-psycopg2 \
+                            port:py26-spatialite
+
+    
+    configure.args-append  "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6"
+    configure.args-append  "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.6"
+    configure.args-append  "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.6"
+    configure.args-append  \
+                "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.6/bin/sip"
 }
 
-variant python27 	conflicts python25 python26 \
-					description use Python 2.7 {
-					
-	depends_lib-append		port:py27-pyqt4
-	depends_build-append	port:py27-sip
-	
-	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
-	configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7"
-	configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7"
-	configure.args-append \
-				"-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.7/bin/sip"
+variant python27    conflicts python25 python26 \
+                    description use Python 2.7 {
 
+    depends_lib-append      port:py27-pyqt4
+    depends_build-append    port:py27-sip
+    depends_run-append      port:py27-psycopg2 \
+                            port:py27-spatialite
+
+    configure.args-append  "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
+    configure.args-append  "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7"
+    configure.args-append  "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7"
+    configure.args-append  \
+                "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.7/bin/sip"
+
 }
 
-variant postgresql90	conflicts postgresql91 postgresql92 \
-						description "Use postgresql 9.0" {
-						
-	depends_lib-append		port:postgresql90
-	set PGSQL_DIR			${prefix}/lib/postgresql90
-	configure.args-append	"-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
+variant postgresql90    conflicts postgresql91 postgresql92 \
+                        description "Use postgresql 9.0" {
+
+    depends_lib-append      port:postgresql90
+    set PGSQL_DIR           ${prefix}/lib/postgresql90
+    configure.args-append   \
+                "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
 }
 
-variant postgresql91	conflicts postgresql90 postgresql92 \
-						description "Use postgresql 9.1" {
-						
-	depends_lib-append		port:postgresql91
-	set PGSQL_DIR			${prefix}/lib/postgresql91
-	configure.args-append	"-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
+variant postgresql91    conflicts postgresql90 postgresql92 \
+                        description "Use postgresql 9.1" {
+
+    depends_lib-append      port:postgresql91
+    set PGSQL_DIR           ${prefix}/lib/postgresql91
+    configure.args-append   \
+                "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
 }
 
-variant postgresql92	conflicts postgresql90 postgresql91 \
-						description "Use postgresql 9.1" {
-						
-	depends_lib-append		port:postgresql92
-	set PGSQL_DIR			${prefix}/lib/postgresql92
-	configure.args-append	"-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
+variant postgresql92    conflicts postgresql90 postgresql91 \
+                        description "Use postgresql 9.1" {
+
+    depends_lib-append      port:postgresql92
+    set PGSQL_DIR           ${prefix}/lib/postgresql92
+    configure.args-append   \
+                "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
 }
 
-variant postgis			description "Build postgis 1.x support" \
+variant postgis            description "Build postgis 1.x support" \
                         conflicts postgis2 {
-	
-	depends_lib-append		port:postgis
-	
-	if {![variant_isset postgresql90] &&
-		![variant_isset postgresql91] } {
-		return -code error "Please also select a postgresql variant"
-	}
+
+    depends_lib-append      port:postgis
+
+    if {![variant_isset postgresql90] &&
+        ![variant_isset postgresql91] && 
+        ![variant_isset postgresql92]} {
+        return -code error "Please also select a postgresql variant"
+    }
 }
 
-variant postgis2			description "Build postgis 2.x support" \
+variant postgis2            description "Build postgis 2.x support" \
                             conflicts postgis {
-	
-	depends_lib-append		port:postgis2
-	
-	if {![variant_isset postgresql90] &&
-		![variant_isset postgresql91] } {
-		return -code error "Please also select a postgresql variant"
-	}
+    
+    depends_lib-append      port:postgis2
+
+    if {![variant_isset postgresql90] &&
+        ![variant_isset postgresql91] && 
+        ![variant_isset postgresql92]} {
+        return -code error "Please also select a postgresql variant"
+    }
 }
 
-variant	grass				description "Build the grass (6.4) plugin" {
+variant grass               description "Build Grass (6.42) plugin" {
 
-	depends_lib-append		port:grass
-	configure.args-append	"-DGRASS_PREFIX=${prefix}/share/grass-6.4.2"
+    depends_lib-append      port:grass
+    configure.args-append   \
+                "-DGRASS_PREFIX=${prefix}/share/grass-6.4.2"
 }
 
-configure.dir				${worksrcpath}/build									
-configure.cmd				cmake ..
+configure.dir               ${worksrcpath}/build                                    
+configure.cmd               cmake ..
 
-configure.args-append		"-DCMAKE_CXX_COMPILER=${configure.cxx}"
-configure.args-append		"-DCMAKE_C_COMPILER=${configure.cc}"
-configure.args-append		"-DEXPAT_INCLUDE_DIR=${prefix}/include"
-configure.args-append		"-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib"
-configure.args-append		"-DCMAKE_INSTALL_PREFIX=${applications_dir}"
-configure.args-append		"-DGDAL_CONFIG=${prefix}/bin/gdal-config"
-configure.args-append		"-DGDAL_INCLUDE_DIR=${prefix}/include"
-configure.args-append		"-DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib"
-configure.args-append		"-DGEOS_CONFIG=${prefix}/bin/geos-config"
-configure.args-append		"-DGEOS_INCLUDE_DIR=${prefix}/include/geos"
-configure.args-append		"-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib"
-configure.args-append		"-DGSL_CONFIG=${prefix}/bin/gsl-config"
-configure.args-append		"-DPROJ_INCLUDE_DIR=${prefix}/include"
-configure.args-append		"-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
-configure.args-append		"-DWITH_SPATIALITE:BOOL=NO"
-#configure.args-append       "-DSPATIALINDEX_INCLUDE=${prefix}/include"
-configure.args-append       "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
-configure.args-append		"-DPYTHON_INCLUDE_PATH=${Py_own_FRM}/Headers"
-configure.args-append       "'-DPYTHON_LIBRARY=-F${Py_own_FRM} -framework Python'"
-configure.args-append		"-DSIP_INCLUDE_DIR=${Py_own_FRM}/Headers"
-configure.args-append		"-DCMAKE_BUILD_TYPE=Release"
-configure.args-append       "-DQGIS_MACAPP_DEV_PREFIX=${frameworks_dir}"
-	
-# This is a fake but don't ask me why it is needed
-#configure.args-append		"-DSVN_MARKER=/usr/bin/svnversion"
-
+configure.args-append  "-DCMAKE_CXX_COMPILER=${configure.cxx}"
+configure.args-append  "-DCMAKE_C_COMPILER=${configure.cc}"
+configure.args-append  "-DEXPAT_INCLUDE_DIR=${prefix}/include"
+configure.args-append  "-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib"
+configure.args-append  "-DCMAKE_INSTALL_PREFIX=${applications_dir}"
+configure.args-append  "-DGDAL_CONFIG=${prefix}/bin/gdal-config"
+configure.args-append  "-DGDAL_INCLUDE_DIR=${prefix}/include"
+configure.args-append  "-DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib"
+configure.args-append  "-DGEOS_CONFIG=${prefix}/bin/geos-config"
+configure.args-append  "-DGEOS_INCLUDE_DIR=${prefix}/include/geos"
+configure.args-append  "-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib"
+configure.args-append  "-DGSL_CONFIG=${prefix}/bin/gsl-config"
+configure.args-append  "-DPROJ_INCLUDE_DIR=${prefix}/include"
+configure.args-append  "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
+configure.args-append  "-DWITH_SPATIALITE:BOOL=NO"
+configure.args-append  \
+        "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
+configure.args-append  "-DPYTHON_INCLUDE_PATH=${Py_own_FRM}/Headers"
+configure.args-append  \
+        "'-DPYTHON_LIBRARY=-F${Py_own_FRM} -framework Python'"
+configure.args-append  "-DSIP_INCLUDE_DIR=${Py_own_FRM}/Headers"
+configure.args-append  "-DCMAKE_BUILD_TYPE=Release"
+configure.args-append  "-DQGIS_MACAPP_DEV_PREFIX=${frameworks_dir}"
+    
 # Patch for proper linking of our own Python framework
 post-configure {
-	reinplace -E "s|(^\[^ \]*)|\\1 -F${worksrcpath}|" \
-		${worksrcpath}/build/src/python/CMakeFiles/qgispython.dir/link.txt
+    reinplace -E "s|(^\[^ \]*)|\\1 -F${worksrcpath}|" \
+      ${worksrcpath}/build/src/python/CMakeFiles/qgispython.dir/link.txt
 
+    # Setup Python stuff in order to gracefully link 
+    # against -framework Python
 
-	# Setup Python stuff in order to gracefully link 
-	# against -framework Python
+    set variantlist [split ${portvariants} "+"]
+    set Pyversion   [string replace [lindex ${variantlist} \
+                        [lsearch $variantlist "python*"]] 0 5]
+    set Pyverpath   [join [split ${Pyversion} ""] .]
 
-	set variantlist [split ${portvariants} "+"]
-	set Pyversion	[string replace [lindex ${variantlist} \
-						[lsearch $variantlist "python*"]] 0 5]
-	set Pyverpath	[join [split ${Pyversion} ""] .]
+    # Set up a fake framework in ${worksrcpath}/Python.framework
+    set Py_sys_FRM  \
+        "${frameworks_dir}/Python.framework/Versions/${Pyverpath}"
 
-	# Set up a fake framework in ${worksrcpath}/Python.framework
-	set Py_sys_FRM	"${frameworks_dir}/Python.framework/Versions/${Pyverpath}"
-
-	system \
-		"cd ${Py_own_FRM} ; \
-		 rm -f Headers Python Resources ; \
-		 ln -s ${Py_sys_FRM}/include/python${Pyverpath} Headers ; \
-		 ln -s ${Py_sys_FRM}/Python . ; \
-		 ln -s ${Py_sys_FRM}/Resources . ;"
-		 
-	# Workaround a bug in some clang version
     system \
+        "cd ${Py_own_FRM} ; \
+         rm -f Headers Python Resources ; \
+         ln -s ${Py_sys_FRM}/include/python${Pyverpath} Headers ; \
+         ln -s ${Py_sys_FRM}/Python . ; \
+         ln -s ${Py_sys_FRM}/Resources . ;"
+         
+    # Workaround a bug in some clang version
+    system \
         "cd ${worksrcpath}/build/src/crssync/CMakeFiles/crssync.dir ; \
          cat link.txt ${filespath}/patch_link_txt > link.txt.tmp ; \
          mv link.txt.tmp link.txt ;"
 }
 
-use_parallel_build			yes
-build.dir					${worksrcpath}/build
-destroot.target				install
+use_parallel_build          yes
+build.dir                   ${worksrcpath}/build
+destroot.target             install

Modified: branches/pixilla-mysqls-55/dports/gis/qlandkartegt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/gis/qlandkartegt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gis/qlandkartegt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,8 +5,8 @@
 PortGroup        cmake 1.0
 
 name             qlandkartegt
+version          1.6.0
 categories       gis
-version          1.5.3
 platforms        darwin
 maintainers      puffin.lb.shuttle.de:michael.klein
 license          GPL-2+
@@ -20,8 +20,8 @@
 homepage         http://www.qlandkarte.org/
 master_sites     sourceforge:project/qlandkartegt/qlandkartegt/QLandkarteGT%20${version}
 
-checksums        rmd160  68493c6bc030ad1416eb4a423c6d08e23f6aa29a \
-                 sha256  9b535d70b362475a1a8f19a142ce03f83757ab442599e6439471e40b544ddc92
+checksums        rmd160  5a8d734462bd7c53d4ba9562e89b01813eed2e82 \
+                 sha256  995a55cf45acba67aa0144b64782566187c3ed3240652f22d4002127f6f2fcb4
 
 depends_lib      port:libexif \
                  port:gdal \

Modified: branches/pixilla-mysqls-55/dports/gnome/atkmm/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/gnome/atkmm/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gnome/atkmm/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -33,12 +33,8 @@
     if { [file exists ${prefix}/lib/pkgconfig/atkmm-1.6.pc]
         && ![catch {set vers [lindex [registry_active gtkmm] 0]}]
         && [vercmp [lindex $vers 1] 2.22.0] < 0} {
-        
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc gtkmm "" [list ports_nodepcheck 1]
+
+        registry_deactivate_composite gtkmm "" [list ports_nodepcheck 1]
     }
 }
 

Modified: branches/pixilla-mysqls-55/dports/gnome/gst-plugins-good/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/gnome/gst-plugins-good/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gnome/gst-plugins-good/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,7 +8,7 @@
 
 name                gst-plugins-good
 version             0.10.31
-revision            5
+revision            6
 description         \
     A set of good-quality plug-ins for GStreamer under GStreamer's preferred \
     license, LGPL.

Modified: branches/pixilla-mysqls-55/dports/gnome/gst-plugins-ugly/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/gnome/gst-plugins-ugly/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/gnome/gst-plugins-ugly/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,7 +8,7 @@
 
 name                gst-plugins-ugly
 version             0.10.19
-revision            2
+revision            3
 description         \
     A set of good-quality plug-ins for GStreamer that might pose distribution \
     problems.

Modified: branches/pixilla-mysqls-55/dports/graphics/cairo/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/cairo/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/cairo/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -49,13 +49,9 @@
 # Prevent cairo from using librsvg, libspectre, poppler.
 patchfiles-append           patch-configure.diff
 
-if {${configure.compiler} == "clang" && [file exists ${configure.cc}]} {
-    # https://trac.macports.org/ticket/34137
-    set clang_minimum_version 318.0.61
-    regexp {/clang-([0-9.]+)} [exec ${configure.cc} -v 2>@1] -> clang_installed_version
-    if {[vercmp ${clang_installed_version} ${clang_minimum_version}] < 0} {
-        compiler.blacklist  clang
-    }
+# https://trac.macports.org/ticket/34137
+if {[vercmp $xcodeversion 4.3.3] <= 0} {
+    compiler.blacklist-append clang
 }
 
 pre-configure {


Property changes on: branches/pixilla-mysqls-55/dports/graphics/cairo-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/graphics/cairo:81083
   + /trunk/dports/graphics/cairo:81083
/trunk/dports/graphics/cairo-devel:99672-100173

Modified: branches/pixilla-mysqls-55/dports/graphics/cairo-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/cairo-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/cairo-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -45,13 +45,9 @@
 # Prevent cairo from using librsvg, libspectre, poppler.
 patchfiles-append           patch-configure.diff
 
-if {${configure.compiler} == "clang" && [file exists ${configure.cc}]} {
-    # https://trac.macports.org/ticket/34137
-    set clang_minimum_version 318.0.61
-    regexp {/clang-([0-9.]+)} [exec ${configure.cc} -v 2>@1] -> clang_installed_version
-    if {[vercmp ${clang_installed_version} ${clang_minimum_version}] < 0} {
-        compiler.blacklist  clang
-    }
+# https://trac.macports.org/ticket/34137
+if {[vercmp $xcodeversion 4.3.3] <= 0} {
+    compiler.blacklist-append clang
 }
 
 pre-configure {

Modified: branches/pixilla-mysqls-55/dports/graphics/edje/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/edje/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/edje/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    edje
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 maintainers             ryandesign openmaintainer
 categories              graphics x11
 platforms               darwin
@@ -22,8 +22,8 @@
 master_sites            http://download.enlightenment.org/releases/
 use_bzip2               yes
 
-checksums               rmd160  e8c576ee314b243aa87cd2833743f8fe45ceace3 \
-                        sha256  d924d7ade92055a5c83d3c43171982b7f006db9f5c923fb39e0523405ec4534c
+checksums               rmd160  e33f3460998422d442501bf063c3a115930f4c1d \
+                        sha256  c869ba2dbd0e26fd356292767a6029e1415d0f95f59f4f16fd2ca528dcba685e
 
 depends_build           port:pkgconfig
 depends_lib             port:ecore \

Modified: branches/pixilla-mysqls-55/dports/graphics/fontconfig/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/fontconfig/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/fontconfig/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,11 +3,9 @@
 
 PortSystem                  1.0
 PortGroup                   muniversal 1.0
-PortGroup                   archcheck 1.0
 
 name                        fontconfig
-version                     2.9.0
-revision                    1
+version                     2.10.2
 categories                  graphics
 maintainers                 ryandesign
 license                     fontconfig
@@ -22,8 +20,8 @@
 
 master_sites                ${homepage}release/
 
-checksums                   rmd160  9456d0ab2ae72086ec3edce9d72e007e2bf9bf1e \
-                            sha256  ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
+checksums                   rmd160  9601c470378021f6c810fdbe5400d6194d7a7aab \
+                            sha256  5c3bf994bb6d6303bbf1e641eaa4b431932138dc90de33642e5845e31e1fdfd6
 
 depends_build               port:pkgconfig
 
@@ -31,10 +29,6 @@
                             port:expat \
                             port:freetype
 
-archcheck.files             lib/libiconv.dylib \
-                            lib/libexpat.dylib \
-                            lib/libfreetype.dylib
-
 if {${os.platform} == "darwin" && ${os.major} < 9} {
     set add_fonts           /usr/X11R6/lib/X11/fonts
 } else {
@@ -42,13 +36,11 @@
 }
 set docdir                  ${prefix}/share/doc/${name}
 
-configure.args              --with-docdir=${docdir}
+patchfiles                  patch-docbook-4.2.diff
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=20208
-patch.pre_args              -p1
-patchfiles                  patch-check-arch-at-runtime.diff
+configure.args              --disable-silent-rules HASDOCBOOK=no
 
-# We put this into a pre-configure so it can be evaluated _after_ variants selection.
+# We put this into a pre-configure block so it can be evaluated _after_ platform selection.
 pre-configure {
     configure.args-append   --with-add-fonts=[join ${add_fonts} ,]
 }

Modified: branches/pixilla-mysqls-55/dports/graphics/graphviz/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/graphviz/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/graphviz/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -40,7 +40,7 @@
 minimum_xcodeversions           {9 3.1.2}
 
 if {${name} == ${subport}} {
-revision                        8
+revision                        9
 
 conflicts                       graphviz${otherbranch}
 


Property changes on: branches/pixilla-mysqls-55/dports/graphics/graphviz-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/graphics/graphviz:40607,45084-45153,79897
   + /trunk/dports/graphics/graphviz:40607,45084-45153,79897
/trunk/dports/graphics/graphviz-devel:99672-100173

Modified: branches/pixilla-mysqls-55/dports/graphics/graphviz-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/graphviz-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/graphviz-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -40,6 +40,8 @@
 minimum_xcodeversions           {9 3.1.2}
 
 if {${name} == ${subport}} {
+revision                        1
+
 conflicts                       graphviz${otherbranch}
 
 depends_build                   port:pkgconfig

Modified: branches/pixilla-mysqls-55/dports/graphics/harfbuzz/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/harfbuzz/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/harfbuzz/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                harfbuzz
-version             0.9.6
+version             0.9.7
 categories          graphics
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -18,8 +18,8 @@
 master_sites        http://www.freedesktop.org/software/harfbuzz/release/
 use_bzip2           yes
 
-checksums           rmd160  29d430b54f1e437d9c65a4eb917ca655691045e8 \
-                    sha256  394a849d6061993018754b0cc04110891ad215e3df3f6953b75dcc55a11f9d9b
+checksums           rmd160  51b1e0685df18f1953dd7a8db96afb338169d264 \
+                    sha256  bd2999859f8828461fedae23e4af52d926ac32a73245f03ae2d2065205e9cf25
 
 depends_build       port:pkgconfig
 


Property changes on: branches/pixilla-mysqls-55/dports/graphics/inkscape
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/dports/graphics/inkscape:99672-100173

Modified: branches/pixilla-mysqls-55/dports/graphics/inkscape/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/inkscape/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/inkscape/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -99,6 +99,9 @@
 
 compiler.blacklist clang
 
+# intltool needs to be run with the correct version of perl
+configure.env-append INTLTOOL_PERL=${prefix}/bin/perl5.12
+
 configure.args  --with-gnome-vfs \
                 --with-python \
                 --enable-lcms \

Modified: branches/pixilla-mysqls-55/dports/graphics/inkscape-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/inkscape-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/inkscape-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set bzr_rev     11865
+set bzr_rev     11888
 version         0.48.99.${bzr_rev}
 epoch           1
 license         GPL-2 LGPL-2.1

Modified: branches/pixilla-mysqls-55/dports/graphics/ipe/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/ipe/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/ipe/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -33,9 +33,11 @@
 
 use_configure           no
 
-build.env               CXXFLAGS="${configure.cxx_archflags}" \
-                        LDFLAGS="${configure.ld_archflags}"
+variant universal {}
 
+build.env               CXXFLAGS="[get_canonical_archflags cxx]" \
+                        LDFLAGS="[get_canonical_archflags ld]"
+
 build.args              IPEPREFIX=${prefix} \
                         ZLIB_CFLAGS="`pkg-config --cflags zlib`" \
                         ZLIB_LIBS="`pkg-config --libs zlib`" \

Modified: branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -37,6 +37,8 @@
     patchfiles-append           patch-contribs.pro.diff
 }
 
+variant universal {}
+
 variant x11 {}
 
 if {![variant_isset x11]} {
@@ -50,6 +52,13 @@
 
 post-patch {
     reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
+
+	if {[variant_isset universal]} {
+		file copy ${filespath}/universal.sh ${worksrcpath}
+		reinplace "s|@@@WRKSRCPATH@@@|${worksrcpath}|" ${worksrcpath}/universal.sh
+		reinplace "s|@@@ARCHS@@@|${configure.universal_cxxflags}|" ${worksrcpath}/universal.sh
+		system 'chmod +x ${worksrcpath}/universal.sh && ${worksrcpath}/universal.sh'
+	}
 }
 
 configure.pre_args              PREFIX=${prefix} \

Copied: branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/files/universal.sh (from rev 100173, trunk/dports/graphics/libQGLViewer/files/universal.sh)
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/files/universal.sh	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/graphics/libQGLViewer/files/universal.sh	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,10 @@
+#!/bin/sh
+for file in `find @@@WRKSRCPATH@@@ -name '*.pro'`; do
+	cat << EOT > ${file}.tmp
+QMAKE_CFLAGS_RELEASE += @@@ARCHS@@@
+QMAKE_CXXFLAGS_RELEASE += @@@ARCHS@@@
+QMAKE_LFLAGS_RELEASE += @@@ARCHS@@@
+EOT
+	cat ${file} >> ${file}.tmp
+	mv ${file}.tmp ${file}
+done

Modified: branches/pixilla-mysqls-55/dports/graphics/libiptcdata/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/libiptcdata/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/libiptcdata/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,27 +1,30 @@
+# -*- 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
+PortSystem          1.0
 
-name             libiptcdata
-version          1.0.2
-categories       graphics
-maintainers      technokracy.net:grrr
-description      IPTC parsing library
-long_description \
-    libiptcdata is a library for manipulating the International \
-    Press Telecommunications Council (IPTC) metadata stored \
-    within multimedia files such as images. This metadata can \
-    include captions and keywords, often used by popular photo \
-    management applications. The libiptcdata package also \
-    includes a command-line utility, iptc, for editing IPTC \
-    data in JPEG files.
-homepage         http://libiptcdata.sourceforge.net/
-platforms        darwin
-master_sites     sourceforge
-checksums        md5 4ed81889846a5d9b750331f684651f89 \
-                 sha1 017b51638bd66449c459de815b4f729a3cc5b1f2 \
-                 rmd160 7e8c0ceecb74bf7add4e1a92f4ca3fc514d00bab
+name                libiptcdata
+version             1.0.4
+categories          graphics
+platforms           darwin
+maintainers         technokracy.net:grrr
 
-depends_lib      port:gettext
+description         IPTC parsing library
 
-configure.args   --with-html-dir=${prefix}/share/doc
+long_description    libiptcdata is a library for manipulating the International \
+                    Press Telecommunications Council (IPTC) metadata stored \
+                    within multimedia files such as images. This metadata can \
+                    include captions and keywords, often used by popular photo \
+                    management applications. The libiptcdata package also \
+                    includes a command-line utility, iptc, for editing IPTC \
+                    data in JPEG files.
+
+homepage            http://libiptcdata.sourceforge.net/
+master_sites        sourceforge:project/libiptcdata/libiptcdata/${version}
+
+checksums           rmd160  64e1b7cd1d5166091227eb651f9945bc3862e39b \
+                    sha256  79f63b8ce71ee45cefd34efbb66e39a22101443f4060809b8fc29c5eebdcee0e
+
+depends_lib         port:gettext
+
+configure.args      --with-html-dir=${prefix}/share/doc


Property changes on: branches/pixilla-mysqls-55/dports/graphics/librsvg
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/dports/graphics/librsvg:99672-100173

Modified: branches/pixilla-mysqls-55/dports/graphics/librsvg/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/librsvg/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/librsvg/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           archcheck 1.0
 
 name                librsvg
-version             2.36.3
+version             2.36.4
 license             {GPL-2+ LGPL-2+}
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          graphics gnome
@@ -19,8 +19,8 @@
 master_sites        gnome:sources/${name}/${branch}/
 use_xz              yes
 
-checksums           rmd160  29285a92976e78a14a0a8603617310e57973735a \
-                    sha256  3d7d583271030e21acacc60cb6b81ee305713c9da5e98429cbd609312aea3632
+checksums           rmd160  b9765edaccd7e40997a3a141e4d21c5a13f6f2a1 \
+                    sha256  1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2
 
 depends_build       port:pkgconfig
 

Modified: branches/pixilla-mysqls-55/dports/graphics/opencv/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/opencv/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/opencv/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 
 name                            opencv
 version                         2.4.3
-revision                        0
+revision                        1
 categories                      graphics science
 license                         BSD
 platforms                       darwin
@@ -33,51 +33,97 @@
 depends_build-append            port:pkgconfig
 
 depends_lib-append              port:zlib \
-                                path:lib/libavcodec.dylib:ffmpeg \
+                                port:bzip2 \
                                 port:libpng \
+                                port:jpeg \
                                 port:tiff \
-                                port:jasper \
-                                port:jpeg \
-                                port:bzip2 \
+                                port:ilmbase \
                                 port:openexr \
-                                port:ilmbase \
-                                port:eigen3
+                                path:lib/libavcodec.dylib:ffmpeg
 
 patchfiles                      patch-fix_dirname_case.diff \
                                 patch-install_name.diff
 
-configure.args-append           -DBUILD_NEW_PYTHON_SUPPORT=OFF \
-                                -DBUILD_EXAMPLES=ON \
-                                -DINSTALL_C_EXAMPLES=ON \
-                                -DBZIP2_LIBRARIES=${prefix}/lib/libbz2.dylib \
-                                -DZLIB_LIBRARY=${prefix}/lib/libz.dylib \
+configure.args-append           -DWITH_1394=OFF \
+                                -DWITH_CARBON=OFF \
+                                -DWITH_CUBLAS=OFF \
+                                -DWITH_CUDA=OFF \
+                                -DWITH_CUFFT=OFF \
+                                -DWITH_EIGEN=OFF \
+                                -DWITH_FFMPEG=ON \
+                                -DWITH_GSTREAMER=OFF \
+                                -DWITH_GTK=OFF \
+                                -DWITH_IMAGEIO=OFF \
+                                -DWITH_IPP=OFF \
+                                -DWITH_JASPER=ON \
+                                -DWITH_JPEG=ON \
                                 -DWITH_OPENEXR=ON \
-                                -DWITH_1394=OFF \
-                                -DWITH_EIGEN=ON \
-                                -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3 \
+                                -DWITH_OPENGL=ON \
+                                -DWITH_OPENNI=OFF \
+                                -DWITH_PNG=ON \
+                                -DWITH_PVAPI=OFF \
+                                -DWITH_GIGEAPI=OFF \
+                                -DWITH_QT=OFF \
+                                -DWITH_QUICKTIME=OFF \
+                                -DWITH_TBB=OFF \
+                                -DWITH_CSTRIPES=OFF \
+                                -DWITH_TIFF=ON \
+                                -DWITH_UNICAP=OFF \
+                                -DWITH_V4L=OFF \
+                                -DWITH_VIDEOINPUT=OFF \
+                                -DWITH_XIMEA=OFF \
+                                -DWITH_XINE=OFF \
+                                -DWITH_OPENCL=OFF \
+                                -DWITH_OPENCLAMDFFT=OFF \
+                                -DWITH_OPENCLAMDBLAS=OFF \
+                                -DBUILD_SHARED_LIBS=ON \
+                                -DBUILD_DOCS=OFF \
+                                -DBUILD_EXAMPLES=OFF \
+                                -DBUILD_PERF_TESTS=OFF \
+                                -DBUILD_TESTS=OFF \
+                                -DBUILD_ZLIB=OFF \
+                                -DBUILD_TIFF=OFF \
                                 -DBUILD_JASPER=OFF \
                                 -DBUILD_JPEG=OFF \
                                 -DBUILD_PNG=OFF \
-                                -DBUILD_TIFF=OFF \
-                                -DBUILD_ZLIB=OFF
+                                -DBUILD_OPENEXR=OFF \
+                                -DPYTHON_EXECUTABLE=OFF \
+                                -DINSTALL_C_EXAMPLES=OFF \
+                                -DINSTALL_PYTHON_EXAMPLES=OFF \
+                                -DENABLE_PRECOMPILED_HEADERS=ON \
+                                -DCMAKE_VERBOSE=ON \
+                                -DZLIB_LIBRARY=${prefix}/lib/libz.dylib \
+                                -DBZIP2_LIBRARIES=${prefix}/lib/libbz2.dylib
 
+set opencv_linker_libs {"-Wl,-headerpad_max_install_names"}
+
 # gcc-4.0 exits with a bus error
-if {${configure.compiler} == "gcc-4.0"} {
-    configure.compiler gcc-4.2
-    if {![file executable ${configure.cc}]} {
-        depends_build-append port:apple-gcc42
-        depends_skip_archcheck-append apple-gcc42
-        configure.compiler apple-gcc-4.2
-    }
+compiler.blacklist              gcc-4.0
+
+# llvm-gcc-4.2 appears to be broken on old XCode (#35368)
+if {[vercmp $xcodeversion 4.4] <= 0} {
+    compiler.blacklist-append   llvm-gcc-4.2
 }
 
-platform darwin {
-    if {${os.major} <= 9} {
-        # Video Decode Acceleration Framework is not available
-        patchfiles-append       patch-highgui_CMakeLists.txt.diff
-    }
+compiler.blacklist-append       clang
+
+# GCC-4.2 workaround
+if {${configure.compiler} == "apple-gcc-4.2"} {
+    depends_build-append    port:apple-gcc42
+    depends_skip_archcheck-append apple-gcc42
 }
 
+# PCH broken when universal
+if {[variant_isset universal]} {
+    configure.args-delete       -DENABLE_PRECOMPILED_HEADERS=ON
+    configure.args-append       -DENABLE_PRECOMPILED_HEADERS=OFF
+}
+
+# Video Decode Acceleration Framework is not available
+if {${os.major} <= 9} {
+    patchfiles-append           patch-highgui_CMakeLists.txt.diff
+}
+
 post-destroot {
     xinstall -d ${destroot}${prefix}/lib/cmake
     move ${destroot}${prefix}/share/OpenCV/OpenCVConfig-version.cmake \
@@ -85,50 +131,79 @@
         ${destroot}${prefix}/lib/cmake/
 }
 
+variant eigen description {Enable eigen support.} {
+    depends_lib-append          port:eigen3
+    configure.args-delete       -DWITH_EIGEN=OFF
+    configure.args-append       -DWITH_EIGEN=ON \
+                                -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3
+}
+
+variant opencl description {Enable OpenCL support.} {
+    configure.args-delete       -DWITH_OPENCL=OFF
+    configure.args-append       -DWITH_OPENCL=ON
+}
+
+variant openni description {Enable OpenNI support.} {
+    depends_lib-append          port:openni
+    patchfiles-append           patch-cmake-OpenCVFindOpenNI.cmake.diff
+    configure.args-delete       -DWITH_OPENNI=OFF
+    configure.args-append       -DWITH_OPENNI=ON
+
+    post-patch {
+         reinplace "s,@@PREFIX@@,${prefix},g" ${worksrcpath}/cmake/OpenCVFindOpenNI.cmake
+    }
+}
+
 variant dc1394 description {Use libdc1394 for FireWire camera. Breaks compatibility with Apple iSight FireWire camera.} {
     depends_lib-append          port:libdc1394
     configure.args-delete       -DWITH_1394=OFF
     configure.args-append       -DWITH_1394=ON \
-                                -DHAVE_1394=ON
+                                -DHAVE_DC1394_2=ON
 }
 
-variant qt4 description {Use qt4 backend for graphical interface.} {
+variant qt4 description {Build with Qt Backend support.} {
     PortGroup                   qt4 1.0
+    configure.args-delete       -DWITH_QT=OFF
     configure.args-append       -DWITH_QT=ON
 }
 
-variant python26 conflicts python27 description {Add Python 2.6 bindings} {
+variant python26 conflicts python27 description {Add Python 2.6 bindings.} {
     depends_lib-append          port:python26 \
                                 port:py26-numpy
-    configure.args-delete       -DBUILD_NEW_PYTHON_SUPPORT=OFF
+    configure.args-delete       -DINSTALL_PYTHON_EXAMPLES=OFF \
+                                -DPYTHON_EXECUTABLE=OFF
     configure.args-append       -DINSTALL_PYTHON_EXAMPLES=ON \
-                                -DBUILD_NEW_PYTHON_SUPPORT=ON \
                                 -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
                                 -DPYTHON_LIBRARY=${prefix}/lib/libpython2.6.dylib \
                                 -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.6/Headers \
                                 -DPYTHON_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages
 }
 
-variant python27 conflicts python26 description {Add Python 2.7 bindings} {
+variant python27 conflicts python26 description {Add Python 2.7 bindings.} {
     depends_lib-append          port:python27 \
                                 port:py27-numpy
-    configure.args-delete       -DBUILD_NEW_PYTHON_SUPPORT=OFF
+    configure.args-delete       -DINSTALL_PYTHON_EXAMPLES=OFF \
+                                -DPYTHON_EXECUTABLE=OFF
     configure.args-append       -DINSTALL_PYTHON_EXAMPLES=ON \
-                                -DBUILD_NEW_PYTHON_SUPPORT=ON \
                                 -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
                                 -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
                                 -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
                                 -DPYTHON_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
 }
 
-variant tbb description {Use Intel TBB} {
+variant tbb description {Use Intel TBB.} {
     depends_lib-append          port:tbb
+    configure.args-delete       -DWITH_TBB=OFF
     configure.args-append       -DWITH_TBB=ON \
                                 -DHAVE_TBB=ON \
-                                -DTBB_INCLUDE_DIRS=${prefix}/include \
-                                -DOPENCV_LINKER_LIBS="-ltbb -ltbbmalloc"
+                                -DTBB_INCLUDE_DIRS=${prefix}/include
+    lappend opencv_linker_libs "-ltbb" "-ltbbmalloc"
 }
 
+pre-configure {
+    configure.args-append       -DOPENCV_LINKER_LIBS=\"[join ${opencv_linker_libs} " "]\"
+}
+
 livecheck.type                  sourceforge
 livecheck.name                  opencvlibrary
 livecheck.regex                 /OpenCV-(\[0-9a-z.\]+)${extract.suffix}

Copied: branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-cmake-OpenCVFindOpenNI.cmake.diff (from rev 100173, trunk/dports/graphics/opencv/files/patch-cmake-OpenCVFindOpenNI.cmake.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-cmake-OpenCVFindOpenNI.cmake.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-cmake-OpenCVFindOpenNI.cmake.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,13 @@
+--- cmake/OpenCVFindOpenNI.cmake.orig	2012-11-14 03:26:38.000000000 +0400
++++ cmake/OpenCVFindOpenNI.cmake	2012-11-14 11:19:10.000000000 +0400
+@@ -26,8 +26,8 @@
+         find_library(OPENNI_LIBRARY "OpenNI64" PATHS $ENV{OPEN_NI_LIB64} DOC "OpenNI library")
+     endif()
+ elseif(UNIX OR APPLE)
+-    find_file(OPENNI_INCLUDES "XnCppWrapper.h" PATHS "/usr/include/ni" "/usr/include/openni" DOC "OpenNI c++ interface header")
+-    find_library(OPENNI_LIBRARY "OpenNI" PATHS "/usr/lib" DOC "OpenNI library")
++    find_file(OPENNI_INCLUDES "XnCppWrapper.h" PATHS "@@PREFIX@@/include/ni" "@@PREFIX@@/include/openni" DOC "OpenNI c++ interface header")
++    find_library(OPENNI_LIBRARY "OpenNI" PATHS "@@PREFIX@@/lib" DOC "OpenNI library")
+ endif()
+ 
+ if(OPENNI_LIBRARY AND OPENNI_INCLUDES)

Deleted: branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig	2012-05-11 15:34:43.000000000 +0200
-+++ CMakeLists.txt	2012-05-11 15:35:19.000000000 +0200
-@@ -295,7 +295,6 @@
-   include(CheckIncludeFile)
- endif()
- 
--include(cmake/OpenCVPCHSupport.cmake REQUIRED)
- include(cmake/OpenCVModule.cmake REQUIRED)
- 
- # ----------------------------------------------------------------------------

Modified: branches/pixilla-mysqls-55/dports/graphics/pdf2djvu/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/pdf2djvu/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/pdf2djvu/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                pdf2djvu
-version             0.7.15
+version             0.7.16
 categories          graphics textproc
 platforms           darwin
 license             GPL-2
@@ -20,8 +20,8 @@
 distname            ${name}_${version}
 worksrcdir          ${name}-${version}
 
-checksums           rmd160  6c53f54aed35c8ebbafae22908b98db61d8f419f \
-                    sha256  9541833eca904fa4425ad9a940ca837fb3dfc93ca5b6120c5ebf813cb0e4d144
+checksums           rmd160  0d6873f94e7ef296f73b4f4e4efd1ba2a2f56809 \
+                    sha256  dbda2086d0f164d0da6e785f8ffd6f252bf805ce7930127d42aab9dbf1bde4f9
 
 depends_build       port:pkgconfig \
                     port:gsed

Modified: branches/pixilla-mysqls-55/dports/graphics/qwt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/qwt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/qwt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,6 +8,9 @@
 revision            2
 conflicts           qwt52 qwt-60 qwt-devel
 categories          graphics science
+# actually a little more permissive than the standard LGPL, but the
+# distinction doesn't matter to us.
+license             LGPL-2.1
 maintainers         michaelld openmaintainer
 description         Qt Widgets for Technical Applications, version 5.1
 long_description    \

Modified: branches/pixilla-mysqls-55/dports/graphics/qwtplot3d/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/qwtplot3d/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/qwtplot3d/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,8 @@
 version             0.2.7
 revision            4
 categories          graphics science
+# mostly zlib license, but gl2ps is LGPL
+license             LGPL
 platforms           darwin
 maintainers         michaelld openmaintainer
 

Modified: branches/pixilla-mysqls-55/dports/graphics/tiff/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/graphics/tiff/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/graphics/tiff/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup  xcodeversion 1.0
 
 name		tiff
-version		3.9.5
+version		3.9.7
 categories	graphics
 license		BSD
 maintainers	nomaintainer
@@ -30,8 +30,8 @@
 		http://dl.maptools.org/dl/libtiff/ \
 		freebsd
 
-checksums       sha1    f40aab20fb2f609b5cbc1171c40b66a1445e3773 \
-                rmd160  c67742bf6b9b10ca0700e69ce575007d40c4f89c
+checksums       rmd160  16d4b099965dd0b1073642c9d293a42ade58923a \
+                sha256  f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a
 
 depends_lib	port:jpeg port:zlib
 
@@ -48,8 +48,8 @@
 
 post-configure {
     if {[variant_isset universal]} {
-        system "cd ${worksrcpath}/libtiff \
-                && ed - tif_config.h < ${filespath}/libtiff__tif_config.h.ed \
+        system -W ${worksrcpath}/libtiff \
+                "ed - tif_config.h < ${filespath}/libtiff__tif_config.h.ed \
                 && ed - tiffconf.h < ${filespath}/libtiff__tiffconf.h.ed \
                 && touch stamp-h1 && touch stamp-h2"
     }

Modified: branches/pixilla-mysqls-55/dports/irc/bahamut/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/irc/bahamut/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/irc/bahamut/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,55 +1,52 @@
+# -*- 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
-name		bahamut
-conflicts	whois
-version		1.8.9
-description	Bahamut is an Internet Relay Chat Daemon (IRCd) designed for DALnet.
-long_description	${description}
-maintainers	nomaintainer
-categories	irc
-platforms	darwin 
-homepage	http://bahamut.dal.net/
-distname	${name}-${version}-release
-master_sites	${homepage}/download ftp://ftp.dal.net/dalnet/server/bahamut/
 
-checksums	md5     e1a2b6ffab3c7a88bdd0a3561da4e5ee \
-		sha1    64b783ed04983bb1f5ea2b75b3a479888413fb3e \
-		rmd160  35b61b35aac8240b984c2a91ac16dcc47fb1a29b
+PortSystem          1.0
 
-patchfiles	patch-support.c
+name                bahamut
+conflicts           whois
+version             2.0.4
+maintainers         ryandesign openmaintainer
+categories          irc
+platforms           darwin
+license             GPL-1+
 
-depends_lib	port:openssl
-#depends_lib	lib:libsoup-2:libsoup port:evolution-data-server
+description         Bahamut is an Internet Relay Chat Daemon (IRCd) designed for DALnet.
 
-worksrcdir	${name}-${version}
+long_description    ${description}
 
-configure.args	--enable-openssl=${prefix}
+homepage            http://www.dal.net/?page=Bahamut
+master_sites        http://code.dal.net/release/
 
-universal_variant	no
+checksums           rmd160  064658279a5fd1fd64bc118693e60d9847c2baf1 \
+                    sha256  4a045e66de03972e56b3c9cc33d98e60a5d52f826afb89ba06d4b42f4aa241d1
 
-pre-build {
-	reinplace "s|INSTALL_DIR=${prefix}|INSTALL_DIR=${destroot}${prefix}|g" \
-		${worksrcpath}/Makefile
-	reinplace "s|INSTALL_DIR=${prefix}|INSTALL_DIR=${destroot}${prefix}|g" \
-		${worksrcpath}/src/Makefile
-	reinplace "s|INSTALL_DIR=${prefix}|INSTALL_DIR=${destroot}${prefix}|g" \
-		${worksrcpath}/tools/Makefile
-	reinplace "s|INSTALL_DIR=${prefix}|INSTALL_DIR=${destroot}${prefix}|g" \
-		${worksrcpath}/doc/Makefile
-}
+depends_lib         port:openssl
 
+patchfiles          patch-CPPFLAGS.diff \
+                    patch-support.c.diff
+
+# Undefined symbols:
+#  "_first_visible_channel", referenced from:
+#      _m_who in m_who.o
+patchfiles-append   patch-src-m_who.c.diff
+
+configure.args      --enable-openssl=${prefix}
+
+configure.universal_args-delete --disable-dependency-tracking
+
+destroot.destdir    INSTALL_DIR=${destroot}${prefix}
+
 post-destroot {
-	file rename ${destroot}${prefix}/convert_conf ${destroot}${prefix}/bin/
-	file rename ${destroot}${prefix}/mkpasswd ${destroot}${prefix}/bin/
-	file rename ${destroot}${prefix}/ircd ${destroot}${prefix}/bin/
-	file rename ${destroot}${prefix}/ircd.motd ${destroot}${prefix}/etc/
-	file rename ${destroot}${prefix}/opers.txt ${destroot}${prefix}/etc/
-	file rename ${destroot}${prefix}/template.conf ${destroot}${prefix}/etc/
-	file rename ${destroot}${prefix}/reference.conf ${destroot}${prefix}/etc/
-	file rename ${destroot}${prefix}/make-cert.cnf ${destroot}${prefix}/etc/
-	file rename ${destroot}${prefix}/make-cert.sh ${destroot}${prefix}/bin/
-	reinplace "s|${destroot}${prefix}|${prefix}/etc|g" ${destroot}${prefix}/bin/make-cert.sh
-}	
+    foreach f {ircd mkpasswd make-cert.sh} {
+        move ${destroot}${prefix}/${f} ${destroot}${prefix}/bin
+    }
+    foreach f {ircd.motd make-cert.cnf opers.txt reference.conf template.conf} {
+        move ${destroot}${prefix}/${f} ${destroot}${prefix}/etc
+    }
+    reinplace "s|${destroot}${prefix}|${prefix}/etc|g" ${destroot}${prefix}/bin/make-cert.sh
+}
 
-livecheck.type	regex
-livecheck.regex	${name}-(\[0-9.\]+)-release\\.tar
+livecheck.type      regex
+livecheck.url       [lindex ${master_sites} 0]
+livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

Copied: branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-CPPFLAGS.diff (from rev 100173, trunk/dports/irc/bahamut/files/patch-CPPFLAGS.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-CPPFLAGS.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-CPPFLAGS.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig	2012-11-25 16:51:16.000000000 -0600
++++ src/Makefile.in	2012-11-27 18:43:29.000000000 -0600
+@@ -8,7 +8,7 @@
+ INSTALL_BIN=@INSTALL_PROGRAM@
+ INSTALL_DIR=@INSTALL_DIR@
+ CFLAGS=@CFLAGS@ -fno-strict-aliasing
+-CPPFLAGS=@CPPFLAGS@ -I../include
++CPPFLAGS=-I../include @CPPFLAGS@
+ LDFLAGS=@LDFLAGS@
+ 
+ RES_SRC =
+--- tools/Makefile.in.orig	2012-11-25 16:51:16.000000000 -0600
++++ tools/Makefile.in	2012-11-27 18:43:23.000000000 -0600
+@@ -8,7 +8,7 @@
+ INSTALL_BIN=@INSTALL_PROGRAM@
+ INSTALL_DIR=@INSTALL_DIR@
+ CFLAGS=@CFLAGS@ -fno-strict-aliasing
+-CPPFLAGS=@CPPFLAGS@ -I../include
++CPPFLAGS=-I../include @CPPFLAGS@
+ LDFLAGS=@LDFLAGS@
+ 
+ mkpasswd_SOURCES = mkpasswd.c

Copied: branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-src-m_who.c.diff (from rev 100173, trunk/dports/irc/bahamut/files/patch-src-m_who.c.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-src-m_who.c.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-src-m_who.c.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- src/m_who.c.orig	2012-11-27 19:53:36.000000000 -0600
++++ src/m_who.c	2012-11-27 19:53:47.000000000 -0600
+@@ -642,7 +642,7 @@
+     return 1;
+ }
+ 
+-inline char *first_visible_channel(aClient *cptr, aClient *sptr)
++static inline char *first_visible_channel(aClient *cptr, aClient *sptr)
+ {
+     Link *lp;
+     int secret = 0;

Deleted: branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c
===================================================================
--- branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,18 +0,0 @@
---- src/support.c.org	Thu Jan  6 14:52:31 2005
-+++ src/support.c	Thu Jan  6 14:52:55 2005
-@@ -33,7 +33,6 @@
- 				 */
- extern void outofmemory();
- 
--#if !defined( HAVE_STRTOKEN )
- /*
-  * *  strtoken.c --   walk through a string of tokens, using a set
-  * of separators 
-@@ -69,7 +68,6 @@
-     *save = pos;
-     return (tmp);
- }
--#endif /* !HAVE_STRTOKEN */
- 
- #if !defined( HAVE_STRTOK )
- /* NOT encouraged to use! */

Copied: branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c.diff (from rev 100173, trunk/dports/irc/bahamut/files/patch-support.c.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/irc/bahamut/files/patch-support.c.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,18 @@
+--- src/support.c.org	Thu Jan  6 14:52:31 2005
++++ src/support.c	Thu Jan  6 14:52:55 2005
+@@ -33,7 +33,6 @@
+ 				 */
+ extern void outofmemory();
+ 
+-#if !defined( HAVE_STRTOKEN )
+ /*
+  * *  strtoken.c --   walk through a string of tokens, using a set
+  * of separators 
+@@ -69,7 +68,6 @@
+     *save = pos;
+     return (tmp);
+ }
+-#endif /* !HAVE_STRTOKEN */
+ 
+ #if !defined( HAVE_STRTOK )
+ /* NOT encouraged to use! */

Modified: branches/pixilla-mysqls-55/dports/java/android/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/java/android/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/java/android/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortSystem 1.0
 
 name		    android
-version		    20
+version		    21
 categories	    java devel emulators
 maintainers	    openmaintainer krischik
 platforms	    darwin
@@ -28,9 +28,9 @@
 extract.only	    ${appbundles}
 
 checksums           ${prog}						\
-                    md5     b6b6035ccec55ec2aa057438eb1db1f4 \
-                    sha1    1696d8d20daf57720782ffb97e81a801cee6fe42 \
-                    rmd160  88be043797eecc91430b5034889d8b805d08eb17 \
+                    md5     67e46adca90dd18d7291443f6c15d6af \
+                    sha1    0c29f5f5ab556ce4555682264d9c6414fc905c20 \
+                    rmd160  ed76f904700c822b436d2443b6d44712ad0f3310 \
                     ${appbundles}					\
                     md5     408ea03d28968f0d55937920c7886aa0 \
                     sha1    da35b8f67f1e5bef1bf1e272e20c4e303ee42a27 \

Modified: branches/pixilla-mysqls-55/dports/java/hadoop/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/java/hadoop/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/java/hadoop/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -25,7 +25,8 @@
                     patch-src-native.diff \
                     patch-src-c++.diff
 
-depends_build       bin:ant:apache-ant
+depends_build       bin:ant:apache-ant \
+                    port:autoconf port:automake port:libtool
 depends_lib         port:zlib \
                     port:snappy
 

Modified: branches/pixilla-mysqls-55/dports/java/trove4j/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/java/trove4j/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/java/trove4j/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,9 @@
 version         2.1.0
 revision        1
 categories      java
+license         LGPL-2.1+
 platforms       darwin
+supported_archs noarch
 maintainers     nomaintainer
 description     high performance collections for Java objects and primitive types
 long_description    ${description}

Modified: branches/pixilla-mysqls-55/dports/java/xercesj/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/java/xercesj/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/java/xercesj/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,11 +5,11 @@
 
 name				xercesj
 version				2.11.0
-
 categories			java textproc
 license				Apache-2 W3C
 maintainers			nomaintainer
 platforms			darwin
+supported_archs			noarch
 
 description			Apache Xerces 2 Java XML Parser
 long_description	The Xerces 2 Java Parser supports XML 1.0 Third Edition\; \

Modified: branches/pixilla-mysqls-55/dports/kde/amarok-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/amarok-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/amarok-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,7 @@
 version             git-20090927
 revision            4
 categories          kde kde4
+conflicts           amarok
 maintainers         illogic-al openmaintainer
 description         Amarok, the world-renowned media player.
 long_description    Amarok is a music player and manager with an intuitive \

Modified: branches/pixilla-mysqls-55/dports/kde/analitza/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/analitza/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/analitza/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                analitza
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2 GFDL-1.2
@@ -19,8 +19,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  6aee87d1d160f3490aa8a397125ce69fff84ad33 \
-                    sha256  d2e0c4873e9da0a5fdf7a62e6cc9094755f0c49db5247b5ed8776f792b50db9e
+checksums           rmd160  ef7a34fec5c690b47d3bd6afc85da5ef541c5ee9 \
+                    sha256  c609c94c911b5c6c32a8578901e5e0416bc9acb3cc9a35a39724470a90f426d1
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/ark/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/ark/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/ark/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                ark
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  8aa48c2e4382bf7f2be39632811e30ae5cd53a04 \
-                    sha256  4b4b71451ba0d1a793dfef03bf6ed0d8a3c9d1ba7904504a8b33ce622dc952d8
+checksums           rmd160  3e1bc8148a255f5594dff6789a4407432507df0e \
+                    sha256  944d787c15763ed057db343adb917b5f0bf9841c34c39198594521c3dec45732
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons \
@@ -31,5 +31,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/blinken/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/blinken/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/blinken/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                blinken
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2
 maintainers         sharky nicos
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  5c1d57e23699e4d6ecf0b26748fced68b159cf8e \
-                    sha256  07b090bd92b0572c467fa8ce591f4f5cc83e99b97802b0fedc7e080d23a10c7e
+checksums           rmd160  8d06dd4f11c478d505542e2252fd504dea80da86 \
+                    sha256  9266b702c376dd59c4aac95e53e6065031bdc1e0c125c6cf7483b1a22d05768d
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/cantor/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/cantor/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/cantor/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                cantor
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2
 maintainers         sharky nicos
@@ -19,8 +19,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  b53cd13f795e0ec744f94c5ee4f895f6fa4725a4 \
-                    sha256  4fc5f898234ed9723a68c889cb9758a35b5cf53c54ed627e1a36ba728139a8f9
+checksums           rmd160  00cfee5265b736234516a7976a08f2a021a5b253 \
+                    sha256  c7530d9dcd26ae2d78ed4be248688f6970c029a37d6e67982cf3860665eec950
 
 patchfiles          patch-deactivateBackends.diff
 
@@ -28,5 +28,5 @@
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/gwenview/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/gwenview/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/gwenview/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                gwenview
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -16,8 +16,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            gwenview-${version}
-checksums           rmd160  fa320a95123fefead1f58b90867afbec19d31e80 \
-                    sha256  daba1d0fa79970b602a421dae479d8e05a7af895a4ee16de7e2583d0276c14c5
+checksums           rmd160  c1d9b5fc96dad405deb7d84d92eb169d98d897d6 \
+                    sha256  c9db4be02cf2e709af003be6f6cafd472b801cf90c9122ca6e1acfcf542debf4
 
 depends_lib-append  port:kdelibs4 \
                     port:kde4-baseapps \
@@ -35,5 +35,5 @@
  depends_lib-append port:kipi-plugins
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     gwenview-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/gwenview/files/patch-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/gwenview/files/patch-CMakeLists.txt.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/gwenview/files/patch-CMakeLists.txt.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig	2011-08-17 16:17:14.000000000 -0400
-+++ CMakeLists.txt	2011-08-17 16:17:19.000000000 -0400
-@@ -72,7 +72,6 @@
+--- CMakeLists.txt.orig	2012-08-13 18:31:28.000000000 +0900
++++ CMakeLists.txt	2012-11-12 01:25:10.000000000 +0900
+@@ -72,7 +72,7 @@
  add_subdirectory(icons)
  add_subdirectory(cursors)
- add_subdirectory(fullscreenthemes)
+ add_subdirectory(color-schemes)
 -add_subdirectory(doc)
++#add_subdirectory(doc)
  
  configure_file(config-gwenview.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gwenview.h)
  

Modified: branches/pixilla-mysqls-55/dports/kde/kalgebra/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kalgebra/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kalgebra/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kalgebra
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  82b18177227edf566467d7458f8dac765085437e \
-                    sha256  f3727aeef4cc61dd196a21479b0876ee197659210c1f3d85c8219f9a2ef2d48a
+checksums           rmd160  e50bce95c69641471876521debccc708ca14b043 \
+                    sha256  287cbb0540830b3ab60510fcfac0adf0120155a410dfaeea187e77624167bd2d
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kalzium/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kalzium/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kalzium/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kalzium
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2
 maintainers         sharky nicos
@@ -19,14 +19,14 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  7ac1416d67a805a101a319401f4a1341d310f82c \
-                    sha256  2de11d2209cc7c0eecab2b88a6e718a033d42c3bcbe58580dadb60812162e256
+checksums           rmd160  0d59ad56b9a38057d39d4947e8a77b27d607f429 \
+                    sha256  8018556d1f631f8cb1a6689c1737cf608c880ccdf5e33b2f56ec994ffde861e5
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles      patch-CMakeLists.txt.diff
 }
 
 configure.args-append   WITH_Avogadro=OFF
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kamera/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kamera/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kamera/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kamera
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -16,18 +16,16 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kamera-${version}
-checksums           rmd160  4b8e9130923809ea1dbe73332224f9a3c20651bd \
-                    sha256  b726026eecd0835672092bc09fb66e8d2b493373ae61bbefd1439f423169486a
+checksums           rmd160  6327645efdf53b6dc84c9022c1262ded549e0f17 \
+                    sha256  76d31bd477d7db944e53e4ba463f0c862baa63c8bfbe499b22cbcd8b3f4296cd
 
 depends_lib-append  port:kdelibs4 \
                     port:gphoto2
 
-patchfiles-append   patch-gphoto25.diff
-
 if {![variant_isset docs]} {
     patchfiles-append \
                     patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kamera-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Deleted: branches/pixilla-mysqls-55/dports/kde/kamera/files/patch-gphoto25.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kamera/files/patch-gphoto25.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kamera/files/patch-gphoto25.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,142 +0,0 @@
-diff -ur ../kamera-4.8.3.orig/CMakeLists.txt ./CMakeLists.txt
---- ../kamera-4.8.3.orig/CMakeLists.txt	2011-07-28 03:42:05.000000000 +0900
-+++ ./CMakeLists.txt	2012-08-16 13:16:05.000000000 +0900
-@@ -10,6 +10,13 @@
- find_package(Gphoto2)
- macro_log_feature(GPHOTO2_FOUND "gphoto2" "Required to build kamera" "http://heanet.dl.sourceforge.net/sourceforge/gphoto" TRUE "" "")
- 
-+check_library_exists(gphoto2_port gp_port_info_get_name "" GPHOTO2_5)
-+if(GPHOTO2_5)
-+    message(STATUS "Found libgphoto 2.5")
-+else(GPHOTO2_5)
-+    message(STATUS "libgphoto 2.5 not found, assuming libgphoto2 2.4")
-+endif(GPHOTO2_5)
-+set(HAVE_GPHOTO2_5 ${GPHOTO2_5})
- 
- configure_file(config-kamera.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kamera.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-diff -ur ../kamera-4.8.3.orig/config-kamera.h.cmake ./config-kamera.h.cmake
---- ../kamera-4.8.3.orig/config-kamera.h.cmake	2011-07-28 03:42:05.000000000 +0900
-+++ ./config-kamera.h.cmake	2012-08-16 13:18:34.000000000 +0900
-@@ -3,3 +3,6 @@
- 
- /* Define if we have __va_copy */
- #cmakedefine HAVE___VA_COPY 1
-+
-+/* Define if we have gp_port_info_get_name (trigger for 2.5) */
-+#cmakedefine HAVE_GPHOTO2_5 1
-Only in ./kcontrol: .DS_Store
-diff -ur ../kamera-4.8.3.orig/kcontrol/kameradevice.cpp ./kcontrol/kameradevice.cpp
---- ../kamera-4.8.3.orig/kcontrol/kameradevice.cpp	2011-07-28 03:42:05.000000000 +0900
-+++ ./kcontrol/kameradevice.cpp	2012-08-16 13:45:37.000000000 +0900
-@@ -35,6 +35,8 @@
- #include <KConfig>
- #include <KMessageBox>
- 
-+#include "config-kamera.h"
-+
- extern "C" {
- 	#include <gphoto2.h>
- }
-@@ -373,8 +375,15 @@
- 	}
- 	for (int i = 0; i < gphoto_ports; i++) {
- 		if (gp_port_info_list_get_info(list, i, &info) >= 0) {
-+#ifdef HAVE_GPHOTO2_5
-+			char *xpath;
-+			gp_port_info_get_path (info, &xpath);
-+			if (strncmp(xpath, "serial:", 7) == 0)
-+				m_serialPortCombo->addItem(QString::fromLocal8Bit(xpath).mid(7));
-+#else
- 			if (strncmp(info.path, "serial:", 7) == 0)
- 				m_serialPortCombo->addItem(QString::fromLocal8Bit(info.path).mid(7));
-+#endif
- 		}
- 	}
- 	gp_port_info_list_free(list);
-diff -ur ../kamera-4.8.3.orig/kioslave/kamera.cpp ./kioslave/kamera.cpp
---- ../kamera-4.8.3.orig/kioslave/kamera.cpp	2011-07-28 03:42:05.000000000 +0900
-+++ ./kioslave/kamera.cpp	2012-08-16 13:18:10.000000000 +0900
-@@ -3,6 +3,7 @@
-     Copyright (C) 2001 The Kompany
- 		  2001-2003	Ilya Konstantinov <kde-devel at future.shiny.co.il>
- 		  2001-2008	Marcus Meissner <marcus at jet.franken.de>
-+		  2012		Marcus Meissner <marcus at jet.franken.de>
- 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-@@ -59,11 +60,19 @@
- {
- 	KDE_EXPORT int kdemain(int argc, char **argv);
- 
-+#ifdef HAVE_GPHOTO2_5
-+	static void frontendCameraStatus(GPContext *context, const char *status, void *data);
-+	static unsigned int frontendProgressStart(
-+		GPContext *context, float totalsize, const char *status,
-+		void *data
-+	);
-+#else
- 	static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data);
- 	static unsigned int frontendProgressStart(
- 		GPContext *context, float totalsize, const char *format,
- 		va_list args, void *data
- 	);
-+#endif
- 	static void frontendProgressUpdate(
- 		GPContext *context, unsigned int id, float current, void *data
- 	);
-@@ -972,10 +981,16 @@
- }
- 
- unsigned int frontendProgressStart(
--	GPContext * /*context*/, float totalsize, const char *format, va_list args,
-+	GPContext * /*context*/, float totalsize,
-+#ifdef HAVE_GPHOTO2_5
-+	const char *status,
-+#else
-+	const char *format, va_list args,
-+#endif
- 	void *data
- ) {
- 	KameraProtocol *object = (KameraProtocol*)data;
-+#ifndef HAVE_GPHOTO2_5
- 	char *status;
- 
- 	/* We must copy the va_list to walk it twice, or all hell
-@@ -1009,14 +1024,26 @@
- 
- 	object->infoMessage(QString::fromLocal8Bit(status));
- 	delete [] status;
-+#else
-+	/* libgphoto2 2.5 has resolved this already, no need for print */
-+	object->infoMessage(QString::fromLocal8Bit(status));
-+#endif
- 	object->totalSize((int)totalsize); // hack: call slot directly
- 	return GP_OK;
- }
- 
- // this callback function is activated on every status message from gphoto2
--static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
--{
-+static void frontendCameraStatus(
-+	GPContext * /*context*/,
-+#ifdef HAVE_GPHOTO2_5
-+	const char *status,
-+#else
-+	const char *format, va_list args,
-+#endif
-+	void *data
-+) {
- 	KameraProtocol *object = (KameraProtocol*)data;
-+#ifndef HAVE_GPHOTO2_5
- 	char *status;
- 
- 	/* We must copy the va_list to walk it twice, or all hell
-@@ -1049,4 +1076,7 @@
- #endif
- 	object->infoMessage(QString::fromLocal8Bit(status));
- 	delete [] status;
-+#else
-+	object->infoMessage(QString::fromLocal8Bit(status));
-+#endif
- }

Modified: branches/pixilla-mysqls-55/dports/kde/kanagram/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kanagram/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kanagram/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kanagram
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2
 maintainers         sharky nicos
@@ -19,12 +19,15 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  e37f59a35d60ac643bf4603fb801abe1597abd76 \
-                    sha256  a15f2fa7431365d706aa2b606c9a0455c07950242ed727333abaf36e666301db
+checksums           rmd160  8a5d16e9292439e522353590417071ea8cc28495 \
+                    sha256  79c40bbc52e7a508e6f6d40dfc584d96e72802962ce23679786cdf44a55a5d3b
 
-if {![variant_isset doc]} {
-    patchfiles      patch-CMakeLists.txt.diff
+#Prevents the package to make a framework
+patchfiles          patch-CMakeLists-engine.diff
+
+if {![variant_isset docs]} {
+    patchfiles-append       patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Copied: branches/pixilla-mysqls-55/dports/kde/kanagram/files/patch-CMakeLists-engine.diff (from rev 100173, trunk/dports/kde/kanagram/files/patch-CMakeLists-engine.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kanagram/files/patch-CMakeLists-engine.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/kde/kanagram/files/patch-CMakeLists-engine.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,37 @@
+--- src/engine/CMakeLists.txt.orig	2012-08-13 18:10:41.000000000 +0900
++++ src/engine/CMakeLists.txt	2012-11-12 02:04:41.000000000 +0900
+@@ -84,20 +84,20 @@
+ 
+ set_target_properties(kanagramengine PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} DEFINE_SYMBOL MAKE_KANAGRAM_ENGINE_LIB)
+ 
+-if(APPLE)
+-    #hack for being able to set headers as public in a osx framework
+-    list(APPEND KanagramEngine_HEADERS
+-        ${KanagramEngine_HEADERS}
+-    )
+-
+-    set_target_properties(KanagramEngine PROPERTIES FRAMEWORK TRUE)
+-    set_target_properties(KanagramEngine PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Frameworks")
+-    set_target_properties(KanagramEngine PROPERTIES PUBLIC_HEADER "${KanagramEngine_HEADERS}")
+-
+-    set(MACOSX_FRAMEWORK_IDENTIFIER engine)
+-    set(MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${GENERIC_LIB_SOVERSION})
+-    set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${GENERIC_LIB_VERSION})
+-endif()
++#if(APPLE)
++#    #hack for being able to set headers as public in a osx framework
++#    list(APPEND KanagramEngine_HEADERS
++#        ${KanagramEngine_HEADERS}
++#    )
++#
++#    set_target_properties(KanagramEngine PROPERTIES FRAMEWORK TRUE)
++#    set_target_properties(KanagramEngine PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Frameworks")
++#    set_target_properties(KanagramEngine PROPERTIES PUBLIC_HEADER "${KanagramEngine_HEADERS}")
++
++#    set(MACOSX_FRAMEWORK_IDENTIFIER engine)
++#    set(MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${GENERIC_LIB_SOVERSION})
++#    set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${GENERIC_LIB_VERSION})
++#endif()
+ 
+ install(
+     TARGETS     kanagramengine

Modified: branches/pixilla-mysqls-55/dports/kde/kate/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kate/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kate/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kate
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             LGPL-2+
 maintainers         nicos openmaintainer
@@ -20,11 +20,11 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kate-${version}
-checksums           rmd160  01ac0dca795d7ceb63fdaee6e6a1baeb941ab6f8 \
-                    sha256  4e016d99d42f037dc553e8d0c69fd488715de58b6ef4831fc53ca0feceb44f8d
+checksums           rmd160  ca3413b4ef2660f61cf2a557f72e264d8b1b5265 \
+                    sha256  c941aa6007d7e6683c4374ce329d0b72dbdd49ea1825b7e3777ac2c4fab6a642
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kate-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kbruch/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kbruch/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kbruch/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kbruch
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2
 maintainers         sharky nicos
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  e787cebf4a77d3f0bcca2cd70aec987e92c7b78a \
-                    sha256  a102598959daf6fa85f7eb07dcb0ce1521636884c0928d0c49c0a558568e758b
+checksums           rmd160  72f1b99e4cdc216e2d35b9041f000c4d94931291 \
+                    sha256  b01b9139d085d9d1a32c658e7d52b792a59faaf8052d6be74e824b0431acdfd6
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kcalc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kcalc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kcalc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kcalc
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -18,8 +18,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  62efe02d900888ba63377bc9d223719fe64dd9a8 \
-                    sha256  befc43fb12e84f6c8bc16720321e6ed4bc8e1de06b642fc13e70fe442be9f053
+checksums           rmd160  419a49e94e4ff5caea13f3bee7fe0fa91dcb6447 \
+                    sha256  e08dca71e5952dea797a0a69de0385d30cff4a8f3f1e84e1967cdc3745e07706
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
@@ -28,5 +28,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kcharselect/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kcharselect/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kcharselect/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kcharselect
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -18,8 +18,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  8d2ff25121e46a9f6aa700918c138149cc4e8aa3 \
-                    sha256  268b8c1a0173365067e7ab5af1265bf42f12287eb31914600b1f1c7b4b1a9c59
+checksums           rmd160  98b3b80bd427eeeabfa6c65f9a9af2fd21ed7810 \
+                    sha256  7e8b8a4af075b1053584d7db8ed5d2d8dcec6b3a4710ce7e9fbfaed4bdae31e4
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
@@ -28,5 +28,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kcolorchooser/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kcolorchooser/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kcolorchooser/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kcolorchooser
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             MIT
 maintainers         nicos openmaintainer
@@ -16,10 +16,10 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kcolorchooser-${version}
-checksums           rmd160  684b22dd90522e02103282f22f65e75f459ebaef \
-                    sha256  2c53078cce0c51691cbbc242110dc1ebb5438aabcaf6a66211f47d0fbdde2403
+checksums           rmd160  32358ad883075d0c808efb579f570bbc0b69ec48 \
+                    sha256  7bb77741d6c85f122864f3ee0639e5156aac7045f8bf22b99664af1ccf573fe8
 
 depends_lib-append  port:kdelibs4
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kcolorchooser-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ar/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ar/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ar/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ar
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  91d48e6f1ea223f1cf8460ed3169f02ec94d89d5 \
-                    sha256  51297a16cb40239558db05a41fea383c932984004815e6045929d9e691b91d0f
+checksums           rmd160  00b616ac1f395970bdd07fd489fe715e676ba888 \
+                    sha256  c23c5ab1baed5c0595ee7c3b9de5016659f3f46cfefbe919dc31773201c11cfd
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-bg/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-bg/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-bg/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-bg
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  1619c974bdfc9a1ab671ca27154d73b9e799ab5b \
-                    sha256  85078146696f12c93429086a8a001338f8fa1a3329c17dbb3a1bd7e430e1520d
+checksums           rmd160  e67452082cc8c09cef970c45b807e9546ec6cf2c \
+                    sha256  9e6613126291f99f33627cb3fff14c39639da796e583ee452e6b27dcc0041160
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-bs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-bs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-bs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-bs
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  ab46a2d5e3a2acf051272b5b75c2484c6fff80c8 \
-                    sha256  949e5829eaa86916710d24ae7778df4522151b7680f749eb909005583f0932fb
+checksums           rmd160  4477fc6afb429790875ac755ec2f64cfe7f034f2 \
+                    sha256  74e31f2e6d2f01571b9e60a1abcceffb2d839f242ba6040c826a028f03dfb3ff
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ca
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  093537da6e5eafbc92fc052db2cb0dd7d1c15b19 \
-                    sha256  d4f7a6118087a7729431c5d97c7a2453880a7c3d071b4e2328d197fb9fdc7bec
+checksums           rmd160  8d2ee18357a9184707cfaaaba56d75feefa56533 \
+                    sha256  674235ebffdcf05dcb5c93c2f0b231ac3ce4ebf8e865579cad1f58cc7e21c583
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca-valencia/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca-valencia/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ca-valencia/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ca-valencia
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -22,8 +22,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  bc361341ed402363ac18f3413ecb806791952be0 \
-                    sha256  d12e609b58f776af3ec7168a9ff1621c8fc576dbd020a9d87537b1064ea73883
+checksums           rmd160  820c05af2afafb03913452c987f70bcafabd4339 \
+                    sha256  790284a5e1356cbdef213c3c090ebbb5e0a15c88642845ab8ef8d3d879c27b5d
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-cs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-cs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-cs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-cs
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  8d89e70b4359b7288266d1881c06f5938af9c656 \
-                    sha256  54ce409fe06ed9bc54d49097c576588fe135156d2ef5eb967aa5a0fd21d74d4c
+checksums           rmd160  a92228979c13f9cf045e123c86f96044f8613da3 \
+                    sha256  6d0694945a3cbe327abca9cf9a0cd419913e88ba07f6a7b24e67aa14296ed3b7
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-da/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-da/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-da/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-da
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -18,8 +18,8 @@
 master_sites    kde:stable/${version}/src/kde-l10n/
 use_xz          yes
 
-checksums           rmd160  d0fd55b2f5d413d5218b7736c48eb1b6163a929a \
-                    sha256  7c8b816cdbe44c7a7064d3b37484ff77c76c0dbc033c271ccdc20a680f482579
+checksums           rmd160  4f4f2f1329bcd39ae72c855f78e26f6d09daecf3 \
+                    sha256  4434e6335572bad6c69c3c6f6c17b95c41e1ff8f1319444f0c64270b3192f9c0
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-de/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-de/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-de/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-de
-version         4.8.5
+version         4.9.3
 
 categories      kde kde4
 maintainers     nicos
@@ -22,8 +22,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  757eee38bfcd90f6c5e17d066266a6fb5ca30f86 \
-                    sha256  380750d2318a190bdd690adc6e527be9086421116fdc80b1ca075deb86b15fdd
+checksums           rmd160  e3ef522f23ff80e26031b04ffa7678740d2a5e27 \
+                    sha256  68a244069ab336f3afa75f44c42f5b974a7447a2af813771e174cefa737fcde9
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-el/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-el/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-el/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-el
-version         4.8.5
+version         4.9.3
 
 categories      kde kde4
 maintainers     nicos
@@ -22,8 +22,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  b079e5a74f4934cac94310375bb8343d886114ca \
-                    sha256  34d9449023c8cc234a0f2fc6e9ebba69735c6603df99f0afdb40d0a2095e2f7d
+checksums           rmd160  0f4923fe656b5acd48f628a2efbad1973dc98e1d \
+                    sha256  040ce01e6f554cb951801ab9aa60000d44bc3d83021a243ff9db1d4ef2b9393c
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-en_GB/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-en_GB/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-en_GB/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-en_GB
-version         4.8.5
+version         4.9.3
 
 categories      kde kde4
 maintainers     nicos
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  6ce6a664da00e5b1a9d2e6b83d527f73623d3ae6 \
-                    sha256  33d6f1f501c1d8739e44352c104793e3dacf4ee53e834e8592b3358e42bc9582
+checksums           rmd160  00469c8bfa3b47e6ae0e66b921bc4763eb7032ac \
+                    sha256  abc98aafdac66c6df6c8f00bb71cd15def714ed68f483c93bd9b4d3d4333c235
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-es/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-es/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-es/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-es
-version         4.8.5
+version         4.9.3
 
 categories      kde kde4
 maintainers     nicos
@@ -22,8 +22,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  a40c02b2798ba90f968c5384ddfbe387c72dfc58 \
-                    sha256  8cebb1e509ed9e79d7e2cbfcf1a653360f3e97cbb93817e3e7d24a43c7fb6499
+checksums           rmd160  b6a03f6b547577fa53b7dd1a9ad8c05577e9c529 \
+                    sha256  ce03b316811bfa6ce500e29995f2a1b9088aa0bcedc6f1647926454280faec84
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-et/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-et/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-et/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-et
-version         4.8.5
+version         4.9.3
 
 categories      kde kde4
 maintainers     nicos
@@ -22,8 +22,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  d3ec6459685539ac684f6f01f9f317ce86dc80f8 \
-                    sha256  cd5151e117741e3133b97ebd598f214689a6b3ee75f36e1089bf2b6f0f1d887e
+checksums           rmd160  485787c490f5eb84b50027c6e1105ff995af1c37 \
+                    sha256  dc7dd39370632207511b3467473f1e82cd36bb93e419efbb17da5d4acf5e3f37
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-eu/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-eu/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-eu/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-eu
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  fc794de503bfa95337d7d73bee2c86229cda2802 \
-                    sha256  f7438d837de3ee341e2e39bf268850e2fb03df1d59ba08142a96e78369de3b14
+checksums           rmd160  792ab3444555bd1119b5e231a6fed0e630dd2233 \
+                    sha256  538a1fa5f3959672407fc1dcafd349b79fb18669a7623d9ae0ede266f830bb2e
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-fa/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-fa/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-fa/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-fa
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  f677081bf7d7ad9c1e2910863b80a6e13256ba23 \
-                    sha256  1d26381ac3195111296a98afbb87a756d623744b58d931c494b9748f8aa9f763
+checksums           rmd160  3db8d2efde92533f4790a0ea833c184fb677c5be \
+                    sha256  369ef958aac5d765475ec4137eb8195825ed7a82e9b43a0a130a665d67b07e2e
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-fi/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-fi/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-fi/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-fi
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  5ab2fb054e3c6eae40340bb5eccb6aeff7568016 \
-                    sha256  349b92c313c165fefa3fd27914b77e69cac018c8e04a79c48085ca0c4b3bc11f
+checksums           rmd160  cc8c5afc33d0bfc1cd9f4d0457cdde8654c93835 \
+                    sha256  fc0f6c2a8e9b78f84af40c53222c4cc6624bd05c7c48fd88f64eb812f0c6b7a0
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-fr/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-fr/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-fr/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-fr
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  e8bfc5627e2735d91e6333a7064c3f62cdb8fcc8 \
-                    sha256  90e8d8a408ccba4dfcb0fb4d346d490cf1dd314ba68fe550eafa27fde5700a19
+checksums           rmd160  414fec1ec9be6250ad809708620aa20735a75de8 \
+                    sha256  fb2d16f2b65ae95b9bb7b656780c5e3df777e4322f2e7e78220aafb59ec39b28
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ga/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ga/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ga/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ga
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  a00d628f6d1fc189337d4166b1ba99dd722bca88 \
-                    sha256  dffa512c473f5814f71a0a18579fbc0c2276489fab2533a1d2e22b3a078ae006
+checksums           rmd160  28431adac189e10e03fca6062a1f5604819bd433 \
+                    sha256  1b32b462f082757cd00db79b25f1eba13efc7dc440cc195ca4c2baa452b23395
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-gl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-gl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-gl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-gl
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  479d60fb4161c5926fe40bffca1ea7f61c1f4a27 \
-                    sha256  222c83b1b4835fcfd59cfbb763b37caf1b6207f92c2b6a4bb870faf87038735b
+checksums           rmd160  10f1c21c92b0c4977f1bce270a96359090357ef4 \
+                    sha256  1a4b9a1286f9eca890b101d3c0159852dee62cb8c2fc5896b7b515f5326222e2
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-he/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-he/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-he/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-he
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  538f60132feb7b903179743c5cc1b1a30870fbfc \
-                    sha256  c380c7711069e243d28c816a0393373446daf399d796db65954c47aaf1840b52
+checksums           rmd160  56f87072592fdaf171c638be32acf067e81b6742 \
+                    sha256  4e00fdbd926aec4f6be30fb3cfb91b4dc7094d2ce0fd5717ad9e280b1286bee9
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-hr/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-hr/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-hr/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-hr
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  7ec8a931346b0a1b6e35f0b684b421ff7d720e61 \
-                    sha256  f916576db46f88f2b23112c4fbe57316bd1ac25be8f6fe705372a4e0d1622d13
+checksums           rmd160  df557ce558bda83452e63ae84c3b528bd5043786 \
+                    sha256  cce7cf9dc3fc6ddfed62b45e8026e59be5952712716210e52f56118229aa842e
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-hu/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-hu/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-hu/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-hu
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  b67f549e34ab713d50763c4d64bf6652d58c4d36 \
-                    sha256  3ef46453ac509322e34903bcda7e06d5de668837081310a2f16c319203a7cb28
+checksums           rmd160  a37b3a5618ce96a02a46b06aa2e530b7de53eeb0 \
+                    sha256  f76d1794653b0a1942e0628f66759b5466d5a089f327de8776cbc6c48c5dde11
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ia/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ia/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ia/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ia
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  e661023a9cd5ceabc3605a6a0bebcf3637b2b5b8 \
-                    sha256  a68a2b2eb9e392edb5f5fa97113dbef96716b2abeab25dc6f18617b9b4f79240
+checksums           rmd160  88eee6383d7db6bd81f0a76b1eed4ccae9f5d79a \
+                    sha256  bf03aead21d92d9c70ddf4954952e2e9f33d4e4e4358aa8c021eb90573f4cd75
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-is/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-is/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-is/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-is
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  a47a7a7cffacfcddeb46906774c2a532c88ac69d \
-                    sha256  4857c96363030da522052d58d90ce26c416df612f8378b06c55981bf2bc3a2a2
+checksums           rmd160  11bf443f70d5de2ad313b322ff9f5f5b83f886d5 \
+                    sha256  d2b9f2acbda6f0506dad56d774620e19a20856cce474daf44bb40e5de59ebc64
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-it/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-it/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-it/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-it
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -20,8 +20,8 @@
 
 depends_lib     port:kdelibs4
 
-checksums           rmd160  951f35deefb793c919a0bf55009f5a36c3a57afa \
-                    sha256  0065b6706be26cf009b958708ea6f8144cb7f1be533d9eb7d03583d77539361a
+checksums           rmd160  a6e10cbc297e4bb8c54ff76b42bf1f2ac6e24ac2 \
+                    sha256  cbac014d983998bfab2f063c308b812ba3c5972bf8776b2006b8d6e2b671c563
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ja/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ja/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ja/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ja
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  bf7a6db0b12402a8f09d76431b724dcdaf21d9ef \
-                    sha256  3bdeff645a9df011463d262aedcfd1eb8eea3ac13d219d137a5eaa9aa6badae8
+checksums           rmd160  aaeb648afcad30db6e94eff7950bc46232f4a9b9 \
+                    sha256  11e102eecd70bb35893b24bd7708de4ab2051e496f288bc469d7707ed4d4739e
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-kk/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-kk/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-kk/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-kk
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  e05e6971294e454bc13a6126f587eae1ce1e2a47 \
-                    sha256  0fc0c1af666af0331823af54fc535246511f564c4b8144ef33f67415e41c39e8
+checksums           rmd160  d36c323a5b9cd98d54c19dbf8caacf664fb754bf \
+                    sha256  90bc3854f00ae10481f12d473e931f292a26cf8d1cfb149334e959cc037bd468
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-km/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-km/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-km/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-km
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  e987cfb14444f9cc9ef04beea113a83c2a63c98a \
-                    sha256  5fc9e7912bb58aaf173693c19419da4ec2d752e0824d49449e85990235369b66
+checksums           rmd160  e2dceae0e8298d49fb0e130e770366f775ec4d62 \
+                    sha256  557a3bb3315ca021e1f00cba09064f408f76d533cb1e7c6c737532c6edd95a0c
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ko/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ko/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ko/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ko
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  c886cff916fe2b33aa0e2db67790b749dafe3619 \
-                    sha256  b0faa8b3f8e76bb3558cc2fa5a2acef5461ce715634413fa2a01051b337ed2fe
+checksums           rmd160  67e82a63002fe16a12b041a69e8789752c951758 \
+                    sha256  cd4fb720c9364f65b1905dc671ad9d5866911c3aaf4aea07518310f2cd803965
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-lt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-lt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-lt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-lt
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  c7b284510ba4258c404c076c58e45d683fc0176a \
-                    sha256  c06b8fbe87e3062a6d16297a4903cbc7ab546c73076edd833a2d50a7f87d8840
+checksums           rmd160  5055d9f5af3416b492b8b45bfd5668d5b3f5c9e0 \
+                    sha256  4b2663a4f99f02d99915c4254abc10ce1e4cc32c1aa4c4339ec83710ea1d0bc3
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-lv/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-lv/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-lv/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-lv
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  9dde13cd55c4344575ed0c5bda9316548ac3828d \
-                    sha256  fcb990309c9884cbede774680d5c5db4c207d56e051d4469b545b4f808156b88
+checksums           rmd160  fb08d6d20f0a071246d122d73a25571a6a9e6fe1 \
+                    sha256  210d7e3667e240dea5ab42e9c2f7a286299288a4f0e1e23f79f066d57d392bae
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-nb/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-nb/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-nb/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-nb
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  e69f9e1a37976800028966f6199031a12b288cd6 \
-                    sha256  ea08eac932044715952536820711cf7503f2a4e8fa58010768de8d8074272aa3
+checksums           rmd160  1a3423cfd2f0b3180a27d563cf0b3c5d1ab4db3f \
+                    sha256  5f0d846c4cd922831dade771aea2b496f39ad0ed8d8ae7428a8675773dd1ba49
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-nds/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-nds/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-nds/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-nds
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  8a014c2f3d2670072b0aadbfaf2d43c784325dec \
-                    sha256  cb2096130fff2c71ce7942c3e03490b971268f19819adbe3d4c0f167dc9c5506
+checksums           rmd160  27ec4e646bb784442f42a26d8ddde8ed6e43f02d \
+                    sha256  175907222604ea1961c4c07ee254e7b5bb109127f3a470f4039544db4d447521
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-nl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-nl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-nl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-nl
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  53751ba509b43ba2824dc8e08fc03e7e28c4fec6 \
-                    sha256  a5655300f6fe2c5ba67d5254903b16cdddff3b2031a109d2b58bfd35929832dd
+checksums           rmd160  e5475f249be801fdd7b9a32b070992f305bccfb4 \
+                    sha256  d1e832084d4eae5471d71223758359e5067f229a2e1a78639b74b31c7818c9cb
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-nn/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-nn/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-nn/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-nn
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  d869e9c1a6ef83aaec9e86b5f7d46be5a6c1d331 \
-                    sha256  25cc6e1152c55ef7b6cac27bea58635570e8dc55ccd28f74c8b7894b289de9a4
+checksums           rmd160  179246987d34743fa0104c1e42140d6387cc8f08 \
+                    sha256  e8b8fc75046a9dde3e1f99516f3c4609806d955dd9f49860e590ede9cbba6f06
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-pa/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-pa/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-pa/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-pa
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  d4adc97116055672ae95632263433b122be387c8 \
-                    sha256  8da3e6a6109568dd6f3a5ea7e9fe406fe0f5271f18dc3e77a51334b5a32c5be5
+checksums           rmd160  4b4475743304d0102c7ad0a51e3b5856c7031943 \
+                    sha256  4d34b71dd3ba2bd52eacf9da8a4bc7ccd39c2f7658c852655800f3c450d39d4a
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-pl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-pl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-pl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-pl
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  f3f2dff2b8ac25e26cf94e88955007f9b20fe302 \
-                    sha256  cb65105990aa6a7820c27225e9b072b3469f28c0108fc55db0f4eb9e83f25344
+checksums           rmd160  70f44b2d55062260d5fb05e1897595050b8df309 \
+                    sha256  1304c9d9e57871d2baa77e6d8f2480efed14589a114a07ab5a78e20395a18afa
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-pt
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  f5fcc27a64a3f753e5cb09f7f618f2b6f6eade81 \
-                    sha256  8e36810f64631756789e2d913747153873a47f032b651dfa0e938cc1972e883d
+checksums           rmd160  a67556cb4ba269447ad3756accb8eaf237bfb4bf \
+                    sha256  1398a4cd39fdbfd2f70e1658c81bf7c54da2307f6a7ece6a36ba649cf52e2d53
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt_BR/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt_BR/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-pt_BR/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-pt_BR
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  910fcdb65334ce0353dcb1e96739fa6ee792c461 \
-                    sha256  e03dc26f139ac9dec640beb53f7084ae25871272da25721749229836fd11e7e7
+checksums           rmd160  9bfb755e972262dc20e5d53930029c71875aaf62 \
+                    sha256  21b23ee3fb677b52140c9106418f5f7b9a93a8692ad151e724d0206035772b8e
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ro/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ro/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ro/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ro
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  3f66b055f592b26a2961001cd45c65966098d638 \
-                    sha256  e4f43eafa5bd15b146f565c09ab2421e24bb624597a9196afe528742015e101a
+checksums           rmd160  3e2e2523e86c2da6af1d92ef01735c1b78e817c3 \
+                    sha256  c5107608ab48e565ded9728ccb918905f85e46d40816fd7bddaa04e0564383f8
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ru/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ru/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ru/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ru
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  1d4f56c1521a9db5bbf13d245eda2e91eb034c0d \
-                    sha256  bb7d8247c7417ac3ea1f3ca3d1dc530bce1cd5ea952c525a8ad5e477e70937a9
+checksums           rmd160  cc78b521da377d702b592144b618932ae387f114 \
+                    sha256  93fecd9f442e23888310087c78e471d4c592e80402de8b268bec238736b6e877
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-si/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-si/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-si/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-si
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  c4b1334237aa32fb4aa96b717d1623ffba679ab0 \
-                    sha256  abd9729903d1a4e7c2ef0380491c64bb989aa20867e14d9fb6735148182962fb
+checksums           rmd160  ba2c07f2fe2358b3eaecfab2d503ef28f79a62e6 \
+                    sha256  d8f0fe824efc8c6e511161e368b31787419498765e73412639e35bab40127178
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-sk/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-sk/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-sk/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-sk
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  9793f5411a88fba0613be98d396fe371fa4737bd \
-                    sha256  02ee21cee6632ccea4e77144c33ef2cc013cbd90f15d7ab8c156892801aab40a
+checksums           rmd160  71471a79309be2a7b3068a0fe4539c141eb224df \
+                    sha256  b7d4d38c576e94dd9406649782202725d3a35ca2ef78da5d7834eb290408c734
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-sl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-sl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-sl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-sl
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  4a9fd2111d85e030691d406e52dd3b82602a4dc7 \
-                    sha256  c085612ba6020b9d020c37dea670db15f81024bc80c540534ce35dceec1c8477
+checksums           rmd160  aab027efaba76a434683a7e13c7d908dc67ec6db \
+                    sha256  b47ecb2f364edca7a29626a7412dfc4f309016b2e723b4e0f4edd810a6a0f3d1
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-sr/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-sr/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-sr/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-sr
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  695f9c8fe16f10d5a4d75e71a412aecd4f72b29d \
-                    sha256  b4d50033021da57367ea0a010226c430e40ee821f65aa3f3ba1632038fc78d48
+checksums           rmd160  4903faf63897fa10a7e1d48011d4d27cee496c83 \
+                    sha256  2364d7cb11c88ac4b1b2357b40ac6adbeda51f731cb60b53a38c36183713aa9a
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-sv/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-sv/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-sv/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-sv
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  c11bd2ad41e5827df3170ccb71caa9c7ef3689de \
-                    sha256  0e61cccb7b1261eaaabb822a7b8471bfa860848e7a1956904da9526428267870
+checksums           rmd160  d2904bcfe0f5779792488fb4a92bc60c2b7fdda6 \
+                    sha256  56fda4e61b615ea00d043f2ff9d6185b73678f76079f3d48c1063627de0884cf
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-tg/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-tg/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-tg/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-tg
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  b1c40a08a3954bfb84c21132590debb028cb2d4b \
-                    sha256  766f53f591745cd5ab3c841007a2cf4b38875f0a339f142549f0890e03d6509c
+checksums           rmd160  e7dd4b2bbc3ec7d50331e124997fc22b53a3e1f9 \
+                    sha256  eaf573e5e95558dd9bcc2cc607ca3a29c612223109af5aa6f7f8d0db903d7bd9
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-th/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-th/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-th/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-th
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  3bff6380ec9666d3507f2274cd431cd2ba678ef7 \
-                    sha256  289de8f0ccee87d9febba16f595525ed9c9065e68d2e01c886537168468c786c
+checksums           rmd160  cf41bc56dbe50aa68188936be281f8b8090c1496 \
+                    sha256  c54e9391475315e00a852c478818a352c3558f6acc00f3967f243d2df5dad66f
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-tr/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-tr/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-tr/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-tr
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  664c3e0440087521e1403088d6ac079389df679f \
-                    sha256  913855381200d69fb628fbfbad419e265e932ab432ebe9d0d0d36ba772342cb8
+checksums           rmd160  034d2cbe0719e9219144cfcfe757233a0e435889 \
+                    sha256  d3922ac32a5fe8b0b1c8766e7dae817abe9a6a41f200657cca58ccf049c460fe
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-ug/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-ug/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-ug/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-ug
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  91d8d29c233ae78a4969655f289d84b35fa7601a \
-                    sha256  811c87cc43f179ca7b67a35ee2f19154f6c75af762a67cf2f12aee1a13b13bb7
+checksums           rmd160  51cc2d06235d44d4d09331d44241a989dda1c44c \
+                    sha256  2817cd2c026e09b60ff52bf4e9941dca76e1ca87ac0cb38d3a9228a8680bb8c9
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-uk/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-uk/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-uk/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-uk
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  ed154bcfdd83f67a0ff3ce37fdc59c055ab235ae \
-                    sha256  c725f204e9756b608bd6fecd081ae14b6a591df69aae2293469ae12a906150e8
+checksums           rmd160  93eb23649e69e71af67b4e1a306a869ce972e41e \
+                    sha256  7350faed3175bca249945e4228c1b8390f8a1a643fc8145a6651370a20a5ad6a
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-vi/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-vi/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-vi/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-vi
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  d07ca3cd288c4d8ecbd237a28e7daa7dea6c5082 \
-                    sha256  46d01ecaf65d1ab1907b6a03895c9a6a7b6e8b8ae3a65ca4a3e23ecf86112e9b
+checksums           rmd160  55ac60f598a18378b820310f5741c61f3872dcf4 \
+                    sha256  04885a5c3bba366f97840903e67c1d72f4ff62e636c25b037c83d9d750ccb076
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-wa/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-wa/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-wa/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-wa
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  69b0172af02768a588700e978a9d25afc5d39b7c \
-                    sha256  8462f34067b971729b0d91ad888a40ef4c7e6c520f1ee4a91325169d2fa76bb5
+checksums           rmd160  6eba315370aee24f42e0bdb3e28469b8de91c3bf \
+                    sha256  18b16d409a20440b3275cc67e5abc525e5b447326f8836b81b2b8ab82493fc39
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_CN/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_CN/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_CN/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-zh_CN
-version         4.8.5
+version         4.9.3	
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  2723e13d75e23526a8b46385063429bd70acb1ae \
-                    sha256  4c43545aec464525f845791004fbcfd9a063f88585bf16b4b8d7abc8f53d65bd
+checksums           rmd160  a6ae34194e199653aad9aade601692b9671212c1 \
+                    sha256  4c1aa01470fcf335553b4345d4498dd2db4a01d2feb8b1ad08f95016574d26f0
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_TW/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_TW/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-l10n-zh_TW/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       kde4 1.1
 
 name            kde-l10n-zh_TW
-version         4.8.5
+version         4.9.3
 categories      kde kde4
 maintainers     nicos
 license         {LGPL-2.1 LGPL-3+ GPL-2+ MIT BSD}
@@ -21,8 +21,8 @@
 supported_archs noarch
 depends_lib     port:kdelibs4
 
-checksums           rmd160  21ffce888c8e3f46dceadd1e56bc405582a28bd1 \
-                    sha256  4fd05d84eb2d4ef0ccdb33fe2df2b547c372dd1f2ade0865d80fa5fb6c3d40ac
+checksums           rmd160  1cf73a60e490e5561bd1de72b050df07b80e8995 \
+                    sha256  28c1038bc5873ba767e561551387972b5b4aeec8b0cf7a6ed8d3f92b99923007
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff

Modified: branches/pixilla-mysqls-55/dports/kde/kde-wallpapers/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde-wallpapers/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde-wallpapers/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kde-wallpapers
-version             4.8.5
+version             4.9.3
 categories			kde kde4
 license             LGPL-3
 maintainers         sharky nicos
@@ -16,12 +16,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  c4a5e5981aaf3b261e92411ea0bb48f7d01c3522 \
-                    sha256  f17ef740b7d03c1b8fbb8026d2bb93b0594c4f9c3dbd7961d03672739ff57028
+checksums           rmd160  650abcdb6128d7f75443aa44775f25599e311bc3 \
+                    sha256  9d825f5583fe3ac08b7250242ce50a28aa0328bf52407995641b9b80aa1b8bc0
 
 depends_lib-append  port:kdelibs4
 
 universal_variant   no
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kde-baseapps-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kde4-baseapps/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde4-baseapps/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde4-baseapps/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,21 +5,21 @@
 PortGroup           kde4   1.1
 
 name                kde4-baseapps
-version             4.8.5
-categories			kde kde4
+version             4.9.3
+categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+ GFDL-1.2
 description         KDE4 applications and libraries from the base package
 long_description    Core desktop applications and libraries for the KDE4 desktop. \
                     This port installs the file manager dolphin file manager.
-platforms      	    darwin
+platforms           darwin
 homepage            http://www.kde.org
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kde-baseapps-${version}
 
-checksums           rmd160  f2a2b5e66cff717f993639bf5cb1deea4cdd2dc0 \
-                    sha256  7e3d85264c3eeb3a4d9c474e208b5ac3d6280a6a179889012c0b97d9dd1d418c
+checksums           rmd160  88445082e9f599dba770d3e22c5eb63544c1cbb4 \
+                    sha256  26314e40abc5c138c1772aa1cdb61696550284ed5a170f19728b2deb12514bb7
 
 depends_lib-append  port:kdelibs4 \
                     port:qimageblitz \
@@ -30,5 +30,5 @@
 
 universal_variant   no
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kde-baseapps-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kde4-filelight/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde4-filelight/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde4-filelight/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kde4-filelight
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -19,8 +19,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            filelight-${version}
-checksums           rmd160  78eb453218ac55024104cc7527dc416b4d3a19fb \
-                    sha256  7ea754f2449676b075d44986895a639cc2c402c5539d103e08e56a66e289f852
+checksums           rmd160  83debaf205c3352df7ffb19ccc5887511f1f3354 \
+                    sha256  63df6363f9dbfca0d795c8bac4a98f95f0274803ea3155357acfddce9bb2d61c
 
 patchfiles          fix-filelight-mounts.diff \
                     fix-filelight-cache.diff
@@ -32,5 +32,5 @@
     patchfiles-append       patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     filelight-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kde4-runtime/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kde4-runtime/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kde4-runtime/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kde4-runtime
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2.1+
@@ -18,10 +18,13 @@
 use_xz              yes
 distname            kde-runtime-${version}
 
-checksums           rmd160  ede7114dd00a82796f9d8c7926000cb78b421efe \
-                    sha256  8be7022998a174090c98be93eb59a258891139b8f6210d729821b5111ccf5a37
+checksums           rmd160  826f48089d1a59f4b4a64a862643cf905e5925c2 \
+                    sha256  f02138705a7e448b02e8e77a1f90d422c280a993df3dee98887b6ff73806ef64
 
 depends_lib-append  port:kdelibs4 \
+                    port:kdepimlibs4 \
+                    port:kactivities \
+                    port:nepomuk-core \
                     port:libssh \
                     port:qimageblitz \
                     port:oxygen-icons \
@@ -60,5 +63,5 @@
     file delete ${destroot}${prefix}/include/nepomuk/resourcewatcher.h
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kde-runtime-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdeadmin/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdeadmin/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdeadmin/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeadmin
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+ GFDL-1.2
@@ -20,8 +20,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  dd004c14c04ca4c7c5e10e92c88783b38193b766 \
-                    sha256  a2299bc3bb1225766908bb594efc6ab8f0c149f9b85bee2042bb041027b5da75
+checksums           rmd160  e50dfda795fa8275b7e3470ecdf161aab45ebfe3 \
+                    sha256  a5d1c36d3f6ea5a932234c474c0984c69f61abc0e4815950be4a951ced97f332
 
 configure.args-append   -DWITH_SystemConfigPrinter=OFF \
                         -DWITH_PyQt4=OFF \
@@ -29,5 +29,5 @@
                         -DWITH_SIP=OFF \
                         -DWITH_PyCups=OFF
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdeartwork/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdeartwork/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdeartwork/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeartwork
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GFDL-1.2 GPL-2 LGPL-2.1
@@ -21,8 +21,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  80f56ddf79bae762ea17893de2e4599db90480b6 \
-                    sha256  3b868c201e92557793e86834287a78bbf9ba3108be1dbc8209e8a23503be0c78
+checksums           rmd160  e2b6458385063448c4427583d54bdb52073ef6bd \
+                    sha256  e27b3095e45a8ae2571555d70bff0e8dc89a7547707671f6547544f559dc9a1a
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdebindings4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdebindings4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdebindings4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdebindings4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         nicos openmaintainer
 description         Scripting bindings packages for KDE - Meta package

Modified: branches/pixilla-mysqls-55/dports/kde/kdeedu4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdeedu4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdeedu4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeedu4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 description         Education based applications for the KDE4 platform
@@ -39,6 +39,7 @@
                     port:kwordquiz\
                     port:marble\
                     port:parley\
+                    port:pairs \
                     port:rocs\
                     port:step
 

Modified: branches/pixilla-mysqls-55/dports/kde/kdegames4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdegames4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdegames4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdegames4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+ GFDL-1.2
@@ -17,8 +17,8 @@
 use_xz              yes
 distname            kdegames-${version}
 
-checksums           rmd160  a84a0b89bce1c0f3ad9ffff7525c1c02977aac91 \
-                    sha256  0fb58a32caf503644d88eaa60aefe25748007257bfdf2d67653d129f578392cb
+checksums           rmd160  094a1b59e2c81227f8c409d6814555413f9266ce \
+                    sha256  479a45cb6b5e9278c7a09bfcb6b025891fbadd0891e1431d4d77ea7aa5f6912b
 
 depends_lib-append  port:kdelibs4 port:kde4-runtime \
                     port:libsndfile port:qhull \
@@ -26,5 +26,5 @@
 
 universal_variant   no
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdegames-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdegraphics-strigi-analyzer/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdegraphics-strigi-analyzer/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdegraphics-strigi-analyzer/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdegraphics-strigi-analyzer
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -16,11 +16,11 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kdegraphics-strigi-analyzer-${version}
-checksums           rmd160  01e4a525b09f18ec11b951a2de99aeca97dfb610 \
-                    sha256  d2debcdbaed0e2d700fb2540fbbc8cd6e1e6784db05e3679eef4251ab36ef095
+checksums           rmd160  f918dd3754a43c60ad7609bfac61846e3e01c3b0 \
+                    sha256  73eedfba969b17aa22897e43e9a5c3fa51a90d11f2963314bd38ae6509d04649
 
 depends_lib-append  port:kdelibs4 \
                     port:tiff port:strigi
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdegraphics-strigi-analyzer-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdegraphics-thumbnailers/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdegraphics-thumbnailers/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdegraphics-thumbnailers/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdegraphics-thumbnailers
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -16,11 +16,11 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kdegraphics-thumbnailers-${version}
-checksums           rmd160  43742bf4f8a299fd5418b77a7a9a1e020b2ae2ed \
-                    sha256  81069078a65d6051a9f0632d069a9da0e90a5c347f4d7672dc6c796fc44dce20
+checksums           rmd160  ed83e439d2cbd51e8b4b7cf5091efcb39a8afd9c \
+                    sha256  f9e63fb4230d7c60fd1a0538ffd6f3047f89f3632e07e8af3ae0fc2cb5a15ec1
 
 depends_lib-append  port:kdelibs4 \
                     port:libkexiv2 port:libkdcraw
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdegraphics-thumbnailers-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdegraphics4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdegraphics4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdegraphics4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdegraphics4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 description         KDE4 graphics applications - Meta package

Modified: branches/pixilla-mysqls-55/dports/kde/kdelibs3/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdelibs3/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdelibs3/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -88,7 +88,8 @@
                         kdelibs-3.5.10-ossl-1.x.patch \
                         patch-kio_misc_kssld_Makefile.am.diff \
                         patch-stdio.diff \
-                        patch-admin_cvs.sh.diff
+                        patch-admin_cvs.sh.diff \
+                        patch-environment-helper.sh.diff
 
 patch {
     foreach f $patchfiles {
@@ -131,7 +132,8 @@
 use_configure           no
 
 use_parallel_build      yes
-build.env               MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.env               MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263 \
+                        CC=${configure.cc} CXX=${configure.cxx}
 build.cmd               ./CompileScript.sh
 
 destroot.cmd            ./InstallScript.sh

Modified: branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/CompileScript.sh
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/CompileScript.sh	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/CompileScript.sh	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,9 @@
 		6*|7*)
 			export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
 			;; 
+                10.8)
+                        export CPPFLAGS="$CPPFLAGS -D_IPP_PRIVATE_STRUCTURES=1"
+                        ;;
 	esac
 
 	export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"

Copied: branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff (from rev 100173, trunk/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,26 @@
+--- kdelibs-3.5.10/environment-helper.sh.orig	2012-11-22 14:34:11.000000000 +0100
++++ kdelibs-3.5.10/environment-helper.sh	2012-11-22 14:35:38.000000000 +0100
+@@ -121,23 +121,6 @@
+ 	find admin -type f | xargs perl -pi -e "s,/usr/X11R6,$PREFIX,g"
+ fi
+ 
+-if [ -x "/usr/bin/gcc-4.2" ]; then
+-	if [ -x "$PREFIX/bin/ccache" ]; then
+-		mkdir -p gcc-root
+-		[ ! -e gcc-root/gcc-4.2 ] && ln -s $PREFIX/bin/ccache gcc-root/gcc-4.2
+-		[ ! -e gcc-root/g++-4.2 ] && ln -s $PREFIX/bin/ccache gcc-root/g++-4.2
+-		export PATH=`pwd`/gcc-root:"$PATH"
+-		export CC="gcc-4.2"
+-		export CXX="g++-4.2"
+-	else
+-		export CC="/usr/bin/gcc-4.2"
+-		export CXX="/usr/bin/g++-4.2"
+-	fi
+-else
+-	export CC="gcc"
+-	export CXX="g++"
+-fi
+-
+ export ALL_LIBRARIES="$LDFLAGS $LIBS"
+ 
+ cat <<END

Modified: branches/pixilla-mysqls-55/dports/kde/kdelibs4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdelibs4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdelibs4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdelibs4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+
@@ -17,8 +17,8 @@
 use_xz              yes
 distname            kdelibs-${version}
 
-checksums           rmd160  1664458d7430ede888edf09e45eb50ae3a023247 \
-                    sha256  13fcf44974365ec0e0db76a70ed178a9451073ed77fc7cd7e43f1a73b72da1c3
+checksums           rmd160  2d2951be36203ef42fa186e1fe142aa100d6434a \
+                    sha256  73b1bbda87a5f9c3bf3ca566b820c982b9bf78a9c02b9b8104bb68e7f4b59393
 
 depends_build-append port:flex port:gmake port:docbook-xsl-ns
 
@@ -80,11 +80,7 @@
 pre-activate {
     if {![catch {set vers [lindex [registry_active kde4-runtime] 0]}]
         && [vercmp [lindex $vers 1] 4.8.1] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc kde4-runtime "" [list ports_nodepcheck 1]
+        registry_deactivate_composite kde4-runtime "" [list ports_nodepcheck 1]
     }
 }
 
@@ -92,7 +88,11 @@
     xinstall -d ${destroot}${prefix}/include/nepomuk
     eval xinstall -m 644 [glob ${worksrcpath}/nepomuk/core/*.h] \
         ${destroot}${prefix}/include/nepomuk
-    
+    eval xinstall -m 644 [glob ${worksrcpath}/nepomuk/types/*.h] \
+        ${destroot}${prefix}/include/nepomuk
+    eval xinstall -m 644 [glob ${worksrcpath}/nepomuk/nepomuk_export.h] \
+        ${destroot}${prefix}/include/nepomuk    
+
     xinstall -d -m 755 ${destroot}${prefix}/Library/LaunchAgents
     xinstall -m 644 ${filespath}/org.macports.kdecache.plist \
         ${destroot}${prefix}/Library/LaunchAgents
@@ -136,5 +136,5 @@
     destroot.violate_mtree  yes
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdelibs-(\\d+\\.\\d+\\.\\d+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdemultimedia4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdemultimedia4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdemultimedia4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,42 +5,39 @@
 PortGroup           kde4   1.1
 
 name                kdemultimedia4
-conflicts           kdelibs4-experimental
-version             4.8.5
-revision            1
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
-license             GPL-2+ LGPL-2+ GFDL-1.2
-description         KDE4 multimedia applications
-long_description    KDE applications for managing audio and video files.
+description         KDE4 multimedia applications - Meta package
+long_description    KDE applications for managing audio and video files. \
+                    This is a meta-port containing all the components of the \
+                    former kdemultimedia package.
 platforms           darwin
 homepage            http://www.kde.org
-master_sites        kde:stable/${version}/src/
-use_xz              yes
-distname            kdemultimedia-${version}
 
-checksums           rmd160  063da18dd4e49349573c42541e9d6e85636170f5 \
-                    sha256  47332668dd12d9c3c12e4821ddd6ee331b624a78eb50252b721aa597f80c5de6
+distfiles
+use_configure       no
+extract {           file mkdir ${worksrcpath}/${name} }
+build               {}
 
-depends_lib-append  port:kde4-runtime \
-                    port:libogg \
-                    port:libvorbis \
-                    path:lib/libavcodec.dylib:ffmpeg \
-                    port:taglib
 
-#Patch from version 4.9.0 which supports higher versions of ffmpeg
-patchfiles          patch-moviedecoder.diff
+depends_lib-append  port:dragon \
+                    port:ffmpegthumbs \
+                    port:juk \
+                    port:kmix \
+                    port:kscd \
+                    port:libkcompactdisc \
+                    port:libkcddb \
+                    port:mplayerthumbs
+#                   port:audiocd-kio
 
-configure.args-append   -DBUILD_dragonplayer=ON \
-                        -DBUILD_juk=ON \
-                        -DBUILD_kmix=OFF \
-                        -DWITH_Taglib=ON \
-                        -DWITH_PulseAudio=OFF \
-                        -DWITH_MusicBrainz3=OFF \
-                        -DWITH_Xine=OFF \
-                        -DWITH_TunePimp=OFF \
-                        -DWITH_Cdparanoia=OFF
-universal_variant   no
+destroot {
+    # Create a dummy file so the port can be successfully activated
+    xinstall -d ${destroot}${prefix}/share/doc/kdemultimedia4
+    set docfile [open ${destroot}${prefix}/share/doc/kdemultimedia4/README.${name}.txt "w"]
+    puts $docfile "Meta-port for kdemultimedia4\n"
+    puts $docfile "${long_description}\n"
+    close $docfile
+}
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdemultimedia-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.type      none

Modified: branches/pixilla-mysqls-55/dports/kde/kdenetwork4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdenetwork4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdenetwork4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,8 @@
 PortGroup           kde4   1.1
 
 name                kdenetwork4
-version             4.8.5
+version             4.9.3
+revision            1
 categories          kde kde4 network
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+
@@ -18,12 +19,12 @@
 use_xz              yes
 distname            kdenetwork-${version}
 
-checksums           rmd160  08f222f1ee81612659e943730308b96ca7cb8b59 \
-                    sha256  322a4e04886a6269f793df5d0e20ed744024929081070a00a4a963e3d4bfe757
+checksums           rmd160  f936967f0f3bd116165beb92f89611a44bcf180b \
+                    sha256  b40ab74299bad18679a5c12a7f7247f8d35cf90ff1eeeb59ef57e05f8107d115
 
 depends_lib-append  port:kde4-runtime \
                     port:kdepimlibs4 \
-                    port:libtelepathy \
+                    port:telepathy-qt \
                     port:qca \
                     path:lib/libspeex.dylib:speex \
                     port:libotr \
@@ -49,5 +50,5 @@
 
 universal_variant   no
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdenetwork-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdepim4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdepim4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdepim4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdepim4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky intevation.de:bjoern.ricks
 license             GPL-2+ LGPL-2+
@@ -18,8 +18,8 @@
 use_xz              yes
 distname            kdepim-${version}
 
-checksums           rmd160  850cb8f06f564624910f24b49d13c83462089587 \
-                    sha256  acbb71123caa302b8d8f8d2d731ae1659e0a11db737d9f227036b47d630076aa
+checksums           rmd160  bcba1ada40456202c7e938fa022fecc02bb0daba \
+                    sha256  de1f7b796a96d2a7f7f5a621e26ccd79110a171c71b0224a4d4b63453e6680d8
 
 depends_lib-append  port:kde4-runtime \
                     port:kdelibs4 port:dblatex \

Modified: branches/pixilla-mysqls-55/dports/kde/kdepim4-runtime/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdepim4-runtime/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdepim4-runtime/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdepim4-runtime
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         intevation.de:bjoern.ricks
 license             GPL-2+ LGPL-2+
@@ -18,11 +18,9 @@
 use_xz              yes
 distname            kdepim-runtime-${version}
 
-checksums           rmd160  23c5ff6af1ad84cb31d416721ca6681a75242f7c \
-                    sha256  33d34223d66f7420fcb550e249cbb9c92ad1a8cefb806d11ad04c115e4e34171
+checksums           rmd160  948bab0bc3b52d264b6c81880d75343efce43e6f \
+                    sha256  96603f7ae6aadd81be6165797d6630dffc8a73d8f6f5b28016e4774daeb2c14b
 
-patch.dir           ${workpath}/${distname}
-
 depends_lib-append  port:kde4-runtime \
                     port:kdelibs4 \
                     port:akonadi \

Modified: branches/pixilla-mysqls-55/dports/kde/kdepimlibs4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdepimlibs4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdepimlibs4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdepimlibs4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+ BSD
@@ -17,8 +17,8 @@
 use_xz              yes
 distname            kdepimlibs-${version}
 
-checksums           rmd160  63f6d0a5b06002c017f511b308b1bbbaceea9698 \
-                    sha256  fff0b8465635b337d33e9885a8087515af17b2ff07bbf69394b29fc460bf08aa
+checksums           rmd160  df984e5ed4c5ca1245ade56654bf1bd4396297b4 \
+                    sha256  5958971a4ece123100b492e5f21ed49dab19c5c52771dc5f946fae581c98e72e
 
 depends_lib-append  port:kdelibs4 \
                     port:akonadi \
@@ -28,5 +28,5 @@
                     port:prison \
                     port:gpgme
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdepimlibs-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdesdk4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdesdk4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdesdk4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdesdk4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+ GFDL-1.2
@@ -17,8 +17,8 @@
 use_xz              yes
 distname            kdesdk-${version}
 
-checksums           rmd160  c0dfdfeaeb60c5fbc932b0d53f98dbbf9dade915 \
-                    sha256  4faac65f0c451e728a7ebde3db52fc7a1bacbcf0bf71a248b07b8b8d1697cc10
+checksums           rmd160  e537f00a1b74003ec18a2f85c39552d4d653173c \
+                    sha256  54a2043b62315f8fff4f7b2d7b1fdcad4d80b75462830df106f44d06b4152a67
 
 depends_lib-append  port:kde4-baseapps port:antlr port:boost
 
@@ -26,6 +26,5 @@
 
 patchfiles          patch-catalogitem.diff
 
-livecheck.type      regex
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdesdk-(\\d+\\.\\d+\\.\\d+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdetoys4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdetoys4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdetoys4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdetoys4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2 LGPL-2
@@ -17,12 +17,12 @@
 use_xz              yes
 distname            kdetoys-${version}
 
-checksums           rmd160  3829e6f3d7296501e16d2648f5060f0552af01da \
-                    sha256  3e5240e7eacd5ac9f7f6a84a8b546fe3feb84d637d6f05c13997ed5d923640f5
+checksums           rmd160  65e59f90156d5af77fac52ed3fada1e8ee8838c7 \
+                    sha256  940ce72455d9bf4dd005c6f70c527e54abd487b2851d77231cc5861e0b5e6d7c
 
 depends_lib-append  port:kdelibs4 port:kde4-runtime
 
 universal_variant   no
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kdetoys-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdeutils4/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdeutils4/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdeutils4/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeutils4
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 description         Useful utilities provided by KDE4 - Meta package.

Modified: branches/pixilla-mysqls-55/dports/kde/kdevelop/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdevelop/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdevelop/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -59,29 +59,13 @@
     patchfiles-delete   patch-okteta.diff
 }    
 
-#Deleting double architecture build from cmake group
-pre-configure {
-    configure.universal_args-delete \
-        -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
-    if {${configure.sdkroot} != ""} {
-        configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
-    } else {
-        configure.args-append -DCMAKE_OSX_SYSROOT=/
+#Using c++0x for Lion and higher in case of clang 64-bit
+if {${configure.compiler} == "clang" && ${os.platform} == "darwin" && ${os.major} >= 11} {
+    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
+    if {${build_arch} == "x86_64" && ![variant_isset universal]} {
+        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
     }
 }
 
-if {${configure.compiler} == "clang" && ${os.major} >= 11} {
-    array set merger_configure_args {
-        x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
-    }
-}
-
-if {![variant_isset universal]} {
-    #Using c++0x for Lion and higher in case of clang 64-bit
-    if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
-        configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
-    }
-}
-
 livecheck.url       http://kde.mirrors.hoobly.com/stable/${name}
 livecheck.regex     "\(\\d+(?:\\.\\d+)*)\/"

Modified: branches/pixilla-mysqls-55/dports/kde/kdevplatform/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdevplatform/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdevplatform/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -44,30 +44,13 @@
     patchfiles-delete   patch-pluginsCMakeLists.diff
 }
 
-#Deleting double architecture build from cmake group
-pre-configure {
-    configure.universal_args-delete \
-        -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
-    if {${configure.sdkroot} != ""} {
-        configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
-    } else {
-        configure.args-append -DCMAKE_OSX_SYSROOT=/
+#Using c++0x for Lion and higher in case of clang 64-bit
+if {${configure.compiler} == "clang" && ${os.platform} == "darwin" && ${os.major} >= 11} {
+    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
+    if {${build_arch} == "x86_64" && ![variant_isset universal]} {
+        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
     }
 }
 
-if {${configure.compiler} == "clang" && ${os.major} >= 11} {
-    array set merger_configure_args {
-        i386   ""
-        x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
-    }
-}
-
-if {![variant_isset universal]} {
-    #Using c++0x for Lion and higher in case of clang 64-bit
-    if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
-        configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
-    }
-}
-
 livecheck.url       http://kde.mirrors.hoobly.com/stable/kdevelop/${kdevelopversion}/src
 livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}

Modified: branches/pixilla-mysqls-55/dports/kde/kdewebdev/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdewebdev/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdewebdev/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdewebdev
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+ GFDL-1.2
@@ -20,12 +20,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  510e56ff281dcd028ef023367890975b51bce00c \
-                    sha256  306cc4cd6b3df6bec0c08ca748eb24a266aca7d27f0f03196de2be0f6153ff0a
+checksums           rmd160  864a4285c1613a23bfcb0cadc634d3db6e8e46a4 \
+                    sha256  b54a859ab110b5820de98c52d3d42cf48495aa9b9c485dfad8ad5836172e937c
 
 if {![variant_isset docs]} {
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kdiskfree/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kdiskfree/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kdiskfree/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdiskfree
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -19,8 +19,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            kdf-${version}
-checksums           rmd160  043fa22626458d07c8543f73f70329a531674117 \
-                    sha256  7ca89475dbf65bd9d11165786d75c25f556bdf11b4e9bcafa0248d50c9e5c8ec
+checksums           rmd160  94c64fc3a0ed0e0bf14a86ae286ca457f220dcb6 \
+                    sha256  d262b50ea3bbba5024730c0062baf08b86856a4d088c19ccdae7ccf3f5cdc3c4
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
@@ -29,5 +29,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     kdf-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kfloppy/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kfloppy/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kfloppy/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kfloppy
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  d33dee552ea823d73db042020437a983a95b63ea \
-                    sha256  c2a346eea6bc4edd69caa2b4c067ce3960013eefaed87779bd810495cb68a50f
+checksums           rmd160  7913c07685d7dc4cb47b4f8f0723f08c7811a0b8 \
+                    sha256  108c8521ae8c58b6e9e1b6c66635f575aa89667b701d6b23ed85bc6b2abc2e2d
 
 patchfiles          patch-format.cpp.diff
 
@@ -31,5 +31,5 @@
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kgeography/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kgeography/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kgeography/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kgeography
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  69efe6119e00c4a0b34369d00bdf139358a136c2 \
-                    sha256  8606127017540df64b41a673dd908f687c3aeda7be594d826a675ed56dd61ce4
+checksums           rmd160  1aa7aedf229c3265fcf3f7fe15fcfe2edd7491b3 \
+                    sha256  cafee0ec0a180500d43f4e61028379060b6e91267d4aff86d2bc0ef77fca76ee
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kgpg/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kgpg/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kgpg/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kgpg
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  3c0fdcdbe0120e9877a184687064cc5970c7bb1f \
-                    sha256  3fee3e11a29b7bd5219a9c144e2ebc363474d257b9740b28ad4712aee9df3f9b
+checksums           rmd160  000c6f8bcd7f9ff89cf2e5e8b282763571d4221c \
+                    sha256  00f3941ce4a3f3f201933b46fd1134b8f167101333dcecaf6890141358b40a0c
 
 depends_lib-append  port:kdelibs4 \
                     port:kdepimlibs4 \
@@ -28,5 +28,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kgpg/files/patch-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kgpg/files/patch-CMakeLists.txt.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kgpg/files/patch-CMakeLists.txt.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2012-01-30 11:14:36.000000000 +0900
-+++ CMakeLists.txt	2012-01-30 11:14:40.000000000 +0900
+--- CMakeLists.txt.orig	2012-08-13 18:35:52.000000000 +0900
++++ CMakeLists.txt	2012-11-12 01:51:48.000000000 +0900
 @@ -18,7 +18,7 @@
  find_package( KdepimLibs REQUIRED ) 
  
  add_subdirectory( icons )
 -add_subdirectory( doc )
 +#add_subdirectory( doc )
- include_directories( ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR} core editor model transactions )
+ include_directories( ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR} )
  
  option(KGPG_DEBUG_TRANSACTIONS "show commands and results of gpg calls in debug log" Off)

Modified: branches/pixilla-mysqls-55/dports/kde/khangman/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/khangman/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/khangman/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                khangman
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,15 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  c4ae1bd3627d480d220eb32283e3adb1411921dc \
-                    sha256  3870a05a8d17a407f8fe4b11b4965e3fe13a58a345d386d8c84b50b07b00c1f7
+checksums           rmd160  dc813ecd3d7d4820ab032078a46cd436ef007548 \
+                    sha256  afd255f35765ac5c9c6e80657c2911a548245827c9c2ba980e54b140f0afea1e
 
-if {![variant_isset doc]} {
+#Prevents the package to build a framework
+patchfiles          patch-CMakeLists-engine.diff
+
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Copied: branches/pixilla-mysqls-55/dports/kde/khangman/files/patch-CMakeLists-engine.diff (from rev 100173, trunk/dports/kde/khangman/files/patch-CMakeLists-engine.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/khangman/files/patch-CMakeLists-engine.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/kde/khangman/files/patch-CMakeLists-engine.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,37 @@
+--- src/engine/CMakeLists.txt.orig	2012-08-13 18:18:20.000000000 +0900
++++ src/engine/CMakeLists.txt	2012-11-12 02:15:53.000000000 +0900
+@@ -84,20 +84,20 @@
+ 
+ set_target_properties(khangmanengine PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} DEFINE_SYMBOL MAKE_KHANGMAN_ENGINE_LIB)
+ 
+-if(APPLE)
+-    #hack for being able to set headers as public in a osx framework
+-    list(APPEND KHangManEngine_HEADERS
+-        ${KHangManEngine_HEADERS}
+-    )
+-
+-    set_target_properties(KHangManEngine PROPERTIES FRAMEWORK TRUE)
+-    set_target_properties(KHangManEngine PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Frameworks")
+-    set_target_properties(KHangManEngine PROPERTIES PUBLIC_HEADER "${KHangManEngine_HEADERS}")
+-
+-    set(MACOSX_FRAMEWORK_IDENTIFIER engine)
+-    set(MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${GENERIC_LIB_SOVERSION})
+-    set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${GENERIC_LIB_VERSION})
+-endif()
++#if(APPLE)
++#    #hack for being able to set headers as public in a osx framework
++#    list(APPEND KHangManEngine_HEADERS
++#        ${KHangManEngine_HEADERS}
++#    )
++
++#    set_target_properties(KHangManEngine PROPERTIES FRAMEWORK TRUE)
++#    set_target_properties(KHangManEngine PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Frameworks")
++#    set_target_properties(KHangManEngine PROPERTIES PUBLIC_HEADER "${KHangManEngine_HEADERS}")
++
++#    set(MACOSX_FRAMEWORK_IDENTIFIER engine)
++#    set(MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${GENERIC_LIB_SOVERSION})
++#    set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${GENERIC_LIB_VERSION})
++#endif()
+ 
+ install(
+     TARGETS     khangmanengine

Modified: branches/pixilla-mysqls-55/dports/kde/kig/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kig/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kig/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kig
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  188b5a4c15248f132878b7de7ad3e4b92d16a5f3 \
-                    sha256  7a27db12ddcd2f54456c3ea6b1f0f1baa907a5a0cdffecb52cefdb98d8f3dc00
+checksums           rmd160  d1ecc66ce057ae8f72b9c5f548a85eef95400eeb \
+                    sha256  5fad479d0b89e95e6177b5e66692cadf615783cbc222fa0be71d8eec9808e14c
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kimono/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kimono/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kimono/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kimono
-version             4.8.5
+version             4.9.3
 categories          kde kde4 devel
 platforms           darwin
 license             GPL-2+ LGPL-2.1+
@@ -19,13 +19,16 @@
 distname            ${name}-${version}
 use_xz              yes
 
-checksums           rmd160  ee9933c3bd99dae1f0e21068b68e47a0035e9876 \
-                    sha256  b19550ec224bc75fb066ce840632385b81ff79601ca9ac42cab49e4e03daf68e
+checksums           rmd160  c83b3a64d85803382c077f6a03fe32e6cb505e6b \
+                    sha256  8accfe62de8764a8a0dd8a64958b6c9c08076851fedf40889c1d1cba548ced93
 
+#Suppress link to deprecated index library of soprano
+patchfiles          patch-CMakeLists-soprano.diff
+
 depends_lib-append  port:kdelibs4 \
                     port:kdepimlibs4 \
                     port:mono \
                     port:qyoto
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kiten/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kiten/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kiten/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kiten
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  97256cd148802a53db8b7d3d35984d949a99dc78 \
-                    sha256  bfbc8cf108e03c688957f69c4df93b6130e4e97ab2cb9201147cbd32d55b3cc5
+checksums           rmd160  b28c37317fc516ae174fc90a369b1734d8b37658 \
+                    sha256  89b52e18b48c9cde93fd332cc6c17d9703a453b0ee636a055e78d59bf20bb61b
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/klettres/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/klettres/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/klettres/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                klettres
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  05c9e8eb7fb6a9b57b25e0a962aba8cbe5901e65 \
-                    sha256  84f4edb68355aa0a29ca71802868281aba0c27b64e824487f08c4e930567734b
+checksums           rmd160  6814f5c624bdc354eba4cd10dd0bc180d37ad428 \
+                    sha256  3238037ddbde2f5a23b81dfd15bef000ddee7945f14d32861e80bc230bff0d3f
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kmplot/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kmplot/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kmplot/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kmplot
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  5b32f846e290d9e8c5f2955dea81dcb1e05e7d8f \
-                    sha256  5a7cb14d63c43ea5e9b6da42f9126e9f603555d074cbcb40c96e14ee8c41669d
+checksums           rmd160  af1e2daf11f7e300008007c041e72be57a0d0776 \
+                    sha256  a8edabef958c89a964a3403773c1de8e17bf797e4bd869b54b6777452628465b
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kmymoney4-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kmymoney4-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kmymoney4-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,10 +8,10 @@
 
 fetch.type          git
 git.url             git://anongit.kde.org/kmymoney
-git.branch          e1731c698a6da61198557c8f1d0f40f935d04474
+git.branch          6b28f4fde17496b761c612dd886a19fc6d548ef1
 
 name                kmymoney4-devel
-version             4.6-20121025
+version             4.6-20121125
 
 categories          kde kde4 finance
 maintainers         mk pixilla openmaintainer

Modified: branches/pixilla-mysqls-55/dports/kde/kolourpaint/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kolourpaint/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kolourpaint/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kolourpaint
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             LGPL-2 LGPL-2+ BSD
 maintainers         nicos openmaintainer
@@ -16,8 +16,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kolourpaint-${version}
-checksums           rmd160  6d996fca80f071a1c4a379dd9915eec5aa63276e \
-                    sha256  cea42d79a69e9580d2a2bc5a3df725ffaa99e2beb122ff2b276472427fe3c783
+checksums           rmd160  4c777e4c684d6883a8ac04a1871c9f66be6e6e97 \
+                    sha256  3c4d4ab5a9b091dba796a2810222bfc361d9f3410761c545d8bd035a69b1e97c
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons \
@@ -27,5 +27,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kolourpaint-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/konsole/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/konsole/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/konsole/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                konsole
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 platforms           darwin
 license             GPL-2+
@@ -24,21 +24,16 @@
 distname            ${name}-${version}
 use_xz              yes
 
-checksums           rmd160  4d5a5b43434e8d0813f9b8d3920900d0d8889b11 \
-                    sha256  adeaae57b7c4191db0d59d95f8558778b7d8d5101b4f6f42e38edebfd8a0d415
+checksums           rmd160  e2f0a100384da8dba19e897ebce38c34d565e174 \
+                    sha256  f9a0b1b96dc27e7669e8cc142dd54694ab6b17f6b91ceb4dbc4c61077ba0cf24
 
-#Forcibly disabling KXB module 
-patchfiles          patch-cmake.diff
+if {![variant_isset docs]} {
+    patchfiles-append   patch-CMakeLists.diff
+}
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons \
                     port:kde4-baseapps
 
-pre-configure {
-    if {![variant_isset docs]} {
-        reinplace "s|add_subdirectory( doc/manual )|#add_subdirectory( doc/manual )|g" ${worksrcpath}/CMakeLists.txt
-    }
-}
-
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Copied: branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-CMakeLists.diff (from rev 100173, trunk/dports/kde/konsole/files/patch-CMakeLists.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-CMakeLists.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-CMakeLists.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2012-08-13 18:24:26.000000000 +0900
++++ CMakeLists.txt	2012-11-11 22:45:26.000000000 +0900
+@@ -14,6 +14,6 @@
+ add_subdirectory( src ) 
+ add_subdirectory( data ) 
+ add_subdirectory( desktop )
+-add_subdirectory( doc/manual )
++#add_subdirectory( doc/manual )
+ 
+ macro_display_feature_log()

Deleted: branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-cmake.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-cmake.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/konsole/files/patch-cmake.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,14 +0,0 @@
---- src/CMakeLists.txt.orig	2011-10-16 22:49:14.000000000 +0200
-+++ src/CMakeLists.txt	2011-10-16 23:49:46.000000000 +0200
-@@ -1,8 +1,8 @@
- 
- ### Compile-time features
--macro_optional_find_package(XKB)
--macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
--macro_log_feature(XKB_FOUND "XKB" "X keyboard extension" "http://www.x.org" FALSE "" "Gives Konsole better keyboard support.")
-+#macro_optional_find_package(XKB)
-+#macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
-+#macro_log_feature(XKB_FOUND "XKB" "X keyboard extension" "http://www.x.org" FALSE "" "Gives Konsole better keyboard support.")
- 
- include(CheckIncludeFiles)
- check_include_files("sys/proc.h"      HAVE_SYS_PROC_H)

Modified: branches/pixilla-mysqls-55/dports/kde/konversation/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/konversation/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/konversation/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -24,6 +24,6 @@
 patchfiles          workaround-qfontmetrics-bug.patch
 patch.dir           ${workpath}/${distname}
 patch.pre_args      -p1
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }

Modified: branches/pixilla-mysqls-55/dports/kde/korundum/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/korundum/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/korundum/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                korundum
-version             4.8.5
+version             4.9.3
 categories          kde kde4 devel
 platforms           darwin
 license             GPL-2+ LGPL-2.1+
@@ -21,13 +21,13 @@
 distname            ${name}-${version}
 use_xz              yes
 
-checksums           rmd160  2092088ca3c261d0d2a20851a4cede51f951d5e1 \
-                    sha256  c58d7c776c39bfdcf31a3323e55be63c8a0837e5b396eecfffed51fb017fd14c
+checksums           rmd160  f031f658918b1eb4cdc3863ca4e78f3b8fc3d2f3 \
+                    sha256  00893896bee154b1d7f58a95200b951d2ba1c8182912848a5681650a2533e272
 
 depends_lib-append  port:kdelibs4 \
                     port:kdepimlibs4 \
                     port:smokegen \
                     port:qtruby
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kross-interpreters/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kross-interpreters/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kross-interpreters/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,30 +5,26 @@
 PortGroup           kde4   1.1
 
 name                kross-interpreters
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             LGPL-2.1+
 description         WEB Development package for the K Desktop Environment.
-
 long_description    KDE ${description}
 homepage            http://www.kde.org
-
 platforms           darwin
-depends_lib-append  port:kdelibs4
-
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  8f97b410f11ed2a74ea2fcdebfd14d7436606651 \
-                    sha256  42fd84e91af6c35b89259ed3ae45a1217652616c69c612c73a2f5d353e0460a6
+checksums           rmd160  fff159c54930e6797c9ff7edb2c415f5d3020101 \
+                    sha256  3b0f16a15b4b14c37a73803eb2eccbb0974f5216e08b306d14ccbf3b42a8c8dc
 
+depends_lib-append  port:kdelibs4
+
 patchfiles          patch-CMakeLists.txt.diff
 
 configure.args-append   -DFALCON_INCLUDE_DIR=${prefix}/include/falcon0.9.6/falcon \
                         -DFALCON_LIBRARIES=${prefix}/lib/libfalcon_engine.dylib
 
-
-
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kruler/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kruler/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kruler/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kruler
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -18,8 +18,8 @@
 use_xz              yes
 distname            kruler-${version}
 
-checksums           rmd160  9804bad4a0c1fe18ee8cbd697b6ec2354325e9fb \
-                    sha256  3dc899e6e2b8322483fcf5328a47819d364e3c4e51af33745d3b310017aeea31
+checksums           rmd160  2243f429f59539ebd45d0508f31d417b8d58c044 \
+                    sha256  edf997ffc47aba2fcbf24c53eb53e1b043a55f6f489062a8bb3966ef8483cf7d
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
@@ -28,5 +28,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     kruler-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/ksaneplugin/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/ksaneplugin/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/ksaneplugin/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                ksaneplugin
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             {LGPL-2.1 LGPL-3}
 maintainers         nicos openmaintainer
@@ -16,11 +16,11 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            ksaneplugin-${version}
-checksums           rmd160  9988eb3e4d2fdefbd2e016a3e10849b1236b794d \
-                    sha256  31b564f578010e89f150a1679a28cb602180c3d3673f481e990e6d89b1385b7f
+checksums           rmd160  3dff00f528ff808cc1e6fce287df9e0f55f37d3e \
+                    sha256  fc0c09db01e6ba76dd29f5c824f63ba12bb4c07aa710d2be6ed6d9fa552a1d3f
 
 depends_lib-append  port:kdelibs4 \
                     port:libksane
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ksaneplugin-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kstars/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kstars/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kstars/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kstars
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 platforms           darwin
 license             GPL-2+
@@ -22,8 +22,8 @@
 distname            ${name}-${version}
 use_xz              yes
 
-checksums           rmd160  b2ea6bb9d01c1aac8c2b7a573e4e3ce6eae4bafd \
-                    sha256  e184f2ef1127094d2e394fc3627e5678fa206357b52936c0b924fc9db44b665b
+checksums           rmd160  77d59bc469b3c16f46ed03b61172a447a2a00b08 \
+                    sha256  ed520eb49d0de8da234b87ee8d978a8a3f145a9aa3e68ce121f2828a6b92d089
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons \
@@ -68,5 +68,5 @@
     }
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/ktimer/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/ktimer/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/ktimer/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                ktimer
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  f4f9e7e7504b92e7b8610a153a71a83791a93c17 \
-                    sha256  d9ffe168eb4fad22a62a884491b890ae04edb506618480765901f47c24959ee3
+checksums           rmd160  b2509101f8f1c193a3a0f830f56c245e51c70ba6 \
+                    sha256  85c8d45f7f7f1e0ef3aba8ec91b0e9a8bf457cfe23a5ee418806a3406c76c4e9
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
@@ -27,5 +27,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/ktouch/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/ktouch/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/ktouch/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                ktouch
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  e06f6f8af69bbff0b36762825c925d883d80d7b7 \
-                    sha256  35c150805b8ad598751a3247175a0ec609c7a6b4514968b5810508efbb276d11
+checksums           rmd160  89cb4ca7e43e29c7fa1c94ea249464e1f3b8bf51 \
+                    sha256  5ecc48c964ca1f4154868d78f40570714f1d258b5b597e30278c75005bb55e2c
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kturtle/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kturtle/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kturtle/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kturtle
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  a632e5c16a30548edbe33ad738a283e7c49015b1 \
-                    sha256  474fa5b0c494eb31b95ee51a27174a1f979d3e24879e7898c11c2c9e3ade28c2
+checksums           rmd160  fc720700329392379161bbd0daac99413afdb8b7 \
+                    sha256  dcd711b0b3762935c5551c964dc4ce3ea42765983c4c3d0d8ca97808916fd160
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kwallet/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kwallet/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kwallet/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kwallet
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  6d9d18efe0ca7fccd25267a61c6cfc1570951ae9 \
-                    sha256  acea28e35f0a91c3d6e13946ac84063b426aad1b6edc4a7ea9c89e82f84e4107
+checksums           rmd160  8df65fc8466fa487905842c46d286c63451eaa7e \
+                    sha256  3ea7c908a3891133ef71441fe097b5c15908838588c080e7c2404572b56f7903
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
@@ -27,5 +27,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/kwordquiz/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/kwordquiz/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/kwordquiz/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kwordquiz
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2 LGPL-2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  1f7e2b1d858f9dfb15463ef99da424f667ad8b5b \
-                    sha256  645d299bc4a5e6ca4d7336b4c9fa3c625bdd8f6210f98b3be9a60a4c82172db1
+checksums           rmd160  99255452a8f91387b278032e8f83b33d2d0f8772 \
+                    sha256  d99d6a5b4b367cfd65affd6ddd36c707c84123cf24bea6b8d8f30c9d170bff2f
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/libkdcraw/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/libkdcraw/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/libkdcraw/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                libkdcraw
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -17,12 +17,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            libkdcraw-${version}
-checksums           rmd160  4dee54b9bbb013e8cb7c155c9d1eb4529a89ad53 \
-                    sha256  0d073382a4b753532a46126e4847a8da310e4bf69a60c72c6073082a6704b92a
+checksums           rmd160  385464c44b798e663937875bf8c9a0c74a28c5ed \
+                    sha256  2612dfefed74afc2494d78aab3be5240fb62e3a9e71139a035f82ecc8855956b
 
 depends_lib-append  port:kdelibs4 \
                     port:jpeg \
                     port:lcms
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     libkdcraw-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/libkdeedu/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/libkdeedu/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/libkdeedu/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                libkdeedu
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             {GPL-2 GPL-3 LGPL-2.1 BSD}
@@ -17,10 +17,10 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  6b8cf83b1bc104f93db50d4bba02ad3775de6958 \
-                    sha256  7d0d0fd49baf8e0ef85b8f36992f4238a214fbbf1ffc10c4f48ca4997736d58b
+checksums           rmd160  9d6b0bf5ac1a5788967ae69b57e7e216b1589d9d \
+                    sha256  b0ed7806a7fa57ef20303b343e1e716d1cb7e50da6f2736a2c6c3a433e6e6123
 
 depends_lib-append  port:kdelibs4
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     libkdeedu-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/libkexiv2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/libkexiv2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/libkexiv2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                libkexiv2
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -18,11 +18,11 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            libkexiv2-${version}
-checksums           rmd160  2cd5183715341f16daab171d529b43be98eea19a \
-                    sha256  3a7639809d579511e4efd46761fd020f0f4c5fd91e23c8bd21766d551d51e393
+checksums           rmd160  39c791f2adc004ea328c3ee3c5f48554be4ea0b6 \
+                    sha256  492ff07aa909bfbe901ca4a4b7fb56babcdcbd8d9cb22f98111539553fcfcbf7
 
 depends_lib-append  port:kdelibs4 \
                     port:exiv2
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     libkexiv2-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/libkipi/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/libkipi/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/libkipi/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                libkipi
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -19,10 +19,10 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            libkipi-${version}
-checksums           rmd160  673aa1ab59accf7900c4031a7c23dfc5abe9e8af \
-                    sha256  9a701bb612cd4244ff95777b1345382782703b15cfd7b88a0afaf7bba28a65df
+checksums           rmd160  a821a99de503777f6dd2a1011f1864082ea6fcc5 \
+                    sha256  484fc4e5e0750ce8bfce3376356a6b1aa177f45b40c3c1d16295dec410ac7aaf
 
 depends_lib-append  port:kdelibs4
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     libkipi-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/libksane/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/libksane/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/libksane/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                libksane
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -17,11 +17,11 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            libksane-${version}
-checksums           rmd160  919021aba2c3f50e7535974b1057a323e4282b75 \
-                    sha256  74b2680ebe6dc59df3c2bce1e63c9c420f4d41ca08cb81239fa5f90313524726
+checksums           rmd160  75d7a581320bc3f6e812d48a616474c7a5a6cb72 \
+                    sha256  908491eefe3bf7f4eee16dd4ed544c49d89e5fc5271c874fa59d51d4742c2243
 
 depends_lib-append  port:sane-backends \
                     port:kdelibs4
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     libksane-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/marble/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/marble/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/marble/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                marble
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             LGPL-2.1+ GFDL-1.2
@@ -19,14 +19,14 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  ab69a4a36f06011c69993d1e5e4cb7026f8a6dd6 \
-                    sha256  46d1eedc5da29ebb4b7cef4e7442b94513642e9013d770787b778d61674956ad
+checksums           rmd160  be8f4d1e6cac4b1a3ed19e119ba68f7308f8de7d \
+                    sha256  ce0e6eab3d903b0053b9fd0023ff522a2619ae15be6e9ccfe7eed3ecd83759b7
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles      patch-CMakeLists.txt.diff
 }
 
 configure.args-append   -DCMAKE_MODULES_INSTALL_PATH=${cmake_share_module_dir}
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/mobipocket/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/mobipocket/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/mobipocket/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                mobipocket
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -16,12 +16,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            kdegraphics-mobipocket-${version}
-checksums           rmd160  ca75086cf35696e3ae86d297cd07931228abad71 \
-                    sha256  318901ffee242afe77c33ae18c1d279b8be855d0cc9d0784e9d17e3f0dd0e58a
+checksums           rmd160  896deafb0abb3d7dd11b479266f00a5636f7b337 \
+                    sha256  e89c3d2e760aaeba6713d452470fadc30d1aee65c0561fc81192821ae5e57a1e
 
 depends_lib-append  port:kdelibs4 \
                     port:strigi \
                     port:okular
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     mobipocket-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/okular/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/okular/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/okular/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                okular
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -18,8 +18,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            okular-${version}
-checksums           rmd160  a3c24490c150a1082c0d5b5da4844dd77bc15b31 \
-                    sha256  4121b734c3351ac443b4ca6fb23723c4e290168c69c8bb3dd992a83d4c6aa6b3
+checksums           rmd160  987546824fc0f398a3ec5e73b0c27363cabe9f08 \
+                    sha256  dac9cdfc448e11e396ebab6ddd1e47cdeac5a2048f8e77e463362d11716f59af
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons \
@@ -36,5 +36,5 @@
     }
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     okular-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/oxygen-icons/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/oxygen-icons/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/oxygen-icons/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                oxygen-icons
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             LGPL-3+
@@ -15,8 +15,8 @@
 homepage            http://www.kde.org
 master_sites        kde:stable/${version}/src/
 use_xz              yes
-checksums           rmd160  e63f29418a4e1d6dfaf159a5c8a1ce16189466c4 \
-                    sha256  eaea098b4f335f78b776aff9e51d6632d5a24addfe67220dfc751ed81a9d1b20
+checksums           rmd160  0532f7b2bd297cf42d8cad500034390f7b6b281f \
+                    sha256  223a70f408543104d1e79bfa01730f4fe28cb4c0dc0f4ea6fe98e1f278b24fea
 
 supported_archs     noarch
 

Modified: branches/pixilla-mysqls-55/dports/kde/parley/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/parley/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/parley/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                parley
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -19,12 +19,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  08fbb395203d82253cb08f30b104e824dbb2f183 \
-                    sha256  262e8fc28014921b19726f3c8fafdc1809b2eecf4918974a6d52f51e44fbc08e
+checksums           rmd160  28b9d71d6f5be7b6f85f2e3fb47c566f5c1c3e4b \
+                    sha256  5d21cf9eb82778d7ac0e73e1ba98fe1dc2b199245d67303442ef779891224b6b
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/perlkde/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/perlkde/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/perlkde/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                perlkde
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -16,8 +16,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  a972ba20b2f69605b8e94588f57cf6817243c31b \
-                    sha256  bb87ba6e7cc555ad02a8d90218bea1e28c6a1a6fa24154800e7c413ea9160fc6
+checksums           rmd160  7a350e70704af98e2dcc6556e7f11d56aaab33cb \
+                    sha256  5129ab8717d301b5efbd47948edec81ba34d7ee4d9ed7c4e6f14b5e224ce98e6
 
 depends_lib-append  port:kdelibs4 \
                     port:smokekde \
@@ -26,5 +26,5 @@
 
 patchfiles          patch-doopen.diff
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/perlqt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/perlqt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/perlqt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                perlqt
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  f53c6e13ea7d9b5a51deac18d95c541deceff42a \
-                    sha256  8739a2f9191d6e087b9caa08f2eef8acba3f23c8d70f07ff3b68faede5c50462
+checksums           rmd160  bdaee434c29f6abbd2ad2deb60e0ef6676901618 \
+                    sha256  40b0a22338431fb1e2e862cac5fc4d174c1382f10795aae227b940ef481d7d6e
 
 depends_lib-append  port:kdelibs4 \
                     port:smokeqt \
@@ -26,5 +26,5 @@
 
 patchfiles          patch-CMakeLists.txt.diff
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/qtruby/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/qtruby/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/qtruby/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                qtruby
-version             4.8.5
+version             4.9.3
 categories          kde kde4 devel
 license             GPL-2+ LGPL-2.1+
 maintainers         nicos openmaintainer
@@ -18,11 +18,11 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  7e428825232304df5971e01365af4576bb463855 \
-                    sha256  3a78ca829c6a2cf1c394c408a2fc892d5072ca4997f11357ec8c20d78c94cb94
+checksums           rmd160  521374290d85acc573635f307684e655cfd8deda \
+                    sha256  c0d9ea7d004739b531699cdcb9816a3f9113add55ce1c88d410a1e2580e6688e
 
 depends_lib-append  port:smokegen \
                     port:ruby
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/qyoto/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/qyoto/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/qyoto/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                qyoto
-version             4.8.5
+version             4.9.3
 categories          kde kde4 devel
 platforms           darwin
 license             GPL-2+ LGPL-2.1+
@@ -21,8 +21,8 @@
 distname            ${name}-${version}
 use_xz              yes
 
-checksums           rmd160  d55f4500a0b5383eceb7007ea532fbb1157ae198 \
-                    sha256  984157b7d754e89fc48161a02ddd5127be1b36a0962f442ce1c80222255dbf88
+checksums           rmd160  1490d45e5c3195d236f6ff729119284b3d9df712 \
+                    sha256  018b50c4793ac3c4392c2cc0f0b276dd9007987d593f3b54870003ad6e21cdf4
 
 depends_lib-append  port:kdelibs4 \
                     port:smokekde \
@@ -33,5 +33,5 @@
     reinplace "s|/usr|${prefix}|g" ${worksrcpath}/cmake/CMakeDetermineCSharpCompiler.cmake
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/rocs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/rocs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/rocs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                rocs
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2.1 GFDL-1.2
@@ -19,8 +19,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  2ebedc2f3633962ff3da878a470faaaf9a4cc13d \
-                    sha256  75c2a240d1e29b29444363cda0c41c8ef042fc56fb6a4b8c8561678d2d0a3b26
+checksums           rmd160  6324fc25084aff14ba3ebcebb8d9a4908a4cab3c \
+                    sha256  0a1c6a2f0eb140cee065d2c9d8b19a051b5119439916723dbb1daaa271d4a66d
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
@@ -31,5 +31,5 @@
     system "install_name_tool -change ${prefix}/lib/rocs_GraphStructure.dylib ${prefix}/lib/kde4/rocs_GraphStructure.dylib ${destroot}${prefix}/lib/kde4/rocs_transformedgesplugin.so"
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/rocs/files/patch-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/rocs/files/patch-CMakeLists.txt.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/rocs/files/patch-CMakeLists.txt.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,10 +1,8 @@
---- CMakeLists.txt.orig	2011-09-12 10:59:37.000000000 -0400
-+++ CMakeLists.txt	2011-09-12 10:59:40.000000000 -0400
-@@ -24,7 +24,6 @@
- if (Boost_FOUND)
-    include_directories(${Boost_INCLUDE_DIRS})
+--- CMakeLists.txt.orig	2012-08-13 18:26:50.000000000 +0900
++++ CMakeLists.txt	2012-11-12 02:37:58.000000000 +0900
+@@ -32,4 +32,4 @@
  
--   add_subdirectory(doc)
-    add_subdirectory(src)
-    add_subdirectory(graphics)
- endif (Boost_FOUND)
+ add_subdirectory(src)
+ add_subdirectory(graphics)
+-add_subdirectory(doc)
++#add_subdirectory(doc)

Modified: branches/pixilla-mysqls-55/dports/kde/shared-desktop-ontologies/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/shared-desktop-ontologies/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/shared-desktop-ontologies/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4 1.1
 
 name                shared-desktop-ontologies
-version             0.9.0
+version             0.10.0
 categories          kde kde4 devel
 maintainers         sharky openmaintainer
 license             BSD
@@ -22,8 +22,8 @@
 depends_lib-append  port:docbook-xsl-ns
 
 use_bzip2           yes
-checksums           rmd160  590bff921beab59c493c6da30c341c311f31e040 \
-                    sha256  6efaf4caed8b5467390dc6ae62c678b28fd753df524c257f0a938c2a7b6ac526
+checksums           rmd160  cae48ece8938f2ee3005d5583a78392f5c9fced7 \
+                    sha256  b11901f016b54c8d00917cd167cf8585245ad266125880118f91e75ee52ac503
 
 master_sites        sourceforge:oscaf
 

Modified: branches/pixilla-mysqls-55/dports/kde/smokegen/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/smokegen/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/smokegen/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                smokegen
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ LGPL-2.1+
@@ -20,8 +20,8 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  b22f120412747429bc577a46306be19d140d898b \
-                    sha256  e46ebba05600bcc2a94cbffe2b7e078bc353cbbd481b1e4ff5c9ad8567aaf4fe
+checksums           rmd160  1e2175007a995eb7feda6e6a7206b1a2c0b74586 \
+                    sha256  6f228e4f2d65c393a9f760f63b583f899f82b4d2f953057e2df9468ad2d949e7
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/smokekde/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/smokekde/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/smokekde/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                smokekde
-version             4.8.5
+version             4.9.3
 categories          kde kde4 devel
 platforms           darwin
 license             GPL-2+ LGPL-2
@@ -21,8 +21,8 @@
 distname            ${name}-${version}
 use_xz              yes
 
-checksums           rmd160  cee792a4c3d2ecbb912cf0e494c7ba6cba13a1a3 \
-                    sha256  697cba604a9424e60b6617aa69f57557519d64734b562b7ca41745828f4f7703
+checksums           rmd160  157425342227f7c5c23f06a629df8cecec95cda8 \
+                    sha256  1747cfb6d7fd0240b6b3a262a79f900685224cdd2ebec7254c9f11fd37b7bce7
 
 depends_lib-append  port:kdelibs4 \
                     port:smokeqt \
@@ -37,5 +37,5 @@
 patchfiles          patch-kdeui_includes.diff \
                     patch-kdeui-smokeconfig.diff
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/smokeqt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/smokeqt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/smokeqt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                smokeqt
-version             4.8.5
+version             4.9.3
 categories          kde kde4 devel
 platforms           darwin
 license             GPL-2+ LGPL-2.1+
@@ -21,13 +21,13 @@
 distname            ${name}-${version}
 use_xz              yes
 
-checksums           rmd160  eb018a91e0f2d800f2c47a24ef59c8a23801610b \
-                    sha256  30a635805ebf309c8d8e7a0c74de65d6b068f434b5e31816aac23f6e5eaa30f8
+checksums           rmd160  f83bd5b510dec3ee89b89bdc293a60e46ba07048 \
+                    sha256  6b4bfb9fa132be3918b6eef338c2c5d06d884e61d1cd1105a4c9eaae335069ae
 
 depends_lib-append  port:smokegen \
                     port:qimageblitz
 
 patchfiles          patch-qtgui-smokeconfig.diff
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/step/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/step/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/step/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                step
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 maintainers         sharky nicos
 license             GPL-2+ GFDL-1.2
@@ -20,12 +20,12 @@
 master_sites        kde:stable/${version}/src/
 use_xz              yes
 
-checksums           rmd160  f845132cde66cc8f82f08a01eb46f163b8f9391c \
-                    sha256  0132c3f0da286486983d480a54a39308337bd259fad8a6efc8890dd45211c3ae
+checksums           rmd160  fff9088dc68f4d37b2955ca67870ac5bdaf36da4 \
+                    sha256  6886e1e64a83e0a17f08147bf3f3ca36366912914a5b92b36c3a613c3564ba56
 
-if {![variant_isset doc]} {
+if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/svgpart/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/svgpart/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/svgpart/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                svgpart
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,10 +17,10 @@
 use_xz              yes
 distname            svgpart-${version}
 
-checksums           rmd160  db03e7f4fb2cce23bd0d4bdb1828c817b81a6e35 \
-                    sha256  300d33ee441bf903bee2a55c1f070f5c943e82e6f82c3231e9ef35ed041a1ab2
+checksums           rmd160  ef8c68ef940d16ffc4566cc5ef5a72399adc79b4 \
+                    sha256  5c65081edc35b2295ccf3f89a1ec3780c8c8a089d2924ce911aae81420288c19
 
 depends_lib-append  port:kdelibs4
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
-livecheck.regex     svgpart-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/kde/sweeper/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/kde/sweeper/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/kde/sweeper/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                sweeper
-version             4.8.5
+version             4.9.3
 categories          kde kde4
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${version}/src
 use_xz              yes
 distname            ${name}-${version}
-checksums           rmd160  36eef5d87e8fc7a2e1a0b10897234f7cbfa08f91 \
-                    sha256  28680305e04c4e9c74a3909ca1f159d093f1234f7ba2aca40116093812422e8f
+checksums           rmd160  834b2d7059459dadeee7662eb2ab3db67d087cab \
+                    sha256  b144eded7f056adb4b0629735c8bed528fae789f00ddc89149b9495c668a31fc
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons
@@ -27,5 +27,5 @@
     patchfiles      patch-CMakeLists.txt.diff
 }
 
-livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src
-livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
+livecheck.url       http://kde.mirrors.hoobly.com/stable/
+livecheck.regex     (\\d+(\\.\\d+)+)

Modified: branches/pixilla-mysqls-55/dports/lang/abcl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/abcl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/abcl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name			    abcl
-version			    1.0.1
+version			    1.1.0
 revision            0
 categories		    lang java
 license             GPL-2
@@ -24,11 +24,12 @@
 homepage            http://common-lisp.net/project/armedbear 
 platforms           darwin
 master_sites        googlecode:abcl-dynamic-install
-distname            abcl-src-${version}
-checksums           md5     0744835442e15683da0ba273fda3dbaa \
-                    sha1    476a3d93f8be9e58cacae650230248edb44190e5 \
-                    rmd160  6927789abdb2ceb77e41427c717ba637160bcac6
+distname            abcl-src-${version}-rc-0
+checksums           md5     902ddac3a208df6f079d5945cfd01c3e \
+                    sha1    928d4f4dd5f8e661f5d965175fcf123bd7a3985f \
+                    rmd160  89f638e4ea679818a2912c1ed31fe86e43a6f5f0
 
+
 depends_build       port:apache-ant
 
 use_configure       no
@@ -36,8 +37,6 @@
 build.cmd           ant
 build.target        abcl.wrapper
 
-#patchfiles           abcl-contrib.patch
-
 post-build {
     reinplace "s|${worksrcpath}/dist/abcl.jar|${prefix}/share/java/abcl/abcl.jar|g" \
         ${worksrcpath}/abcl

Modified: branches/pixilla-mysqls-55/dports/lang/algol68g/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/algol68g/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/algol68g/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                algol68g
-version             2.5
+version             2.6
 categories          lang devel
 platforms           darwin
 license             GPL-3
@@ -16,8 +16,8 @@
 homepage            http://jmvdveer.home.xs4all.nl/algol.html
 master_sites        http://jmvdveer.home.xs4all.nl/
 
-checksums           rmd160  8504f766d4f6c4d12114f2d08a4b300deec523bf \
-                    sha256  e30b01a666f15ee5d72a3e8f9182a8832b795e63ac3ef27ac1e9c916ff342b5d
+checksums           rmd160  1b32b3974c76056392dc15fc932c67b2c5d09d75 \
+                    sha256  6eb44d7a5b2e421768f65643f9872ba73ccff178321a28059f87ad921bf593c2
 
 depends_lib         port:gsl port:readline port:ncurses
 

Modified: branches/pixilla-mysqls-55/dports/lang/dragonegg-3.0/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/dragonegg-3.0/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/dragonegg-3.0/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -15,7 +15,7 @@
 maintainers             jeremyhu
 license                 GPL-2
 
-description             Dragonegg is a LLVM plug-in for GCC 4.6
+description             Dragonegg is a LLVM plug-in for GCC ${gcc_version_dot}
 long_description        Dragonegg replaces GCC optimizers and code generators \
                         by the LLVM optimizing infrastructure. It supersedes \
                         llvm-gcc.

Modified: branches/pixilla-mysqls-55/dports/lang/dragonegg-3.1/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/dragonegg-3.1/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/dragonegg-3.1/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -15,7 +15,7 @@
 maintainers             jeremyhu
 license                 GPL-2
 
-description             Dragonegg is a LLVM plug-in for GCC 4.6
+description             Dragonegg is a LLVM plug-in for GCC ${gcc_version_dot}
 long_description        Dragonegg replaces GCC optimizers and code generators \
                         by the LLVM optimizing infrastructure. It supersedes \
                         llvm-gcc.

Modified: branches/pixilla-mysqls-55/dports/lang/dragonegg-3.2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/dragonegg-3.2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/dragonegg-3.2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,14 +8,13 @@
 name                    dragonegg-${llvm_version}
 set gcc_version         46
 set gcc_version_dot     4.6
-revision                1
 dist_subdir             llvm
 categories              lang
 platforms               darwin
 maintainers             jeremyhu
 license                 GPL-2
 
-description             Dragonegg is a LLVM plug-in for GCC 4.6
+description             Dragonegg is a LLVM plug-in for GCC ${gcc_version_dot}
 long_description        Dragonegg replaces GCC optimizers and code generators \
                         by the LLVM optimizing infrastructure. It supersedes \
                         llvm-gcc.
@@ -30,12 +29,12 @@
 depends_skip_archcheck-append gcc${gcc_version}
 
 fetch.type              svn
-svn.revision            166880
+svn.revision            168259
 version                 ${llvm_version}-r${svn.revision}
-worksrcdir              trunk
-svn.url                 http://llvm.org/svn/llvm-project/dragonegg/trunk
-#worksrcdir              release_32
-#svn.url                 http://llvm.org/svn/llvm-project/dragonegg/branches/release_32
+#worksrcdir              trunk
+#svn.url                 http://llvm.org/svn/llvm-project/dragonegg/trunk
+worksrcdir              release_32
+svn.url                 http://llvm.org/svn/llvm-project/dragonegg/branches/release_32
 
 #version                 ${llvm_version}
 #epoch                   1

Modified: branches/pixilla-mysqls-55/dports/lang/eero-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/eero-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/eero-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,9 +5,9 @@
 PortGroup select        1.0
 
 name                    eero-devel
-version                 3.2.2012-10-22
-set llvm_tag            3.2.2012-10-19
-set clang_tag           3.2.2012-10-22
+version                 3.2.2012-11-18
+set llvm_tag            3.2.2012-11-18
+set clang_tag           3.2.2012-11-18
 set sub_prefix          ${prefix}/libexec/eero-devel
 
 categories              lang
@@ -31,11 +31,11 @@
                         [suffix clang-${clang_tag}]:clang
 
 checksums               [suffix llvm-${llvm_tag}] \
-						rmd160  9e155d6c48b0e1a52469fb7254d638ff8cc4e79f \
-						sha256  cf1854db99bb3ae4a4395377f8556b9660f2ffa8af6cb6b16760fba01c0f0e7f \
+                        rmd160  bd5aa3c9d77a102506d88f2cdc7f3c5b7037f825 \
+                        sha256  66a460b0c2bfed6912be2169e1b49167ad0491542660d22e8cb6bbd4f89555d9 \
                         [suffix clang-${clang_tag}] \
-						rmd160  d88525084f7be0ce648f32e1c40c945f6c79c0bd \
-						sha256  66706df710f9d4af42ea274f682461d9fa81ae7a26336d048ff250c780339e53
+                        rmd160  6e9f26cfa6ff16ab28461807be685bb5fbe1ba62 \
+                        sha256  32cd400154e41343e9d14b281fdda811b0246d6a29ee74be894055b82895f590
 
 dist_subdir             eero
 
@@ -48,8 +48,7 @@
     move [glob ${workpath}/eerolanguage-clang*] ${worksrcpath}/tools/clang
 }
 
-patchfiles              install_target.patch \
-                        tiger.patch  \
+patchfiles              tiger.patch  \
                         tiger-shlib.patch \
                         tiger-shlib-clang.patch \
                         scan-build-PR-35006.patch
@@ -166,12 +165,6 @@
         ln -s ${sub_prefix}/libexec/scan-build/scan-build ${destroot}${sub_prefix}/bin/scan-build
         ln -s ${sub_prefix}/libexec/scan-view/scan-view ${destroot}${sub_prefix}/bin/scan-view
         ln -s ${sub_prefix}/bin ${destroot}${sub_prefix}/libexec/scan-build/bin
-
-        xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/eero-scan-build"
-        reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-build:" "${destroot}${prefix}/bin/eero-scan-build"
-
-        xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/eero-scan-view"
-        reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/eero-scan-view"
     }
 }
 

Deleted: branches/pixilla-mysqls-55/dports/lang/eero-devel/files/install_target.patch
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/eero-devel/files/install_target.patch	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/eero-devel/files/install_target.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,13 +0,0 @@
---- a/Makefile.orig	2012-01-22 17:34:02.000000000 -0800
-+++ b/Makefile	2012-01-22 17:34:14.000000000 -0800
-@@ -70,8 +70,7 @@ ifeq ($(MAKECMDGOALS),install-clang)
-   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
-           tools/clang/tools/libclang tools/clang/tools/c-index-test \
--          tools/clang/include/clang-c \
--          tools/clang/runtime tools/clang/docs \
--          tools/lto runtime
-+          tools/clang/include tools/clang/lib \
-+          tools/clang/runtime tools/clang/docs
-   OPTIONAL_DIRS :=
-   NO_INSTALL = 1
- endif

Deleted: branches/pixilla-mysqls-55/dports/lang/eero-devel/files/llvm-bin
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/eero-devel/files/llvm-bin	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/eero-devel/files/llvm-bin	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec EXEC_PATH "${@}"

Deleted: branches/pixilla-mysqls-55/dports/lang/eero-devel/files/mp-clang-3.2
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/eero-devel/files/mp-clang-3.2	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/eero-devel/files/mp-clang-3.2	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,5 +0,0 @@
-bin/c-index-test-mp-3.2
-bin/clang++-mp-3.2
-bin/clang-mp-3.2
-bin/scan-build-mp-3.2
-bin/scan-view-mp-3.2

Modified: branches/pixilla-mysqls-55/dports/lang/gcc48/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/gcc48/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/gcc48/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 name                gcc48
 subport             libstdcxx-devel {}
 
-version             4.8-20121111
+version             4.8-20121125
 platforms           darwin
 categories          lang
 maintainers         mww openmaintainer
@@ -25,8 +25,8 @@
 
 distname            gcc-${version}
 
-checksums           rmd160  e487f88bd3925f6f0b6a031e1cbb126c3375d99e \
-                    sha256  ac31d07eef0948eed635a677a7dcd8b14f2f469cf553e0eb8a49e702ffd84bcf
+checksums           rmd160  56e857cdc626562f6b8b7c3c978710914e06c1cd \
+                    sha256  ca85d2903a346cd0d4f3995b37af7f4a2561d89e596adc3e93b888e141162eac
 
 supported_archs     i386 x86_64
 

Modified: branches/pixilla-mysqls-55/dports/lang/gccxml-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/gccxml-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/gccxml-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,28 +2,21 @@
 
 PortSystem 1.0
 PortGroup 		cmake 1.0
+PortGroup       github 1.0
 
-name			gccxml-devel
-version			20120517
 categories		lang
 platforms		darwin
-license			{GPL-2 BSD}
 maintainers		mnick openmaintainer
-# See http://public.kitware.com/GCC_XML/HTML/Copyright.html for license details
-license         {GPL-2 BSD}
+# See http://www.gccxml.org/HTML/Copyright.html for license details
+license			{GPL-2 BSD}
+github.setup    gccxml gccxml 2cbeb9d631e0198fcbeca3d230ef49fe07e87dd8
+name			gccxml-devel
+version			20121106
 description		generates XML description of C++ code
 long_description	generates an XML description of a C++ program from GCC's \
 				internal representation
-
 homepage		http://www.gccxml.org/
-master_sites        https://downloads.sourceforge.net/project/ompl/dependencies/
-distname            gccxml-2012-05-17
-extract.suffix      .tgz
-checksums           rmd160  8095d9eb91fa79815d13ddf525dacdab4c6fba13 \
-                    sha256  511a42b8d9ee8f3a49c02df67d512027db1cca4e69896caeb0426821a198f8eb
-worksrcdir          gccxml
-
+checksums           rmd160  d318f0e54b1ec65fde4d7ef78b5c94e9065117e7 \
+                    sha256  220612e154618f231c02b5f3c7d759925c9f957112de438bb583cffd9ea34c65
 universal_variant no
-if {${configure.compiler} == "clang"} {
-     configure.compiler llvm-gcc-4.2
-}
+compiler.blacklist      clang

Modified: branches/pixilla-mysqls-55/dports/lang/go/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/go/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/go/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,3 +1,4 @@
+# -*- 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
@@ -5,7 +6,7 @@
 name                go
 epoch               2
 version             1.0.2
-revision            0
+revision            1
 categories          lang
 platforms           darwin freebsd linux
 license             BSD
@@ -65,8 +66,18 @@
     }
 }
 
+patchfiles          patch-src_make.bash-use-correct-compiler.diff \
+                    patch-src_cmd_go_build.go-use-correct-compiler.diff
+
+post-patch {
+    reinplace "s#@CC@#${configure.cc}#g" ${worksrcpath}/src/cmd/go/build.go
+}
+
 use_configure       no
 
+# attempting the build with clang fails on some go code
+compiler.blacklist  clang
+
 pre-build {
     xinstall -m 755 -d ${GOROOT} ${GOBIN}
 }
@@ -74,7 +85,11 @@
 build.cmd           ./make.bash
 build.target
 build.env           GOROOT=${GOROOT} GOBIN=${GOBIN} GOARCH=${GOARCH} \
-                    GOROOT_FINAL=${prefix}
+                    GOROOT_FINAL=${prefix} \
+                    CC=${configure.cc} \
+                    GCC=${configure.cc} \
+                    GO_GCFLAGS=${configure.cflags} \
+                    GO_LDFLAGS=${configure.ldflags}
 use_parallel_build  no
 post-build {
     # remove mercurial extras

Modified: branches/pixilla-mysqls-55/dports/lang/gprolog/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/gprolog/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/gprolog/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		gprolog
-version		1.4.1
+version		1.4.2
 
 categories	lang
 maintainers	logtalk.org:pmoura
@@ -28,8 +28,8 @@
 master_sites	http://www.gprolog.org/
 
 checksums	\
-	sha1    f25e11dbef2467c8ea1bb16cfd20623fd2f4fad4 \
-	rmd160  f3e093868e7fc468ae81fc9cc4ebe21b22b0cd0a
+	sha1    ca793f8c453f7bcefa088e1abbc793a002d5ede7 \
+	rmd160  7e54464ebd54cab486914847fd513bdd342ca357
 
 worksrcdir 	${name}-${version}/src
 

Modified: branches/pixilla-mysqls-55/dports/lang/llvm-3.2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/llvm-3.2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/llvm-3.2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -48,16 +48,15 @@
 }
 
 fetch.type              svn
-svn.revision            167157
+svn.revision            168259
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
 version                 ${llvm_version}-r${svn.revision}
-revision                1
-worksrcdir              trunk
-svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
-#worksrcdir              release_32
-#svn.url                 http://llvm.org/svn/llvm-project/llvm/branches/release_32
+#worksrcdir              trunk
+#svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
+worksrcdir              release_32
+svn.url                 http://llvm.org/svn/llvm-project/llvm/branches/release_32
 default_variants-append +assertions
 
 #version                 ${llvm_version}
@@ -175,16 +174,16 @@
 
 post-extract {
     if {${subport} == "clang-${llvm_version}"} {
-        system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
-        #system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_32 clang"
+        #system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
+        system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_32 clang"
         #file rename ${workpath}/clang-${llvm_version}.src ${worksrcpath}/tools/clang
 
-        system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
-        #system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_32 compiler-rt"
+        #system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
+        system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_32 compiler-rt"
         #file rename ${workpath}/compiler-rt-${llvm_version}.src ${worksrcpath}/projects/compiler-rt
 
-        system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
-        #system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_32 libcxx"
+        #system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
+        system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_32 libcxx"
         #file rename ${workpath}/libcxx-${llvm_version}.src ${worksrcpath}/projects/libcxx
     }
 }

Modified: branches/pixilla-mysqls-55/dports/lang/llvm-3.2/files/install_target.patch
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/llvm-3.2/files/install_target.patch	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/llvm-3.2/files/install_target.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,14 +1,14 @@
---- a/Makefile	2012-10-27 12:59:04.000000000 -0700
-+++ b/Makefile	2012-10-27 13:00:48.000000000 -0700
-@@ -69,9 +69,8 @@ endif
- ifeq ($(MAKECMDGOALS),install-clang)
+--- release_32/Makefile.orig	2012-11-17 14:30:41.000000000 -0500
++++ release_32/Makefile	2012-11-17 16:17:04.000000000 -0500
+@@ -70,9 +70,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
    DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
            tools/clang/tools/libclang \
+           tools/clang/tools/c-index-test \
 -          tools/clang/include/clang-c \
 -          tools/clang/runtime tools/clang/docs \
 -          tools/lto runtime
 +          tools/clang/include tools/clang/lib \
 +          tools/clang/runtime tools/clang/docs
-   ifneq ($(BUILD_CLANG_ONLY),YES)
-     DIRS += tools/clang/tools/c-index-test
-   endif
+   OPTIONAL_DIRS :=
+   NO_INSTALL = 1
+ endif

Modified: branches/pixilla-mysqls-55/dports/lang/perl5.10/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/perl5.10/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/perl5.10/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -40,6 +40,10 @@
     # bypass stupid check that assumes fprintf must be in libc.dylib
     patchfiles-append   patch-hints_darwin.sh-usenm.diff
 }
+platform darwin 12 {
+    # bypass stupid check that assumes fprintf must be in libc.dylib
+    patchfiles-append   patch-hints_darwin.sh-usenm.diff
+}
 
 pre-configure {
     reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure


Property changes on: branches/pixilla-mysqls-55/dports/lang/php
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/www/php5-devel:41985
   + /trunk/dports/lang/php:99672-100173
/trunk/dports/www/php5-devel:41985

Modified: branches/pixilla-mysqls-55/dports/lang/php/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/php/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/php/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -22,7 +22,7 @@
                         scripting.
 
 # The list of PHP branches this port provides.
-php.branches            5.3 5.4
+php.branches            5.3 5.4 5.5
 
 # Fix for users specifying the subport name with the wrong case.
 set subport             [string tolower ${subport}]
@@ -60,25 +60,41 @@
 # Remember to increment revision of ${php}-eaccelerator when updating version of ${php}.
 switch ${subport_branch} {
     5.3 {
-        version         5.3.18
+        version         5.3.19
         set suhosin_available       yes
         set suhosin_patch_version   5.3.9-0.9.10
         set suhosin_patch           suhosin-patch-${suhosin_patch_version}.patch.gz
         checksums       [suffix ${distname}] \
-                        rmd160  f1b0059816fb817d159532239c02ddefac0085f4 \
-                        sha256  f065deecb78abb8ef101e1098866024af4ca10cb30139608c9a18e40236f1a2f \
+                        rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6 \
                         ${suhosin_patch} \
                         rmd160  ce43921fd9b183b154713ecda98294f6c68d5f22 \
                         sha256  4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
     }
     5.4 {
         epoch           1
-        version         5.4.8
+        version         5.4.9
         set suhosin_available       no
         checksums       [suffix ${distname}] \
-                        rmd160  eeee692e2f29447b3eeeefd89980c35798c5cb85 \
-                        sha256  d02810b7949938ee7190116e7483e1a06b3fa8373d3bbc0ea65a41265afce79f
+                        rmd160  b1795652cea62a118453df5dc3fa62f679f93e64 \
+                        sha256  c0649971cfa9723701d085e227376374569689689b8421e4dcfac56c2f6fcac5
     }
+    5.5 {
+        # When this becomes a stable version, remove the overrides for homepage,
+        # master_sites and livecheck, and update php.latest_stable_branch in the
+        # php-1.1 portgroup.
+        version         5.5.0alpha1
+        homepage        http://qa.php.net/
+        master_sites    http://downloads.php.net/dsp/
+        use_bzip2       no
+        use_xz          yes
+        set suhosin_available       no
+        checksums       [suffix ${distname}] \
+                        rmd160  cd0a19d4c53641d2dc121002c5a8755e0b56e029 \
+                        sha256  e1de6e8fa25ca09eca4e58d8a6b33624dfa5d9240db64e3e37f4558fdf135c55
+        livecheck.url   ${homepage}
+        livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
+    }
 }
 
 # Iterate through branches in reverse order, so that the list of subports in
@@ -114,9 +130,7 @@
     patch.pre_args      -p1
     patchfiles          patch-${php}-scripts-php-config.in.diff
     
-    if {${configure.compiler} == "clang"} {
-        configure.compiler llvm-gcc-4.2
-    }
+    compiler.blacklist  clang
     
     set phpinidir       ${prefix}/etc/${php}
     set extraphpinidir  ${prefix}/var/db/${php}
@@ -266,11 +280,11 @@
 "
     }
     
-    # Enable livecheck for the two most recent PHP branches.
-    if {[vercmp ${branch} [lindex ${php.branches} end-1]] >= 0} {
+    # Enable livecheck for the two most recent stable PHP branches and the development branch.
+    if {[vercmp ${branch} [lindex ${php.branches} end-2]] >= 0} {
         livecheck.type      regex
-        livecheck.url       ${homepage}downloads.php
-        livecheck.regex     get/php-([strsed ${branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*)\\.tar
+        default livecheck.url   ${homepage}downloads.php
+        default livecheck.regex {get/php-([strsed ${branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*)\\.tar}
     }
 }
 
@@ -345,6 +359,8 @@
 ### FPM SAPI ###
 
 subport ${php}-fpm {
+    revision                1
+    
     description             ${php} FPM SAPI
     
     long_description        ${description}
@@ -362,6 +378,7 @@
     
     configure.args-delete   --disable-fpm
     configure.args-append   --enable-fpm \
+                            --datadir=${prefix}/share/examples/${php} \
                             --sysconfdir=${phpinidir} \
                             --with-fpm-user=${fpmuser} \
                             --with-fpm-group=${fpmgroup}
@@ -748,8 +765,6 @@
 subport ${php}-oracle {
     php.extensions          oci8 pdo_oci
     
-    revision                1
-    
     if {${os.platform} == "darwin" && ${os.major} > 10} {
         # oracle-instantclient 10.2.0.4.0 crashes in 64-bit mode on Lion and up.
         supported_archs i386

Copied: branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-iODBC.diff (from rev 100173, trunk/dports/lang/php/files/patch-php55-iODBC.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-iODBC.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-iODBC.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,18 @@
+--- ext/odbc/config.m4.orig	2007-07-31 08:02:00.000000000 -0500
++++ ext/odbc/config.m4	2010-08-05 21:21:54.000000000 -0500
+@@ -99,6 +99,7 @@
+ dnl
+ dnl configure options
+ dnl
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [  --with-adabas[=DIR]     Include Adabas D support [/usr/local]])
+@@ -363,6 +364,7 @@
+     AC_MSG_RESULT([$ext_ouput])
+   fi
+ fi
++MACPORTS_DISABLED
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(iodbc,,

Copied: branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff (from rev 100173, trunk/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,41 @@
+--- a/sapi/fpm/php-fpm.conf.in.orig	2011-10-08 16:04:10.000000000 -0500
++++ b/sapi/fpm/php-fpm.conf.in	2012-02-13 18:51:53.000000000 -0600
+@@ -22,14 +22,14 @@
+ ; Pid file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: none
+-;pid = run/php-fpm.pid
++;pid = run/@PHP@/php-fpm.pid
+ 
+ ; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+ ; in a local file.
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++error_log = log/@PHP@/php-fpm.log
+ 
+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
+@@ -42,7 +42,7 @@
+ ; instances running on the same server, you can change the default value
+ ; which must suit common needs.
+ ; Default Value: php-fpm
+-;syslog.ident = php-fpm
++syslog.ident = @PHP at -fpm
+ 
+ ; Log level
+ ; Possible Values: alert, error, warning, notice, debug
+@@ -76,9 +76,10 @@
+ ; Default Value: 0
+ ; process.max = 128
+ 
+-; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
++; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging
++; or for use with launchd.
+ ; Default Value: yes
+-;daemonize = yes
++daemonize = no
+  
+ ; Set open file descriptor rlimit for the master process.
+ ; Default Value: system defined value

Copied: branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-scripts-php-config.in.diff (from rev 100173, trunk/dports/lang/php/files/patch-php55-scripts-php-config.in.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-scripts-php-config.in.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-scripts-php-config.in.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- a/scripts/php-config.in.orig	2011-05-15 01:09:21.000000000 -0500
++++ b/scripts/php-config.in	2011-10-04 05:45:52.000000000 -0500
+@@ -7,7 +7,7 @@
+ version="@PHP_VERSION@"
+ vernum="@PHP_VERSION_ID@"
+ include_dir="@includedir@/php"
+-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
++includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I at prefix@/include"
+ ldflags="@PHP_LDFLAGS@"
+ libs="@EXTRA_LIBS@"
+ extension_dir='@EXTENSION_DIR@'

Copied: branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-unixODBC.diff (from rev 100173, trunk/dports/lang/php/files/patch-php55-unixODBC.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-unixODBC.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/lang/php/files/patch-php55-unixODBC.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,18 @@
+--- ext/odbc/config.m4.orig	2007-07-31 08:02:00.000000000 -0500
++++ ext/odbc/config.m4	2009-12-12 20:32:00.000000000 -0600
+@@ -99,6 +99,7 @@
+ dnl
+ dnl configure options
+ dnl
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [  --with-adabas[=DIR]     Include Adabas D support [/usr/local]])
+@@ -404,6 +405,7 @@
+     AC_MSG_RESULT([$ext_output])
+   fi
+ fi
++MACPORTS_DISABLED
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(unixODBC,,

Copied: branches/pixilla-mysqls-55/dports/lang/php/files/php55 (from rev 100173, trunk/dports/lang/php/files/php55)
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/php/files/php55	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/lang/php/files/php55	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,6 @@
+bin/php55
+bin/php-config55
+bin/phpize55
+share/man/man1/php55.1.gz
+share/man/man1/php-config55.1.gz
+share/man/man1/phpize55.1.gz


Property changes on: branches/pixilla-mysqls-55/dports/lang/php5
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/www/php5-devel:41985
   + /trunk/dports/lang/php5:99672-100173
/trunk/dports/www/php5-devel:41985

Modified: branches/pixilla-mysqls-55/dports/lang/php5/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/php5/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/php5/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,7 +8,7 @@
 # Keep version of php5 in sync with bundled php5 extension ports.
 # Increment revision of php5-eaccelerator when updating version of php5.
 epoch                   1
-version                 5.3.17
+version                 5.3.19
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -32,8 +32,8 @@
 use_bzip2               yes
 
 checksums               [suffix ${distname}] \
-                        rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+                        rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_build           port:pkgconfig \
                         port:autoconf213

Modified: branches/pixilla-mysqls-55/dports/lang/pure/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/pure/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/pure/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    pure
 # Keep the versions of pure and pure-docs in sync.
-version                 0.55
+version                 0.56
 categories              lang
 platforms               darwin
 maintainers             ryandesign
@@ -29,8 +29,8 @@
                         are licensed under LGPL-3, the interpreter is GPL-3, \
                         and the examples are BSD-licensed.
 
-checksums               rmd160  39b758f5ae081b50c79fb4de13f99e17872cbb53 \
-                        sha256  36dbf1b77719a8031766b30812ac89102188d01ae9da80c2b53889f501cb58a7
+checksums               rmd160  edc712e5620dabae01ea73452e87445bc2413138 \
+                        sha256  12b63fd8a78d1179cc6d4af32ad19df7b48a3012e3143cc3adfe5c1a864c82d2
 
 livecheck.type          none
 

Modified: branches/pixilla-mysqls-55/dports/lang/pure/files/patch-openbrowser.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/pure/files/patch-openbrowser.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/pure/files/patch-openbrowser.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,15 +6,15 @@
  interpreter. The former needs the 'man' program, the latter a html browser,
 -w3m by default. See the INSTALL file or the manpage for details. Or just point
 -your browser at the following URL to read the manual on the web:
-+your Mac OS X web browser by default. See the INSTALL file or the manpage for
++your OS X web browser by default. See the INSTALL file or the manpage for
 +details. Or just point your browser at the following URL to read the manual
 +on the web:
  
  http://docs.pure-lang.googlecode.com/hg/index.html
  
---- lexer.cc.orig	2012-03-08 07:49:30.000000000 -0600
-+++ lexer.cc	2012-03-22 18:49:52.000000000 -0500
-@@ -8803,7 +8803,7 @@
+--- lexer.cc.orig	2012-11-10 12:48:43.000000000 -0600
++++ lexer.cc	2012-11-23 23:26:40.000000000 -0600
+@@ -9372,7 +9372,7 @@
        } else
  	cerr << "help: memory allocation error\n";
      } else {
@@ -23,9 +23,9 @@
        string helpcmd = string(browser) + " \"" + docname + "\"";
        if (system(helpcmd.c_str()) == -1) perror("system");
      }
---- pure.1.orig	2011-12-17 21:47:52.000000000 -0600
-+++ pure.1	2011-12-22 13:46:21.000000000 -0600
-@@ -119,9 +119,9 @@
+--- pure.1.orig	2012-10-21 16:41:05.000000000 -0500
++++ pure.1	2012-11-23 23:26:40.000000000 -0600
+@@ -126,9 +126,9 @@
  .PP
  The full version of this manual can be read inside the interpreter, by typing
  .B help
@@ -33,12 +33,12 @@
 -.BR w3m (1)
 -to work. (You can also set the name of another html browser to use with the
 +on the interpreter's command line.
-+This opens the documentation into your Mac OS X web browser.
++This opens the documentation into your OS X web browser.
 +(You can also set the name of another html browser to use with the
  .B PURE_HELP
  or the
  .B BROWSER
-@@ -162,7 +162,7 @@
+@@ -179,7 +179,7 @@
  .TP
  .B PURE_HELP
  Browser to use to read online documentation in the interpreter. By default,

Modified: branches/pixilla-mysqls-55/dports/lang/pure-docs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/pure-docs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/pure-docs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup                       pure 1.0
 
 # Keep the versions of pure and pure-docs in sync.
-pure.setup                      docs 0.55
+pure.setup                      docs 0.56
 categories                      lang
 platforms                       darwin
 maintainers                     ryandesign
@@ -17,8 +17,8 @@
 
 long_description                ${name} is the set of ${description}.
 
-checksums                       rmd160  7f618b99d914d5d62ea70fd1cc5575f6ac4e7e5e \
-                                sha256  2cd0045c8fd126cf41cb847f2842e11b7c0480c8cb8d5ea33470cf7edcfd1db9
+checksums                       rmd160  71679bb66607ab33841b785640a0f4ae29e92b22 \
+                                sha256  a4bc44673513157b543347ad8eeeefdef5e52e9bb412d55e9783a2bbf429e54a
 
 platform macosx {
     patchfiles                  patch-openbrowser.diff

Modified: branches/pixilla-mysqls-55/dports/lang/pure-docs/files/patch-openbrowser.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/pure-docs/files/patch-openbrowser.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/pure-docs/files/patch-openbrowser.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,44 +1,44 @@
---- _sources/pure.txt.orig	2012-06-04 09:31:56.000000000 -0500
-+++ _sources/pure.txt	2012-06-05 23:07:47.000000000 -0500
-@@ -1075,7 +1075,7 @@
+--- _sources/pure.txt.orig	2012-11-13 18:10:12.000000000 -0600
++++ _sources/pure.txt	2012-11-23 23:28:58.000000000 -0600
+@@ -1093,7 +1093,7 @@
  .. envvar:: PURE_HELP
  
     Command used to browse the Pure manual. This must be a browser capable of
 -   displaying html files. Default is :program:`w3m`.
-+   displaying html files. Default is your Mac OS X web browser.
++   displaying html files. Default is your OS X web browser.
  
  .. envvar:: PURE_INCLUDE
  
-@@ -7026,9 +7026,9 @@
+@@ -10747,9 +10747,9 @@
  manuals of the addon modules available from the Pure website.
  
  You need to have a html browser installed to make this work. By default, the
 -``help`` command uses :program:`w3m`, but you can change this by setting
 -either the :envvar:`PURE_HELP` or the :envvar:`BROWSER` environment variable
 -accordingly.
-+``help`` command uses your Mac OS X web browser, but you can change this by
++``help`` command uses your OS X web browser, but you can change this by
 +setting either the :envvar:`PURE_HELP` or the :envvar:`BROWSER` environment
 +variable accordingly.
  
  When invoked without arguments, the ``help`` command displays an overview of
  the available documentation, from which you can follow the links to the
---- pure.html.orig	2012-06-04 09:31:56.000000000 -0500
-+++ pure.html	2012-06-05 23:07:47.000000000 -0500
-@@ -1290,7 +1290,7 @@
+--- pure.html.orig	2012-11-13 18:10:25.000000000 -0600
++++ pure.html	2012-11-23 23:30:02.000000000 -0600
+@@ -1344,7 +1344,7 @@
  <dt id="envvar-PURE_HELP">
  <tt class="descname">PURE_HELP</tt><a class="headerlink" href="#envvar-PURE_HELP" title="Permalink to this definition">¶</a></dt>
  <dd><p>Command used to browse the Pure manual. This must be a browser capable of
 -displaying html files. Default is <strong class="program">w3m</strong>.</p>
-+displaying html files. Default is your Mac OS X web browser.</p>
++displaying html files. Default is your OS X web browser.</p>
  </dd></dl>
  
  <dl class="envvar">
-@@ -7046,7 +7046,7 @@
+@@ -10671,7 +10671,7 @@
  format; this includes the present manual, the <a class="reference internal" href="purelib.html"><em>Pure Library Manual</em></a>, as well as all
  manuals of the addon modules available from the Pure website.</p>
  <p>You need to have a html browser installed to make this work. By default, the
 -<tt class="docutils literal"><span class="pre">help</span></tt> command uses <strong class="program">w3m</strong>, but you can change this by setting
-+<tt class="docutils literal"><span class="pre">help</span></tt> command uses your Mac OS X web browser, but you can change this by setting
- either the <span class="target" id="index-29"></span><a class="reference internal" href="#envvar-PURE_HELP"><tt class="xref std std-envvar docutils literal"><span class="pre">PURE_HELP</span></tt></a> or the <span class="target" id="index-30"></span><a class="reference internal" href="#envvar-BROWSER"><tt class="xref std std-envvar docutils literal"><span class="pre">BROWSER</span></tt></a> environment variable
++<tt class="docutils literal"><span class="pre">help</span></tt> command uses your OS X web browser, but you can change this by setting
+ either the <span class="target" id="index-30"></span><a class="reference internal" href="#envvar-PURE_HELP"><tt class="xref std std-envvar docutils literal"><span class="pre">PURE_HELP</span></tt></a> or the <span class="target" id="index-31"></span><a class="reference internal" href="#envvar-BROWSER"><tt class="xref std std-envvar docutils literal"><span class="pre">BROWSER</span></tt></a> environment variable
  accordingly.</p>
  <p>When invoked without arguments, the <tt class="docutils literal"><span class="pre">help</span></tt> command displays an overview of

Modified: branches/pixilla-mysqls-55/dports/lang/qore/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/qore/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/qore/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                qore
-version             0.8.6.1
+version             0.8.6.2
 revision            1
 categories          lang
 license             LGPL-2.1
@@ -17,9 +17,9 @@
 master_sites        sourceforge
 conflicts           qore-devel
 
-checksums           md5 1ff748908848bfd084d76831e1fbfcd9 \
-                    sha1 d4e05f07bb67cb605557dbb9f3d80552378ee86c \
-                    rmd160 674a00405eb05cacec085105231bcd914e035d0e
+checksums           md5 9eadf15b4b255df3728f900c2ac327e3 \
+                    sha1 6ff279df37d3a45ffbee12535378dc5276b85737 \
+                    rmd160 bcab9e7fe75209da664284e59a66602b5adee757
 
 depends_build       port:flex \
                     port:bison

Modified: branches/pixilla-mysqls-55/dports/lang/qore-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/qore-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/qore-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                qore-devel
-svn.revision        5241
+svn.revision        5265
 version             0.8.6.99-${svn.revision}
 categories          lang
 license             LGPL-2.1

Modified: branches/pixilla-mysqls-55/dports/lang/qore-mysql-module/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/qore-mysql-module/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/qore-mysql-module/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                qore-mysql-module
-version             2.0
+version             2.0.1
 categories          lang
 license             LGPL-2.1
 maintainers         davidnichols
@@ -15,9 +15,9 @@
 platforms           darwin
 master_sites        sourceforge:qore
 
-checksums           md5 d3c951915b65c6aecbb4ee3ba1218067 \
-                    sha1 7588994962cd9f514e330fdaa30f6442f384321a \
-                    rmd160 9a771c62f1e083c78807fffb176cb9edf3eb160e
+checksums           md5 28e9a89f7e543f46ddb6bb3dcc838c2c \
+                    sha1 4c219ce39d2fc0c025e1dc46fe7a6a8bff5f0020 \
+                    rmd160 172c9f9ebee4b638e470e096e1537d6decff3af3
 
 depends_lib         port:qore \
                     path:bin/mysql_config5:mysql5

Modified: branches/pixilla-mysqls-55/dports/lang/ruby19/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/ruby19/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/ruby19/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem			1.0
 
 name				ruby19
-version				1.9.3-p286
+version				1.9.3-p327
 revision			0
 
 categories			lang ruby
@@ -26,10 +26,10 @@
 use_bzip2			yes
 distname			ruby-${version}
 
-checksums			md5 e76848a86606a4fd5dcf14fc4b4e755e \
-					rmd160 5ca0dbc1f2d046954f0ce20af76a01ece78cd3f2 \
-					sha1 095c783c88965c6e72b1f3484c50c60207b60bfa \
-					sha256 5281656c7a0ae48b64f28d845a96b4dfa16ba1357a911265752787585fb5ea64
+checksums			md5 7d602aba93f31ceef32800999855fbca \
+					rmd160 5cd8317a3bdfeb7d6faef4f2ae49193292a60031 \
+					sha1 7fbacfc960ef76d98c83f20eb31c71d6aaf9a5a6 \
+					sha256 d989465242f9b11a8a3aa8cbd2c75a9b3a8c0ec2f14a087a0c7b51abf164e488
 use_parallel_build	no
 
 depends_lib			port:libiconv \
@@ -109,11 +109,10 @@
 
 variant nosuffix description "Don't add the 1.9 program suffix to the executables" {
     conflicts ruby ruby186 rb-rubygems rb-rake
-		configure.args-delete           --program-suffix=1.9
     post-destroot {
-        # install suffixed binaries to build rb19-* packages.
+        # make symlinks no-suffixed binaries
         foreach file {erb gem irb rake rdoc ri ruby testrb} {
-            ln -s ${prefix}/bin/${file} ${destroot}${prefix}/bin/${file}1.9
+            ln -s ${prefix}/bin/${file}1.9 ${destroot}${prefix}/bin/${file}
         }
     }
 }

Modified: branches/pixilla-mysqls-55/dports/lang/spidermonkey/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/spidermonkey/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/spidermonkey/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 name                spidermonkey
 epoch               1
 version             1.7.0
-revision            5
+revision            6
 categories          lang
 platforms           darwin
 maintainers         akitada openmaintainer
@@ -25,8 +25,9 @@
                     sha1 1a99e8e10cb6600a03ea98895583a8ed42136d1f \
                     rmd160 6eadf1ac7c10a13b3db3d499856c9e18ddbcdfdb
 
-depends_build       port:readline
-depends_lib         port:nspr
+depends_lib         port:nspr \
+                    port:readline
+
 worksrcdir          js/src
 
 patchfiles          spidermonkey-1.5-build.patch \

Modified: branches/pixilla-mysqls-55/dports/lang/swi-prolog/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/swi-prolog/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/swi-prolog/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 name		swi-prolog
 conflicts	swi-prolog-devel swi-prolog-lite
 epoch		20051223
-version		6.2.2
+version		6.2.3
 
 categories	lang
 license		LGPL-2.1
@@ -29,8 +29,8 @@
 master_sites	http://www.swi-prolog.org/download/stable/src
 
 checksums   \
-	sha1    204bfd5aa5c93724117c782681ffc595f681bd5b \
-	rmd160  c7ea1ff5551e3e7848cd8ea3dd69dbffb98a4122
+	sha1    5026e9c70c520faec5a4ffa431eb5ef45af3c39d \
+	rmd160  19e7f544debf0cf7aaebaea67bd43406ba55233e
 
 depends_build   \
 	port:gawk	\

Modified: branches/pixilla-mysqls-55/dports/lang/swi-prolog-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/swi-prolog-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/swi-prolog-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 name		swi-prolog-devel
 conflicts	swi-prolog swi-prolog-lite
 epoch		20051223
-version		6.3.3
+version		6.3.4
 
 categories	lang
 license		LGPL-2.1
@@ -31,8 +31,8 @@
 dist_subdir	swi-prolog
 
 checksums       \
-	sha1    2dd5550b2ee27995389c6eb521af1964ab168b7c \
-	rmd160  a8e4da42927b64d427d8c0e0c5ab6e8177902f85
+	sha1    159a6ad024843643826c8d3c1d933de51961d9d5 \
+	rmd160  a6efefeca9be3c2933edf636fbd2c5b06c9aea20
 
 depends_build   \
 	port:gawk	\

Modified: branches/pixilla-mysqls-55/dports/lang/tcl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/tcl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/tcl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name          tcl
-version       8.5.12
-revision      2
+version       8.5.13
 # Tk (x11/tk) port depends on this version
 categories    lang
 license       Tcl/Tk
@@ -21,8 +20,9 @@
 homepage      http://www.tcl.tk/
 master_sites  sourceforge:project/tcl/Tcl/${version}
 
-checksums           rmd160  ada42e22f7b12413c88d9ec7dbd3789926f362d2 \
-                    sha256  20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2
+checksums     md5 fa3a9bf9b2d6ed2431f1baa46f4058b8 \
+              sha1 65b677dc699426233b926edfa9e304d456da7cad \
+              rmd160 20cfb8adebd77a6d037f67a9af7e88d80032b3c2
 
 dist_subdir     tcltk
 distname        ${name}${version}-src
@@ -44,13 +44,19 @@
 
 # dont enable threads by default as Tcl uses thread-local storage which makes
 # passing Tcl_Obj* around between threads fatal
-variant threads description {add multithreading and corefoundation support} {
+variant threads description {add multithreading support} {
     configure.args-append --enable-threads
-    # dont enable core-foundation by default as it is not fork()-safe and
-    # software e.g. using tk and fork() will crash
-    configure.args-delete --disable-corefoundation
 }
 
+platform macosx {
+    # CF is not fork()-safe and software e.g. using tk and fork() will crash
+    variant corefoundation description {Enable CoreFoundation support (not fork-safe)} {
+        configure.args-delete --disable-corefoundation
+    }
+    # tk +quartz crashes at launch without CF support
+    default_variants +corefoundation
+}
+
 variant memdebug description {enable memory debugging support} {
     configure.args-append --enable-symbols=mem
 }

Modified: branches/pixilla-mysqls-55/dports/lang/vala/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/lang/vala/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/lang/vala/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                vala
-version             0.18.0
+version             0.18.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
 maintainers         nomaintainer
@@ -22,8 +22,8 @@
 master_sites        gnome:sources/${name}/${branch}/
 use_xz              yes
 
-checksums           rmd160  533d24431503863f1639d7579c25dee475233d1a \
-                    sha256  18cb2220ce7352a9dd71be058530f7d4a6c8215a1d9c471430af60a04496a60b 
+checksums           rmd160  9fed7516c8246116e8eee514427547f440eb4f23 \
+                    sha256  7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32
 
 depends_build       path:bin/pkg-config:pkgconfig \
                     port:libxslt

Modified: branches/pixilla-mysqls-55/dports/mail/dovecot2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/mail/dovecot2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/mail/dovecot2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 set base_name       dovecot
 # Please revbump port:dovecot2-sieve and port:dovecot2-antispam
 # on port:dovecot2 version changes.
-version             2.1.10
+version             2.1.12
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          mail
 maintainers         pixilla openmaintainer
@@ -39,8 +39,8 @@
 patch.pre_args      -p1
 patchfiles          patch-doc-example-config-conf.d-10-master.conf.diff
 
-checksums           rmd160  b1e3f5cd29bf71a7b95d6b49fabe35bd15c37fc8 \
-                    sha256  8acc99c2a7e8b598aef2fef443c5fb6779099e57573f86a1eaa2b8479d0becb9
+checksums           rmd160  ebf122130988e5c243a0bdc89be0088ab5aa8acb \
+                    sha256  d76ae15146452d053c423d883b2cbc24f62a55cf2f1f547577f42bc7d8d20840
 
 post-patch {
     reinplace "s|@@default_internal_user@@|${default_internal_user}|g" \

Modified: branches/pixilla-mysqls-55/dports/mail/dovecot2-antispam/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/mail/dovecot2-antispam/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/mail/dovecot2-antispam/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -10,7 +10,7 @@
 
 # Please revbump port:dovecot2-sieve and port:dovecot2-antispam
 # on port:dovecot2 version changes.
-revision            3
+revision            4
 
 categories          mail
 maintainers         pixilla openmaintainer

Modified: branches/pixilla-mysqls-55/dports/mail/dovecot2-sieve/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/mail/dovecot2-sieve/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/mail/dovecot2-sieve/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -17,7 +17,7 @@
 
 # set hg.tag to tag or rev.
 hg.tag              ${version}
-hg.tag              1659
+hg.tag              1667
 
 categories          mail
 maintainers         pixilla openmaintainer
@@ -57,11 +57,12 @@
 
 worksrcdir          dovecot-[join [split ${dovecot2} .] -]-pigeonhole-${hg.tag}
 
-checksums           rmd160  7a90136a3715364baf8200d1850bc76b0fe302ee \
-                    sha256  57e159db5e0707573ce56648e569f30cc961a4f13e4a806032339e639100a579
+checksums           rmd160  f3132fe3317f0dcf6516b3c36db73ee4744f5d49 \
+                    sha256  a4ff895f0048cc78914e0ab49fdd59c90349705b2ab19dec3e5822746a4b7240
 
 depends_lib         port:dovecot2
 
 configure.ldflags-append \
                     -L${prefix}/lib/dovecot
-configure.args      --with-managesieve=yes
+configure.args      --with-managesieve=yes \
+                    --disable-dependency-tracking

Modified: branches/pixilla-mysqls-55/dports/mail/imapsync/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/mail/imapsync/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/mail/imapsync/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                imapsync
-version             1.508
+version             1.516
 categories          mail
 platforms           darwin
 maintainers         mww
@@ -17,8 +17,8 @@
 master_sites        http://fedorahosted.org/released/imapsync/
 extract.suffix      .tgz
 
-checksums           rmd160  e6588cf9c6f8d213f812a04ebca0ae499b008e4b \
-                    sha256  bb470d4bcef664ee8672a77830ce98f99cda22b5f5185e95994a0200cde3b0e1
+checksums           rmd160  f64368298c842046ae0d4825fc3070abe550e6d8 \
+                    sha256  749b728544606f419321889a6159f77a65c5ee62c48c5afc6611c4e9b1629c17
 
 depends_run         port:perl5.12 \
                     port:p5.12-digest-md5 \

Modified: branches/pixilla-mysqls-55/dports/mail/opendkim/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/mail/opendkim/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/mail/opendkim/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                opendkim
-version             2.6.7
+version             2.7.2
 categories          mail
 license             {BSD restrictive/distributable}
 maintainers         pixilla openmaintainer
@@ -17,10 +17,11 @@
 master_sites        sourceforge
 
 depends_lib         path:lib/libssl.dylib:openssl \
-                    path:lib/libmilter.dylib:libmilter
+                    path:lib/libmilter.dylib:libmilter \
+                    port:unbound
 
-checksums           rmd160  54fc6693d610f5e746360904415c003396ab5012 \
-                    sha256  45da209ccddfb6f6888ac2366b6e38a6460b36ff0da527aed910217cead6fc84
+checksums           rmd160  0564cd60e62e0fa6254c17eb5f668cb3a8092667 \
+                    sha256  cf72a26506ef48a2c6b231947226ab460cdb6e05b18176ee42a94b3b6d521b42
 
 post-patch {
     reinplace "s|/var/|${prefix}/var/|g" \
@@ -29,7 +30,8 @@
         ${worksrcpath}/opendkim/opendkim.conf.simple-verify.in
 }
 
-configure.args      --with-openssl=${prefix}
+configure.args      --with-openssl=${prefix} \
+                    --with-unbound=${prefix}
 
 destroot.keepdirs    ${destroot}${prefix}/var/db/${name} \
                      ${destroot}${prefix}/var/run/${name}

Modified: branches/pixilla-mysqls-55/dports/math/arpack/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/arpack/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/arpack/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortGroup  muniversal 1.0
 
 name          arpack
-version       3.1.1
-revision      5
+version       3.1.2
 categories    math
 license       BSD
 platforms     darwin
@@ -15,12 +14,12 @@
     ARPACK is a collection of Fortran77 subroutines designed to solve large \
     scale eigenvalue problems.
 homepage            http://forge.scilab.org/index.php/p/arpack-ng
-master_sites        ${homepage}/downloads/417
+master_sites        ${homepage}/downloads/497
 distfiles           get
 dist_subdir         ${name}/${version}
-checksums           md5     d65b915736650d8878719d4168e50c36 \
-                    sha1    45b282d0aee768d9504c1a8d5440d069aa39dd62 \
-                    rmd160  fcce84166af3af61e3b122f80bd9ec3e919ac98e
+checksums           md5     7644e234f219ec1a29849b6d7811a6b1 \
+                    sha1    f5453e2d576f131890ca023e1d853e18920f9c3c \
+                    rmd160  2c55eca384cc0a1aebacdef527f88426932bf57b
 worksrcdir          ${name}-ng_${version}
 
 # openmpi does not have a universal variant
@@ -82,7 +81,7 @@
 	configure.env-append F77=${prefix}/bin/gfortran-mp-4.6
 }
 
-variant gcc47 description {build with gfortran-mp-4.6} conflicts gcc43 gcc44 gcc45 gcc46 g95 {
+variant gcc47 description {build with gfortran-mp-4.7} conflicts gcc43 gcc44 gcc45 gcc46 g95 {
 	depends_build-append    port:gcc47
 	configure.env-append F77=${prefix}/bin/gfortran-mp-4.7
 }

Modified: branches/pixilla-mysqls-55/dports/math/gnudatalanguage/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/gnudatalanguage/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/gnudatalanguage/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                        gnudatalanguage
 version                     0.9.2
-revision                    1
+revision                    2
 epoch                       1
 categories                  math science
 maintainers                 takeshi igf.fuw.edu.pl:slayoo
@@ -25,6 +25,7 @@
 set gshhsdata       gshhs_${dataversion}.zip
 distfiles           ${gdlsrc}:gdl
 worksrcdir                  gdl-${version}
+patchfiles          configure.in.patch
 
 checksums           ${gdlsrc} \
                     md5      7178304e6737a8dca910d2c1061ff63c \

Modified: branches/pixilla-mysqls-55/dports/math/gnuplot/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/gnuplot/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/gnuplot/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -13,7 +13,7 @@
 # luckily nothing has to link against this
 installs_libs               no
 platforms                   darwin
-maintainers                 gmail.com:mojca.miklavec.lists openmaintainer
+maintainers                 mojca openmaintainer
 
 description                 A command-driven interactive function plotting program
 

Modified: branches/pixilla-mysqls-55/dports/math/gunits/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/gunits/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/gunits/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name             gunits
-version          1.88
+version          2.01
 categories       math
 license          GPL-3+
 maintainers      nomaintainer
@@ -15,9 +15,8 @@
 platforms        darwin
 master_sites     gnu:units
 distname         units-${version}
-checksums        md5     9b2ee6e7e0e9c62741944cf33fc8a656 \
-                 sha1    0b65e9d9542d0c20082b0e9562fea42b1b02825e \
-                 rmd160  567caeb52e741cccd260e16fcdf9d7998de0f95b
+checksums        rmd160  2d3670658414ae77ae885c133880c515991d28ad \
+                 sha256  138b12c70bffa0e484fdfe579927412b1ac573e8351c17d8938592f9ba9a88f2
 
 depends_lib      port:readline
 

Modified: branches/pixilla-mysqls-55/dports/math/libsvm/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/libsvm/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/libsvm/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                libsvm
 epoch               1
-version             3.13
+version             3.14
 categories          math
 maintainers         hum openmaintainer
 license             BSD
@@ -21,8 +21,8 @@
 
 homepage            http://www.csie.ntu.edu.tw/~cjlin/libsvm/
 master_sites        ${homepage}
-checksums           rmd160  dde5e072203d2fec7017b615b0918a1fd245a398 \
-                    sha256  2dc34d3b7d7cc40bac56f1f101a60fa2be648ca5376bccf4c81cb35fe15e5333
+checksums           rmd160  fd692f8d3a69cdd9caeaa74f1b0ea516e1cc037e \
+                    sha256  c968528b6360a8d420f259ce531f76c3c30070cf20f2d334652f828d04cd4aa3
 
 patchfiles          patch-Makefile.diff
 

Modified: branches/pixilla-mysqls-55/dports/math/maxima/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/maxima/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/maxima/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -29,8 +29,7 @@
                 rmd160  a2d9aff1ac7e8a5464750b3b59f8b7dcedb148d5
 
 depends_lib     port:sbcl
-depends_run     port:tk \
-                port:recode \
+depends_run     port:recode \
                 port:gnuplot
 
 patchfiles      src_maxima.in.patch

Modified: branches/pixilla-mysqls-55/dports/math/octave-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/octave-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/octave-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -31,7 +31,6 @@
                     port:gawk \
                     port:gperf \
                     port:grep \
-                    port:gsed \
                     path:bin/perl:perl5 \
                     port:texinfo
 
@@ -51,7 +50,8 @@
                     port:readline \
                     port:qhull \
                     port:qrupdate \
-                    port:SuiteSparse
+                    port:SuiteSparse \
+                    port:gsed
 
 # allow us to disable checking for FLTK
 # via the environment variable "FLTK_CONFIG"

Modified: branches/pixilla-mysqls-55/dports/math/pspp-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/pspp-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/pspp-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,10 +5,10 @@
 PortGroup           app 1.0
 
 name                pspp-devel
-set buildstamp      20121112030504
-set buildhash       g3cd652
+set buildstamp      20121126030509
+set buildhash       g2c0ddc
 version             0.7.9
-revision            33
+revision            35
 # depends_test port:p5.12-text-diff
 categories          math
 license             GPL-3+
@@ -36,8 +36,8 @@
                     port:readline \
                     port:zlib \
 
-checksums           rmd160  3b1a2ae840faeee89fb21fae8fbe52f3d780883b \
-                    sha256  25e1263df5804907b504511db66d531e7a2d2898a7621684506feafb8a2bdf6b
+checksums           rmd160  d6f0a31b9a9f9924751a5c2ad894770c2102073b \
+                    sha256  cfb0f56939638c715c069d40696a5bab1931546d7fb86ebea9b885c31a84ad36
 
 #configure.cflags-append -g
 configure.perl      ${prefix}/bin/perl

Modified: branches/pixilla-mysqls-55/dports/math/pure-octave/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/pure-octave/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/pure-octave/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem                      1.0
 PortGroup                       pure 1.0
 
-pure.setup                      octave 0.2
-revision                        3
+pure.setup                      octave 0.3
 categories                      math science
 platforms                       darwin
 maintainers                     ryandesign
@@ -15,10 +14,7 @@
 
 long_description                ${name} is ${description}.
 
-# 0.2 was stealth-updated 2011-10-20
-dist_subdir                     ${name}/${version}_1
+checksums                       rmd160  e8da5316a65fe9d47032db8f9d30dca352533e8e \
+                                sha256  950278acb93dc3dc7191ea7b8fcd7b93893b05703cf9565f04dcb6b65599c4fe
 
-checksums                       rmd160  d136a22879940bc08f7174601da50f276b30617f \
-                                sha256  8b4618eff0c75efa9361361de2f7c43d53d50d8d80e5a39a45003b904a292824
-
-depends_lib-append              path:bin/octave:octave
+depends_lib-append              path:bin/octave:octave-devel

Modified: branches/pixilla-mysqls-55/dports/math/qrupdate/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/math/qrupdate/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/math/qrupdate/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -117,7 +117,11 @@
 
 if {![variant_isset gcc46] && ![variant_isset gcc47] \
         && ![variant_isset g95]} {
-    default_variants +gcc45
+	if {![variant_isset universal]} {
+		default_variants +gcc45
+	} else {
+		default_variants +gcc46
+	}
 }
 
 

Modified: branches/pixilla-mysqls-55/dports/multimedia/VLC/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/VLC/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/VLC/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                VLC
 version             2.0.4
-revision            4
+revision            5
 
 categories          multimedia
 

Modified: branches/pixilla-mysqls-55/dports/multimedia/VLC-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/VLC-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/VLC-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                VLC-devel
 version             2.0.99
-revision            5
+revision            6
 
 categories          multimedia
 

Modified: branches/pixilla-mysqls-55/dports/multimedia/VLC09/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/VLC09/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/VLC09/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                VLC09
 version             0.9.10
-revision            13
+revision            14
 
 categories          multimedia
 

Modified: branches/pixilla-mysqls-55/dports/multimedia/mlt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/mlt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/mlt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,8 +6,7 @@
 
 name                mlt
 epoch               3
-version             0.8.2
-revision            1
+version             0.8.6
 categories          multimedia
 maintainers         dennedy.org:dan
 license             GPL-2+
@@ -26,8 +25,8 @@
 master_sites        sourceforge:project/mlt/mlt
 platforms           darwin
 
-checksums           sha1    0bff1f13baaa8431de6969de62a827d45a9c178a \
-                    rmd160  a164495c6144f179342853ec0254c508ee4dd5fa
+checksums           sha1    616e807ba9f8fd8d6c9f87cb04416885c471596c \
+                    rmd160  354130bdd1d42e55f01703d2eac25a947d86f377
 
 # frei0r-plugins is not universal
 universal_variant   no

Modified: branches/pixilla-mysqls-55/dports/multimedia/mplayer2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/mplayer2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/mplayer2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    mplayer2
-epoch                   2
+epoch                   3
 categories              multimedia
 platforms               darwin
 license                 Restrictive
@@ -14,11 +14,10 @@
 long_description        ${description}
 
 homepage                http://www.mplayer2.org/
-version                 2.0-20120815
-revision                2
+version                 2.0-20121108
 fetch.type              git
 git.url                 git://git.mplayer2.org/mplayer2.git
-git.branch              01d067dd2160fa3c69a397840a0abd82837f4c91
+git.branch              b5349bb946d481e0f74449960b8f81839b47bd3c
 
 # disable livecheck, because it seems upstream isn't going to do any releases
 livecheck.type          none
@@ -28,20 +27,22 @@
 depends_build-append    port:pkgconfig \
                         port:yasm \
                         port:autoconf \
-                        port:python32
+                        port:python32 \
+                        port:py27-docutils
 
-depends_lib-append      \
-                        path:lib/pkgconfig/sdl.pc:libsdl \
+depends_lib-append      path:lib/pkgconfig/sdl.pc:libsdl \
+                        path:lib/libavcodec.dylib:ffmpeg \
+                        port:XviD \
                         port:a52dec \
                         port:enca \
                         port:faad2 \
-                        path:lib/libavcodec.dylib:ffmpeg \
                         port:fontconfig \
                         port:freetype \
                         port:fribidi \
                         port:gettext \
                         port:jpeg \
                         port:lame \
+                        port:lcms2 \
                         port:libass \
                         port:libcdio \
                         port:libdca \
@@ -53,16 +54,18 @@
                         port:libmng \
                         port:libogg \
                         port:libpng \
+                        port:libquvi \
                         port:libtheora \
                         port:libvorbis \
                         port:mesa \
                         port:ncurses \
                         port:speex \
-                        port:XviD \
                         port:zlib
 
 universal_variant       no
 
+patchfiles              patch-Makefile.diff
+
 post-patch {
     reinplace "s|#!/usr/bin/env python3|#!$prefix/bin/python3.2|g" \
         ${worksrcpath}/TOOLS/file2string.py \
@@ -95,8 +98,8 @@
                         --enable-networking \
                         --disable-winsock2_h \
                         --disable-smb \
-                        --enable-live \
-                        --disable-nemesi \
+                        --enable-libquvi \
+                        --enable-lcms2 \
                         --enable-vcd \
                         --disable-bluray \
                         --enable-dvdnav \
@@ -104,12 +107,8 @@
                         --disable-dvdread-internal \ \
                         --disable-libdvdcss-internal \
                         --enable-cddb \
-                        --disable-bitmap-font \
-                        --enable-freetype \
-                        --enable-fontconfig \
                         --disable-unrarexec \
                         --enable-sortsub \
-                        --enable-fribidi \
                         --enable-enca \
                         --enable-macosx-finder \
                         --enable-macosx-bundle \
@@ -148,23 +147,12 @@
                         --enable-liba52 \
                         --disable-musepack \
                         --enable-gl \
-                        --disable-dga2 \
-                        --disable-dga1 \
-                        --disable-vesa \
-                        --disable-svga \
                         --enable-sdl \
-                        --disable-aa \
                         --disable-caca \
-                        --disable-ggi \
-                        --disable-ggiwmh \
                         --disable-direct3d \
                         --disable-directx \
-                        --disable-dxr3 \
-                        --disable-ivtv \
                         --disable-v4l2 \
                         --disable-dvb \
-                        --disable-mga \
-                        --disable-xmga \
                         --disable-xv \
                         --disable-vdpau \
                         --disable-vm \
@@ -172,15 +160,7 @@
                         --disable-x11 \
                         --disable-xshape \
                         --disable-xss \
-                        --disable-fbdev \
-                        --disable-3dfx \
-                        --disable-tdfxfb \
-                        --disable-s3fb \
-                        --disable-wii \
                         --disable-directfb \
-                        --disable-bl \
-                        --disable-tdfxvid \
-                        --disable-xvr100 \
                         --disable-tga \
                         --disable-pnm \
                         --disable-md5sum \
@@ -195,9 +175,6 @@
                         --disable-portaudio \
                         --disable-jack \
                         --disable-openal \
-                        --disable-nas \
-                        --disable-sunaudio \
-                        --disable-win32waveout \
                         --enable-coreaudio \
                         --enable-translation \
                         --disable-select \
@@ -205,7 +182,7 @@
                         --disable-static \
                         --extra-cflags=\"${configure.cppflags} ${configure.optflags} [get_canonical_archflags cc] -Wno-pointer-sign\" \
                         --extra-ldflags=\"${configure.ldflags} [get_canonical_archflags ld]\" \
-                        --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lcdio_paranoia -lcdio_cdda -lcdio -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lswscale -lpostproc -ldv -lxvidcore -lm -ldvdnavmini -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl\"
+                        --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lcdio_paranoia -lcdio_cdda -lcdio -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lswscale -lpostproc -ldv -lxvidcore -lm -ldvdnavmini -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl -llcms2 -lquvi \"
 
                         # leave out libass, as configure doesn't handle it correctly
                         # --enable-libass \
@@ -214,9 +191,9 @@
 build.args-append       V=1
 build.env-append        CC=${configure.cc} \
                         CPP=${configure.cpp} \
-                        CFLAGS="${configure.optflags} [get_canonical_archflags]" \
+                        CFLAGS="${configure.optflags} [get_canonical_archflags cc]" \
                         CPPFLAGS="${configure.cppflags}" \
-                        LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
+                        LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
 
 variant smb description {Enable Samba support} {
     depends_lib-append  port:samba3

Modified: branches/pixilla-mysqls-55/dports/multimedia/mythtv-core.25/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/mythtv-core.25/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/mythtv-core.25/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -13,6 +13,7 @@
 github.setup        MythTV mythtv ${shorthash}
 name                mythtv-core${majorversion}
 version             0${majorversion}${minorversion}-Fixes-20121025
+revision            1
 categories          multimedia
 platforms           darwin
 license             GPL-2
@@ -108,7 +109,7 @@
 
 post-patch {
     set sedPath ${worksrcpath}/mythtv/
-    ui_info "Make Myth utils use MacPorts Perl"
+    ui_info "Make Myth utils use MacPorts Perl  <<<<"
     reinplace -locale C "s|#!/usr/bin/env perl|#!${perlbin}|" \
         ${sedPath}programs/scripts/internetcontent/topdocumentaryfilm.pl  \
         ${sedPath}programs/scripts/internetcontent/twit.tv.pl
@@ -125,13 +126,34 @@
         ${sedPath}programs/scripts/database/mythconverg_backup.pl \
         ${sedPath}programs/scripts/database/mythconverg_restore.pl
 
-    ui_info "Record Myth version strings"
+    ui_info "Record Myth version strings  <<<<"
     reinplace -locale C "s#\${SOURCE_VERSION}#${mythverstring}#g" ${sedPath}version.sh
     reinplace -locale C "s#\${BRANCH}#${mythbranch}#g" ${sedPath}version.sh
 
-    ui_info "Install Myth Python stuff to ${prefix}"
+    ui_info "Make Myth scripts use MacPorts Python  <<<<"
+    # Hack to install Python bindings in ${prefix}/Library/Frameworks/Python.framework/Versions/2.6
+    reinplace -locale C "s|\$(ROOT_FLAGS) \$(PREFIX_FLAGS)|\$(ROOT_FLAGS) \--prefix=\"${frameworks_dir}/Python.framework/Versions/2.6\"|" \
+        ${sedPath}/bindings/python/Makefile
     reinplace -locale C "s|/usr/local|${prefix}|" ${worksrcpath}/mythtv/bindings/python/MythTV/static.py
+    reinplace -locale C "s|#!python|#!${pythonbin}|" \
+        ${worksrcpath}/mythtv/bindings/python/scripts/mythpython \
+        ${worksrcpath}/mythtv/bindings/python/scripts/mythwikiscripts
+    fs-traverse f ${sedPath}/bindings/python/ {
+        if [string equal [ file extension ${f} ] ".py" ] {
+            reinplace -locale C "s|^#! */usr/bin/env python\$|#!${pythonbin}|" ${f}
+        }
+    }
+    fs-traverse f ${sedPath}/programs/scripts/ {
+        if [string equal [ file extension ${f} ] ".py" ] {
+            reinplace -locale C "s|^#! */usr/bin/env python\$|#!${pythonbin}|" ${f}
+        }
+    }
+    foreach f [glob -directory ${sedPath}/programs/scripts/hardwareprofile *.py] {
+    # fix even though they're currently non-functional on OS X
+        reinplace -locale C "s|^#!/usr/bin/python\$|#!${pythonbin}|" ${f}
+    }
 
+    ui_info "Customize other port files  <<<<"
     foreach {applescript} ${applescripts} {
         reinplace -locale C "s|@PREFIX@|${prefix}|g" ${worksrcpath}/macports/${applescript}.applescript
         reinplace -locale C "s|@APPLICATIONS_DIR@|${applications_dir}|" ${worksrcpath}/macports/${applescript}.applescript
@@ -320,10 +342,10 @@
 universal_variant           no
 
 post-activate {
-	# delete leftover file, if any
-	if [file exists /Library/LaunchDaemons/${plistfile}] {
-		file delete -force /Library/LaunchDaemons/${plistfile}
-	}
+    # delete leftover file, if any
+    if [file exists /Library/LaunchDaemons/${plistfile}] {
+        file delete -force /Library/LaunchDaemons/${plistfile}
+    }
     # The startupitem.install keyword does not exist in MacPorts < 2.1.
     if {![info exists startupitem.install]} {
         set startupitem.install yes

Modified: branches/pixilla-mysqls-55/dports/multimedia/vcdimager/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/vcdimager/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/vcdimager/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                vcdimager
 version             0.7.24
-revision            1
+revision            2
 categories          multimedia
 # lib/sector.c is GPL-2 only, the rest is GPL-2+
 license             GPL-2

Modified: branches/pixilla-mysqls-55/dports/multimedia/xine-lib/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/multimedia/xine-lib/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/multimedia/xine-lib/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 
 name		xine-lib
 version         1.2.2
-revision        1
+revision        2
 description	xine-lib is a free multimedia engine, released under the GPL.
 long_description        ${description}
 maintainers	ryandesign openmaintainer

Modified: branches/pixilla-mysqls-55/dports/net/curl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/curl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/curl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 
 name                        curl
 # keep the version in sync with the curl-ca-bundle port
-version                     7.28.0
+version                     7.28.1
 categories                  net www
 maintainers                 ryandesign
 license                     curl
@@ -28,8 +28,8 @@
                             ftp://ftp.sunet.se/pub/www/utilities/curl/ \
                             http://www.execve.net/curl/
 
-checksums                   rmd160  99ddd50b8d0b1f94833752b58b505ce3159f5dde \
-                            sha256  b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b
+checksums                   rmd160  d4a0cb79756607c3b573970648d639744f15fc65 \
+                            sha256  e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367
 
 patchfiles                  patch-curl.h.diff
 

Modified: branches/pixilla-mysqls-55/dports/net/curl-ca-bundle/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/curl-ca-bundle/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/curl-ca-bundle/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,8 +5,7 @@
 
 name                    curl-ca-bundle
 # keep the version in sync with the curl port
-version                 7.28.0
-revision                1
+version                 7.28.1
 set curl_name           curl
 categories              net
 license                 {MPL-2 LGPL-2.1+}
@@ -62,8 +61,8 @@
     ${certdata_distfile}:certdata
 
 checksums                   ${curl_source} \
-                            rmd160  99ddd50b8d0b1f94833752b58b505ce3159f5dde \
-                            sha256  b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b \
+                            rmd160  d4a0cb79756607c3b573970648d639744f15fc65 \
+                            sha256  e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367 \
                             ${certdata_distfile} \
                             rmd160  5a08a6b50e3d50d3937063c19f783cb0e6ab0ab4 \
                             sha256  8bfeafa81666dfc630e61acdb61f019070b53af44270d7ddd33b873733dff633

Modified: branches/pixilla-mysqls-55/dports/net/esniper/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/esniper/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/esniper/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -9,7 +9,7 @@
 license             BSD
 platforms           darwin
 maintainers         g5pw openmaintainer
-description	    esniper is a simple, lightweight tool for sniping ebay auctions.
+description         esniper is a simple, lightweight tool for sniping ebay auctions.
 long_description    ${description}
 
 homepage            http://esniper.sourceforge.net/

Modified: branches/pixilla-mysqls-55/dports/net/libquvi-scripts/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/libquvi-scripts/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/libquvi-scripts/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                libquvi-scripts
-version             0.4.9
+version             0.4.10
 categories          net www
 license             GPL-3
 maintainers         openmaintainer snc
@@ -22,8 +22,8 @@
 master_sites        sourceforge:quvi
 use_xz              yes
 
-checksums           rmd160  0412217834fb1447cbf851f9d74a8b26a1ab82ef \
-                    sha256  e04023639c44fc77ab7797ea09ddffb939681c1ab14096173c5c683bfadc6b28
+checksums           rmd160  5748af940c565864c506bd2b8012eade961a4a85 \
+                    sha256  1cc011ee866b4fd0c4c4747656ef6725f21c99ddc5035adbc7adfb4a231ac516
 
 configure.cppflags  -I${worksrcpath}/include -I${prefix}/include
 

Modified: branches/pixilla-mysqls-55/dports/net/libtorrent-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/libtorrent-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/libtorrent-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 name                libtorrent-devel
 conflicts           libtorrent
 set real_name       libtorrent
-version             0.13.2
+version             0.13.3
 categories          net
 platforms           darwin
 maintainers         gmail.com:gardnermj
@@ -24,8 +24,8 @@
 dist_subdir         ${real_name}
 distname            ${real_name}-${version}
 
-checksums           rmd160  090e6af9b4318a6176064159f6a8f70ab708c7fe \
-                    sha256  ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f
+checksums           rmd160  f6661b5f56918214788e79b5fa94f579ac8e441d \
+                    sha256  34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677
 
 depends_build       port:pkgconfig
 

Modified: branches/pixilla-mysqls-55/dports/net/minidlna/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/minidlna/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/minidlna/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                minidlna
-version             1.0.22_20111216
-revision            2
+version             1.1.0_20121106
 categories          net multimedia
 platforms           darwin
 maintainers         gmail.com:ranauei
@@ -20,8 +19,8 @@
 master_sites        https://github.com/downloads/ranauei/melabot/
 worksrcdir          ${name}
 
-checksums           sha256 05273f6711e83ff124fec6d1b74e54a47887484b003f24feefb1abca9a5c2182 \
-                    rmd160 a057bcc61f0027ae261fef9b9a2493be97c98ed3
+checksums           rmd160  73bc4d692786e65772c583abaa66f0446820d5ab \
+                    sha256  d94ce554d198d77f1c8d42db2b7a1b1fa4d3b5d0e7c6fae099cde97f2c8b9c10
 
 depends_lib         path:lib/libavcodec.dylib:ffmpeg \
                     port:flac \

Modified: branches/pixilla-mysqls-55/dports/net/munin/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/munin/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/munin/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                munin
-version             1.4.5
+version             1.4.7
 categories          net
 maintainers         alpha
 platforms           darwin
@@ -24,10 +24,11 @@
                     server variant.
 
 homepage            http://munin-monitoring.org/
-master_sites        sourceforge
-checksums           md5     4ae84b9a27b686c3819d8d7b51d8cb4c \
-                    sha1    bd1e8ad1fe1cfade1de9c28f3ad69bf35ca495ca \
-                    rmd160  883aa4baacfa5be1ec6a83737d5d241c40ad6912
+master_sites        sourceforge:project/munin/munin%20stable/${version}
+
+checksums           rmd160  b25c0a4d7d7613592757132290b7158228ea2a67 \
+                    sha256  9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
+
 depends_lib         port:perl5.12 port:p5.12-net-server \
                     path:bin/config_data:p5.12-module-build \
                     port:p5.12-net-snmp port:p5.12-net-ssleay

Modified: branches/pixilla-mysqls-55/dports/net/munin/files/patch-munin-node.conf.in
===================================================================
--- branches/pixilla-mysqls-55/dports/net/munin/files/patch-munin-node.conf.in	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/munin/files/patch-munin-node.conf.in	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,12 +1,11 @@
-diff -r 0e0f9e28d8e6 node/munin-node.conf.in
---- node/munin-node.conf.in	Sat Mar 07 22:18:01 2009 +0100
-+++ node/munin-node.conf.in	Sun Mar 08 00:20:57 2009 +0100
+--- node/munin-node.conf.in.orig	2012-03-14 10:18:05.000000000 -0500
++++ node/munin-node.conf.in	2012-11-18 01:03:12.000000000 -0600
 @@ -10,7 +10,7 @@
- setseid 1
+ setsid 1
  
  user root
 -group root
 +group wheel
  
- 
  # Regexps for files to ignore
+ 

Modified: branches/pixilla-mysqls-55/dports/net/nmap/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/nmap/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/nmap/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		nmap
-version		6.01
+version		6.25
 categories	net
 maintainers	darkart.com:opendarwin.org geeklair.net:dluke
 description	Port scanning utility for large networks
@@ -26,10 +26,10 @@
 master_sites	http://download.insecure.org/nmap/dist/ \
 		ftp://nuxi.ucdavis.edu/pub/misc/
 
-checksums	md5	a1a71940f238abb835dbf3ee7412bcea \
-		sha1	e397e453893930d14e9bb33a847d15b94b7ee83a \
-		rmd160	1b6f2b0e4f019d9cd069db14990364c45d463c7d \
-		sha256	77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a
+checksums	md5	fcc80f94ff3adcb11eedf91092ea6f5e \
+		sha1	769943a1a5c10f67bf9738e26da42b3312db752f \
+		rmd160	8267788be9e98f3219eff9fee8b5efcfa5e5e932 \
+		sha256	3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5
 
 depends_lib	port:libpcap \
 		port:openssl \


Property changes on: branches/pixilla-mysqls-55/dports/net/rtorrent-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/net/rtorrent:64040
   + /trunk/dports/net/rtorrent:64040
/trunk/dports/net/rtorrent-devel:99672-100173

Modified: branches/pixilla-mysqls-55/dports/net/rtorrent-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/rtorrent-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/rtorrent-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 name                rtorrent-devel
 conflicts           rtorrent
 set real_name       rtorrent
-version             0.9.2
+version             0.9.3
 categories          net
 platforms           darwin
 maintainers         gmail.com:gardnermj
@@ -25,8 +25,8 @@
 dist_subdir         ${real_name}
 distname            ${real_name}-${version}
 
-checksums           rmd160  130a4c7f3bd018f7247d4561170d6878ab7a120f \
-                    sha256  5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d
+checksums           rmd160  b03107458440f8ece632d21d1352a18929717862 \
+                    sha256  9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310
 
 depends_build       port:pkgconfig
 

Modified: branches/pixilla-mysqls-55/dports/net/squid3/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/squid3/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/squid3/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -39,6 +39,11 @@
                 patch-compat_types.h.diff \
                 patch-basic_pam_auth.cc.diff
 
+platform darwin 10 {
+    # ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool
+    patchfiles-append snowleopard-bool.diff
+}
+
 depends_lib     port:zlib
 
 conflicts       squid squid3-devel

Copied: branches/pixilla-mysqls-55/dports/net/squid3/files/snowleopard-bool.diff (from rev 100173, trunk/dports/net/squid3/files/snowleopard-bool.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/net/squid3/files/snowleopard-bool.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/net/squid3/files/snowleopard-bool.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- helpers/basic_auth/NIS/nis_support.cc.orig	2012-10-20 23:39:49.000000000 +1100
++++ helpers/basic_auth/NIS/nis_support.cc	2012-11-24 07:23:14.000000000 +1100
+@@ -9,7 +9,7 @@
+ #include <sys/types.h>
+ #include <rpc/rpc.h>
+ 
+-#if _SQUID_FREEBSD_  && !defined(BOOL_DEFINED)
++#ifndef BOOL_DEFINED
+ // BUG: FreeBSD rpcsvc/yp_* headers try to redefine bool unless we match their non-standard hack.
+ #define BOOL_DEFINED
+ #endif

Modified: branches/pixilla-mysqls-55/dports/net/unison/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/unison/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/unison/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem        1.0
 
 name              unison
-version           2.40.65
+version           2.40.102
 categories        net
 maintainers       nomaintainer
 license           GPL-3
@@ -18,40 +18,43 @@
 homepage          http://www.cis.upenn.edu/~bcpierce/unison/
 master_sites      ${homepage}download/releases/${name}-${version}/
 platforms         darwin openbsd
-checksums         rmd160 29a3525f3904a5b55ff0ffd6544bc3fa90324076 \
-                  sha256 2c75e4e6ee1d48caf305e934b68ea960cae41d90c4fe2e8f09e0287ad753d810
+checksums         rmd160 0231fd41895bde97ad4ae15bdc4994f9c9e27ad6 \
+                  sha256 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854
 
-patchfiles          patch-Makefile \
-                    patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff
+patchfiles          patch-Makefile.diff
 
-use_configure	no
+use_configure   no
 
-build.args		UISTYLE=text NATIVE=true THREADS=true
-depends_build	bin:camlp4:ocaml
+build.args      UISTYLE=text NATIVE=true THREADS=true
+depends_build   bin:camlp4:ocaml
 
-destroot.args	PREFIX=${prefix} UISTYLE=text NATIVE=true THREADS=true
+destroot.args   PREFIX=${prefix} UISTYLE=text NATIVE=true THREADS=true
 
-variant x11 {
-	depends_lib-append		port:lablgtk2
+variant x11 conflicts aqua {
+    patchfiles-append       patch-Makefile.OCaml.diff
 
-	build.args-delete		UISTYLE=text
-	build.args-append		UISTYLE=gtk2
+    depends_lib-append      port:lablgtk2
 
-	destroot.args-delete	UISTYLE=text
-	destroot.args-append	UISTYLE=gtk2
+    build.args-delete       UISTYLE=text
+    build.args-append       UISTYLE=gtk2
+
+    destroot.args-delete    UISTYLE=text
+    destroot.args-append    UISTYLE=gtk2
 }
 
-variant aqua description {Build Aqua front-end} {
-	build.args-delete		UISTYLE=text
-	build.args-append		UISTYLE=macnew
-	destroot {
-		xinstall -d -m 0755 ${destroot}${applications_dir}
-		system "cd ${worksrcpath}/uimacnew/build && mv Default/* . || true"
-		file copy ${worksrcpath}/uimacnew/build/Unison.app \
-			${destroot}${applications_dir}
-	}
+variant aqua description {Build Aqua front-end} conflicts x11 {
+    patchfiles-append       patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff
+
+    build.args-delete       UISTYLE=text
+    build.args-append       UISTYLE=macnew
+    destroot {
+        xinstall -d -m 0755 ${destroot}${applications_dir}
+        system "cd ${worksrcpath}/uimacnew/build && mv Default/* . || true"
+        file copy ${worksrcpath}/uimacnew/build/Unison.app \
+            ${destroot}${applications_dir}
+    }
 }
 
 livecheck.type      regex
-livecheck.url       ${master_sites}
+livecheck.url       ${homepage}download/releases/stable/
 livecheck.regex     {unison-(\d+(?:\.\d+)*)}

Deleted: branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,22 +0,0 @@
---- Makefile.orig	2011-04-16 22:35:38.000000000 +0200
-+++ Makefile	2011-04-26 17:53:52.000000000 +0200
-@@ -80,7 +80,7 @@
- ######################################################################
- # Installation
- 
--INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = $(DESTDIR)$(PREFIX)/bin/
- 
- # This has two names because on OSX the file INSTALL shadows the target 'install'!
- install: doinstall
-@@ -92,9 +92,8 @@
- 	$(MAKE) -C .. text
- 
- doinstall: $(NAME)$(EXEC_EXT)
--	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
--	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
- 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
-+	cd $(INSTALLDIR) && ln -s $(NAME)-$(MAJORVERSION)$(EXEC_EXT) $(NAME)
- 
- 
- ######################################################################

Copied: branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.OCaml.diff (from rev 100173, trunk/dports/net/unison/files/patch-Makefile.OCaml.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.OCaml.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.OCaml.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- Makefile.OCaml.orig	2011-04-16 22:35:38.000000000 +0200
++++ Makefile.OCaml	2012-09-26 17:51:36.000000000 +0200
+@@ -292,7 +292,7 @@
+ 
+ # Gtk2 GUI
+ ifeq ($(UISTYLE), gtk2)
+-  CAMLFLAGS+=-I +lablgtk2
++  CAMLFLAGS+=-I +site-lib/lablgtk2
+   OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
+   OCAMLLIBS+=lablgtk.cma
+ endif

Copied: branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.diff (from rev 100173, trunk/dports/net/unison/files/patch-Makefile.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/net/unison/files/patch-Makefile.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,22 @@
+--- Makefile.orig	2011-04-16 22:35:38.000000000 +0200
++++ Makefile	2011-04-26 17:53:52.000000000 +0200
+@@ -80,7 +80,7 @@
+ ######################################################################
+ # Installation
+ 
+-INSTALLDIR = $(HOME)/bin/
++INSTALLDIR = $(DESTDIR)$(PREFIX)/bin/
+ 
+ # This has two names because on OSX the file INSTALL shadows the target 'install'!
+ install: doinstall
+@@ -92,9 +92,8 @@
+ 	$(MAKE) -C .. text
+ 
+ doinstall: $(NAME)$(EXEC_EXT)
+-	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
+-	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
+ 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
++	cd $(INSTALLDIR) && ln -s $(NAME)-$(MAJORVERSION)$(EXEC_EXT) $(NAME)
+ 
+ 
+ ######################################################################

Modified: branches/pixilla-mysqls-55/dports/net/youtube-dl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/net/youtube-dl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/net/youtube-dl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        rg3 youtube-dl 2012.10.09
+github.setup        rg3 youtube-dl 2012.11.29
 categories          net
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -17,8 +17,8 @@
 
 homepage            http://rg3.github.com/youtube-dl/
 
-checksums           rmd160  6e85c2a178ecdf78db0861b3d92e7226efa529c2 \
-                    sha256  c32dea0e97ab3e388d27ec1f035d83c4f98d82e4c8bac61f367fa9e6e9797acc
+checksums           rmd160  6875d90e70114b784e2e9f42ea11a91106d8675f \
+                    sha256  f69b502e25c66b3510ad51d0646780744d4d630732f42befa1d1841afbfff570
 
 depends_build       bin:zip:zip
 

Modified: branches/pixilla-mysqls-55/dports/perl/p5-astro-satpass/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-astro-satpass/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-astro-satpass/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           perl5 1.0
 
 perl5.branches      5.8 5.10 5.12 5.14 5.16
-perl5.setup         Astro-satpass 0.054
+perl5.setup         Astro-satpass 0.055
 maintainers         pixilla openmaintainer
 platforms           darwin
 license             {Artistic-1 GPL}
@@ -16,7 +16,7 @@
                     satellite visibility, and a demonstration application \
                     (satpass) that makes use of these classes.
 
-checksums           rmd160  6a4363c06b006e3dbed04d9a5bce0ffe7f7f7c4c \
-                    sha256  73a44aa87cdb5e7762f88bfbacf70acaa60a30a351f7cf9850b4d6c6a2bd30f4
+checksums           rmd160  9c6844104485ea3ca121ccccfcd1abf3649fe19d \
+                    sha256  05f322e5e73f6f68423ddf4545a3fc1483e9c1bdcedc2bbda5bed9f90d9c693d
 
 supported_archs     noarch

Modified: branches/pixilla-mysqls-55/dports/perl/p5-file-listing/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-file-listing/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-file-listing/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -28,10 +28,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-html-form/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-html-form/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-html-form/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -30,10 +30,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-http-cookies/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-http-cookies/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-http-cookies/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -28,10 +28,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-http-daemon/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-http-daemon/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-http-daemon/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -29,10 +29,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-http-date/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-http-date/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-http-date/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -27,10 +27,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-http-lite/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-http-lite/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-http-lite/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,9 +4,8 @@
 PortSystem              1.0
 PortGroup               perl5 1.0
 
-perl5.branches      5.8 5.10 5.12 5.14 5.16
-perl5.setup             HTTP-Lite 2.3
-revision                3
+perl5.branches          5.8 5.10 5.12 5.14 5.16
+perl5.setup             HTTP-Lite 2.4
 categories-append       www
 platforms               darwin
 maintainers             l2g
@@ -17,5 +16,5 @@
 
 long_description        ${description}
 
-checksums               sha1    e10038c28f600e1b662e9a1f96ac0b0d8d81273e \
-                        rmd160  94774e4a2a5295817604371bc66bbe5b58e4afa8
+checksums               rmd160  1af723efcac51ef48bf201b6a1e457c04f9f05c7 \
+                        sha256  66f4fc0f93eeb42c09737f83b21de1944212ae9b2acb784d5103e8208491477b

Modified: branches/pixilla-mysqls-55/dports/perl/p5-http-message/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-http-message/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-http-message/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -34,10 +34,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-http-negotiate/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-http-negotiate/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-http-negotiate/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -27,10 +27,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-http-recorder/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-http-recorder/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-http-recorder/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,15 +3,17 @@
 PortSystem           1.0
 PortGroup            perl5 1.0
 
-perl5.branches      5.8 5.10 5.12 5.14 5.16
-perl5.setup          HTTP-Recorder 0.05
-revision             3
+perl5.branches       5.8 5.10 5.12 5.14 5.16
+perl5.setup          HTTP-Recorder 0.06
 maintainers          email.arc.nasa.gov:sal
 description          Record interaction with websites
 long_description     This is a browser-independent recorder for recording \
                      interactions with web sites.
 platforms            darwin
-checksums            md5 a2c167d06509620921e4d417ce9354a7
+
+checksums            rmd160  d746be584a9fa8e2a1fb159c400bcf8c8cb8ee85 \
+                     sha256  c5fe788d7a9d1e24398e89d7f5cbcd9c467ad7a34b33dd585a48ea2ab79c623b
+
 if {${perl5.major} != ""} {
 depends_lib-append   port:p${perl5.major}-libwww-perl \
                      port:p${perl5.major}-html-parser \

Modified: branches/pixilla-mysqls-55/dports/perl/p5-image-exiftool/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-image-exiftool/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-image-exiftool/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortGroup           perl5 1.0
 
 perl5.branches      5.8 5.10 5.12 5.14 5.16
-perl5.setup         Image-ExifTool 8.93
-revision        1
+perl5.setup         Image-ExifTool 9.06
 license             {Artistic-1 GPL}
 maintainers         nomaintainer
 description         Perl interface to EXIF metadata
@@ -13,8 +12,8 @@
 
 platforms           darwin
 
-checksums           rmd160  ff1a70c778917da77bc9967d5e3755dace75d7e1 \
-                    sha256  f19abfec1f64b46e47e529181eb713a13020e2c4ec5267960adaa33b21217863
+checksums           rmd160  e58eb820516d4a882f1d6e20bf9d3896e71faead \
+                    sha256  2a8c8b816f86935c06768f44655056c9d03300b8179fa9157ebe6686ca4c6b4f
 
 homepage            http://www.sno.phy.queensu.ca/~phil/exiftool/
 master_sites        ${homepage}

Modified: branches/pixilla-mysqls-55/dports/perl/p5-lwp-mediatypes/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-lwp-mediatypes/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-lwp-mediatypes/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -24,10 +24,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-http10/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-http10/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-http10/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -28,10 +28,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-https/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-https/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-lwp-protocol-https/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -35,10 +35,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-net-http/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-net-http/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-net-http/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -25,10 +25,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/perl/p5-sgmlspm/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-sgmlspm/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-sgmlspm/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -9,6 +9,8 @@
 platforms           darwin
 license             GPL-2+
 maintainers         fourpalms.org:lockhart openmaintainer
+supported_archs     noarch
+
 description         Convert SGML, HTML, or XML documents into new formats.
 long_description    Perl programs can use the SGMLSpm module to help convert \
                     SGML, HTML or XML documents into new formats.

Modified: branches/pixilla-mysqls-55/dports/perl/p5-text-csv_xs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-text-csv_xs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-text-csv_xs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           perl5 1.0
 
 perl5.branches      5.8 5.10 5.12 5.14 5.16
-perl5.setup         Text-CSV_XS 0.92
+perl5.setup         Text-CSV_XS 0.93
 maintainers         hum oaf.dk:mni openmaintainer
 
 description         Perl module containing comma-separated values manipulation routines
@@ -17,9 +17,9 @@
 platforms           darwin
 license             {Artistic-1 GPL}
 
+checksums           rmd160  db145a600b1272cb2c4a9f9207f9e553e9b0166b \
+                    sha256  d39056eb4edf78162873d8a6e4f76174218dbb6e34743e3465c3ef4b09ffcb7f
 extract.suffix      .tgz
-checksums           rmd160  a69812c1ac4be23036f173f8993f07e2d40df5fe \
-                    sha256  dd886bf22be41e3f1856ba70b50f2f79d3568e846739b03c13b7de2425fd3317
 
 if {${perl5.major} != ""} {
     livecheck.type      none

Modified: branches/pixilla-mysqls-55/dports/perl/p5-www-robotrules/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/perl/p5-www-robotrules/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/perl/p5-www-robotrules/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -28,10 +28,6 @@
       && ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
       && [vercmp [lindex $vers 1] 6.0] < 0} {
         ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
+        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/php/php-eaccelerator/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php-eaccelerator/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php-eaccelerator/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 
 github.setup        eaccelerator eaccelerator 0.9.6.1
 name                php-eaccelerator
-revision            5
+revision            6
 categories          php www devel
 platforms           darwin freebsd openbsd
 maintainers         ryandesign openmaintainer

Modified: branches/pixilla-mysqls-55/dports/php/php-magickwand/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php-magickwand/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php-magickwand/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,13 +6,13 @@
 
 name                php-magickwand
 version             1.0.9
-revision            1
+revision            3
 categories-append   graphics
 platforms           darwin
 maintainers         ryandesign openmaintainer
 license             ImageMagick
 
-php.branches        5.3 5.4
+php.branches        5.3 5.4 5.5
 
 description         MagickWand for PHP
 
@@ -25,12 +25,21 @@
 distname            MagickWandForPHP-${version}
 use_bzip2           yes
 
-checksums           rmd160  4d2d97b1ed973c0651e21f770efae5d757771506 \
-                    sha256  1d4dd658ba2d22262dc89cfa168741670ae8b4aab063ba17dffecac945548897
+# 1.0.9 was stealth-updated 2012-10-25
+dist_subdir         ${dist_subdir}/${version}_1
 
+checksums           rmd160  5c9c2d9f33a954dc7b2aad6ce4038cc968d30bb0 \
+                    sha256  7a812d918e045471cd0e62b0365987e86d8688804447889f30931231e9ae702f
+
 if {${name} != ${subport}} {
     depends_lib-append  port:ImageMagick
     
+    patchfiles          patch-magickwand.h.diff
+    
+    post-patch {
+        reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/magickwand.h
+    }
+    
     configure.args      --with-magickwand=${prefix}
 }
 

Modified: branches/pixilla-mysqls-55/dports/php/php-mongo/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php-mongo/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php-mongo/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,13 +4,13 @@
 PortGroup       php 1.1
 
 name            php-mongo
-version         1.2.12
+version         1.3.0
 categories      php databases devel
 license         Apache-2
 platforms       darwin
 maintainers     ryandesign openmaintainer
 
-php.branches    5.4 5.3
+php.branches    5.3 5.4 5.5
 php.pecl        yes
 
 description     Mongo Database Driver
@@ -19,8 +19,8 @@
     This package provides an interface for communicating with the Mongo \
     database in PHP.
 
-checksums       rmd160  343b8f825886b93e886482fd4f8d6551ac772263 \
-                sha256  bf3c3fd0e8e4a37bf476535361ce881ca6287a26390731961b20b2789f011c54
+checksums       rmd160  e3f101fc3a02d5f8c7c6df7dd90c2fac4b76e161 \
+                sha256  66950e3c75a5215601783068c37ba566022a23e560f180f960be15b5529e5a75
 
 if {${name} != ${subport}} {
     depends_build-append    port:mongodb

Modified: branches/pixilla-mysqls-55/dports/php/php-svm/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php-svm/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php-svm/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,13 +5,13 @@
 PortGroup               php 1.1
 
 name                    php-svm
-version                 0.1.8
+version                 0.1.9
 categories-append       math
 platforms               darwin
 maintainers             ryandesign openmaintainer
 license                 BSD
 
-php.branches            5.3 5.4
+php.branches            5.3 5.4 5.5
 php.pecl                yes
 php.pecl.prerelease     yes
 
@@ -19,9 +19,11 @@
 
 long_description        ${description}
 
-checksums               rmd160  68816f28ccf3b1522a2636f11271c5cae5bff241 \
-                        sha256  f999b1451ea86ce136a683a2679867818bd285b3d2c701e8e6bdda3da23fe014
+checksums               rmd160  174f667f56c051bf29f3e36766d92b68012b976b \
+                        sha256  28c0eda03b47fb79a7a584143e8fb539fd796aacbcb11dc8dcc7b66d42cd007f
 
+test.run                yes
+
 if {${name} != ${subport}} {
     depends_lib-append      port:libsvm
     

Modified: branches/pixilla-mysqls-55/dports/php/php-timezonedb/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php-timezonedb/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php-timezonedb/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           php 1.1
 
 name                php-timezonedb
-version             2012.8
+version             2012.9
 categories          php devel
 platforms           darwin
 maintainers         miwi
@@ -18,8 +18,8 @@
 long_description    Timezone Database to be used with PHP's date and time \
                     functions.
 
-checksums           rmd160  2c30f5cf08acce64cb3c33b519082dafc6b6f76d \
-                    sha256  06fe75fe818177c196eb5c1a45bf49b9b81518ae656c2e7483b0a8c61c65ed0c
+checksums           rmd160  cb6c8201bf301d00999f8ff16b47f426be418b99 \
+                    sha256  86050cf0aa5b12f236f2be85fcfdcdd8adf54df281f22f160f1999dbdf79e612
 
 configure.args-append --enable-timezonedb
 

Modified: branches/pixilla-mysqls-55/dports/php/php-yaz/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php-yaz/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php-yaz/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup               php 1.1
 
 name                    php-yaz
-version                 1.1.4
+version                 1.1.5
 categories-append       net databases devel
 platforms               darwin
 maintainers             ryandesign openmaintainer
@@ -19,8 +19,8 @@
 long_description        This extension implements a Z39.50 client \
                         for PHP using the YAZ toolkit.
 
-checksums               rmd160  3d75cc120f989cbe8b47377f0c728535ff8a416c \
-                        sha256  8ebd0657db16d59f1abe55001439fd338e1282dffec868ac26a4eeb30b0bfc70
+checksums               rmd160  10d952a60f5ea35e48ac954c17610284f9b0daf0 \
+                        sha256  d97e77b59aa86a8e5ea6d0da1ba9cc1750a13bfe65bb08d8f2c213b98f1087cc
 
 if {${name} != ${subport}} {
     depends_lib-append  port:re2c port:yaz

Modified: branches/pixilla-mysqls-55/dports/php/php5-calendar/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-calendar/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-calendar/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     calendar 5.3.17 bundled
+php5extension.setup     calendar 5.3.19 bundled
 categories-append       devel
 platforms               darwin
 maintainers             ryandesign
@@ -15,7 +15,7 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes

Modified: branches/pixilla-mysqls-55/dports/php/php5-curl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-curl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-curl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     curl 5.3.17 bundled
+php5extension.setup     curl 5.3.19 bundled
 categories-append       net www
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:curl
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-dba/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-dba/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-dba/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     dba 5.3.17 bundled
+php5extension.setup     dba 5.3.19 bundled
 categories-append       databases
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-eaccelerator/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-eaccelerator/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-eaccelerator/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 epoch             1
 github.setup      eaccelerator eaccelerator 0.9.6.1
 php5extension.setup eaccelerator ${version}
-revision          8
+revision          9
 categories        php www devel
 platforms         darwin freebsd openbsd
 maintainers       ryandesign openmaintainer

Modified: branches/pixilla-mysqls-55/dports/php/php5-enchant/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-enchant/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-enchant/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 PortGroup       php5extension 1.0
 
-php5extension.setup enchant 5.3.17 bundled
+php5extension.setup enchant 5.3.19 bundled
 license         PHP
 categories      php textproc devel
 platforms       darwin
@@ -15,8 +15,8 @@
     Enchant is a binder for libenchant. Libenchant provides a common API for \
     many spell libraries.
 
-checksums       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append \
     port:enchant

Modified: branches/pixilla-mysqls-55/dports/php/php5-exif/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-exif/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-exif/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     exif 5.3.17 bundled
+php5extension.setup     exif 5.3.19 bundled
 categories-append       graphics
 platforms               darwin
 maintainers             ryandesign
@@ -14,7 +14,7 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes

Modified: branches/pixilla-mysqls-55/dports/php/php5-ftp/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-ftp/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-ftp/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     ftp 5.3.17 bundled
+php5extension.setup     ftp 5.3.19 bundled
 categories-append       net
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:openssl
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-gd/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-gd/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-gd/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     gd 5.3.17 bundled
-revision                1
+php5extension.setup     gd 5.3.19 bundled
 categories-append       graphics
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +14,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:freetype \
                         port:jpeg \

Modified: branches/pixilla-mysqls-55/dports/php/php5-gettext/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-gettext/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-gettext/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     gettext 5.3.17 bundled
+php5extension.setup     gettext 5.3.19 bundled
 categories-append       devel
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:gettext
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-gmp/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-gmp/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-gmp/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     gmp 5.3.17 bundled
+php5extension.setup     gmp 5.3.19 bundled
 categories-append       devel math
 platforms               darwin
 maintainers             ryandesign
@@ -16,8 +16,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:gmp
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-iconv/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-iconv/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-iconv/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     iconv 5.3.17 bundled
+php5extension.setup     iconv 5.3.19 bundled
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:libiconv
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-imap/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-imap/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-imap/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     imap 5.3.17 bundled
+php5extension.setup     imap 5.3.19 bundled
 categories-append       mail
 platforms               darwin
 maintainers             ryandesign
@@ -14,8 +14,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_build-append    port:cclient
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-intl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-intl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-intl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 PortGroup       php5extension 1.0
 
-php5extension.setup intl 5.3.17 bundled
-revision        1
+php5extension.setup intl 5.3.19 bundled
 categories      php devel
 platforms       darwin
 maintainers     ryandesign
@@ -16,8 +15,8 @@
 long_description \
     Internationalization extension implements ICU library functionality in PHP.
 
-checksums       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append  port:icu
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-ldap/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-ldap/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-ldap/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     ldap 5.3.17 bundled
+php5extension.setup     ldap 5.3.19 bundled
 categories-append       databases
 platforms               darwin
 maintainers             ryandesign
@@ -16,8 +16,8 @@
                         Access Protocol, which is used to access Directory \
                         Servers.
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:openldap \
                         port:cyrus-sasl2

Modified: branches/pixilla-mysqls-55/dports/php/php5-magickwand/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-magickwand/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-magickwand/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 PortGroup           php5extension 1.0
 
 php5extension.setup magickwand 1.0.9
+revision            2
 categories-append   graphics
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -21,11 +22,20 @@
 distname            MagickWandForPHP-${version}
 use_bzip2           yes
 
-checksums           rmd160  4d2d97b1ed973c0651e21f770efae5d757771506 \
-                    sha256  1d4dd658ba2d22262dc89cfa168741670ae8b4aab063ba17dffecac945548897
+# 1.0.9 was stealth-updated 2012-10-25
+dist_subdir         ${dist_subdir}/${version}_1
 
+checksums           rmd160  5c9c2d9f33a954dc7b2aad6ce4038cc968d30bb0 \
+                    sha256  7a812d918e045471cd0e62b0365987e86d8688804447889f30931231e9ae702f
+
 depends_lib-append  port:ImageMagick
 
+patchfiles          patch-magickwand.h.diff
+
+post-patch {
+    reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/magickwand.h
+}
+
 configure.args      --with-magickwand=${prefix}
 
 livecheck.type      regex

Modified: branches/pixilla-mysqls-55/dports/php/php5-mbstring/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-mbstring/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-mbstring/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     mbstring 5.3.17 bundled
+php5extension.setup     mbstring 5.3.19 bundled
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign
@@ -15,7 +15,7 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes

Modified: branches/pixilla-mysqls-55/dports/php/php5-mcrypt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-mcrypt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-mcrypt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     mcrypt 5.3.17 bundled
+php5extension.setup     mcrypt 5.3.19 bundled
 categories-append       security
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:libmcrypt \
                         port:libtool

Modified: branches/pixilla-mysqls-55/dports/php/php5-mongo/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-mongo/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-mongo/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,3 +1,4 @@
+# -*- 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
@@ -3,5 +4,5 @@
 PortGroup       php5extension 1.0
 
-php5extension.setup mongo 1.2.12 pecl
+php5extension.setup mongo 1.3.0 pecl
 categories      php databases devel
 license         Apache-2
@@ -15,8 +16,8 @@
     This package provides an interface for communicating with the Mongo \
     database in PHP.
 
-checksums       rmd160  343b8f825886b93e886482fd4f8d6551ac772263 \
-                sha256  bf3c3fd0e8e4a37bf476535361ce881ca6287a26390731961b20b2789f011c54
+checksums       rmd160  e3f101fc3a02d5f8c7c6df7dd90c2fac4b76e161 \
+                sha256  66950e3c75a5215601783068c37ba566022a23e560f180f960be15b5529e5a75
 
 patchfiles-append \
     patch-config.m4.diff

Modified: branches/pixilla-mysqls-55/dports/php/php5-mssql/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-mssql/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-mssql/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             {mssql pdo_dblib} 5.3.17 bundled
+php5extension.setup             {mssql pdo_dblib} 5.3.19 bundled
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -15,8 +15,8 @@
 
 long_description                ${description}
 
-checksums                       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums                       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append              port:freetds
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-mysql/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-mysql/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-mysql/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup                       php5extension 1.0
 PortGroup                       archcheck 1.0
 
-php5extension.setup             {mysql mysqli pdo_mysql} 5.3.17 bundled
+php5extension.setup             {mysql mysqli pdo_mysql} 5.3.19 bundled
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -16,8 +16,8 @@
 
 long_description                ${description}
 
-checksums                       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums                       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append              port:zlib
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-odbc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-odbc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-odbc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             {odbc pdo_odbc} 5.3.17 bundled
+php5extension.setup             {odbc pdo_odbc} 5.3.19 bundled
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -15,8 +15,8 @@
 
 long_description                ${description}
 
-checksums                       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums                       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build              yes
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-openssl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-openssl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-openssl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     openssl 5.3.17 bundled
+php5extension.setup     openssl 5.3.19 bundled
 categories-append       devel security
 platforms               darwin
 maintainers             ryandesign
@@ -16,8 +16,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:openssl
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-oracle/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-oracle/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-oracle/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             oracle 5.3.17 bundled
-revision                        1
+php5extension.setup             oracle 5.3.19 bundled
 php5extension.ini               oracle.ini
 php5extension.extensions        oci8 pdo_oci
 categories-append               databases
@@ -18,8 +17,8 @@
 
 long_description                ${description}
 
-checksums                       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums                       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append              port:oracle-instantclient
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-pcntl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-pcntl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-pcntl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     pcntl 5.3.17 bundled
+php5extension.setup     pcntl 5.3.19 bundled
 categories-append       sysutils
 platforms               darwin
 maintainers             ryandesign
@@ -16,8 +16,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-posix/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-posix/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-posix/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     posix 5.3.17 bundled
+php5extension.setup     posix 5.3.19 bundled
 categories-append       sysutils
 platforms               darwin
 maintainers             ryandesign
@@ -16,7 +16,7 @@
                         IEEE 1003.1 (POSIX.1) standards document which are \
                         not accessible through other means
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes

Modified: branches/pixilla-mysqls-55/dports/php/php5-postgresql/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-postgresql/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-postgresql/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup                       php5extension 1.0
 PortGroup                       archcheck 1.0
 
-php5extension.setup             postgresql 5.3.17 bundled
+php5extension.setup             postgresql 5.3.19 bundled
 php5extension.ini               postgresql.ini
 php5extension.extensions        pgsql pdo_pgsql
 categories-append               databases
@@ -19,8 +19,8 @@
 
 long_description                ${description}
 
-checksums                       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums                       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build              yes
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-pspell/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-pspell/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-pspell/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     pspell 5.3.17 bundled
+php5extension.setup     pspell 5.3.19 bundled
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:aspell
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-snmp/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-snmp/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-snmp/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     snmp 5.3.17 bundled
+php5extension.setup     snmp 5.3.19 bundled
 categories-append       sysutils
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-soap/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-soap/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-soap/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     soap 5.3.17 bundled
+php5extension.setup     soap 5.3.19 bundled
 categories-append       net
 platforms               darwin
 maintainers             ryandesign
@@ -14,8 +14,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:libxml2
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-sockets/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-sockets/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-sockets/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     sockets 5.3.17 bundled
+php5extension.setup     sockets 5.3.19 bundled
 categories-append       net
 platforms               darwin
 maintainers             ryandesign
@@ -15,7 +15,7 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 use_parallel_build      yes

Modified: branches/pixilla-mysqls-55/dports/php/php5-sqlite/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-sqlite/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-sqlite/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             {sqlite sqlite3 pdo_sqlite} 5.3.17 bundled
+php5extension.setup             {sqlite sqlite3 pdo_sqlite} 5.3.19 bundled
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -15,8 +15,8 @@
 
 long_description                ${description}
 
-checksums                       rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                                sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums                       rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                                sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 # Note that the sqlite extension uses the built-in sqlite2 libraries while the
 # sqlite3 and pdo_sqlite extensions use the libraries from the sqlite3 port.

Modified: branches/pixilla-mysqls-55/dports/php/php5-tidy/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-tidy/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-tidy/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     tidy 5.3.17 bundled
+php5extension.setup     tidy 5.3.19 bundled
 categories-append       www
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:tidy
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-timezonedb/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-timezonedb/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-timezonedb/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           php5extension 1.0
 
-php5extension.setup timezonedb 2012.3 pecl
+php5extension.setup timezonedb 2012.9 pecl
 categories          php devel
 platforms           darwin
 maintainers         miwi
@@ -14,8 +14,8 @@
 long_description    Timezone Database to be used with PHP's date and time \
                     functions.
 
-checksums           rmd160  c4c3c34ddb49505bc06ba9b17ebbf24bfb6422a7 \
-                    sha256  494e20f5186c837660cc0a4aaa5b6aadf98cd98d2c943c46594adda1796e48f6
+checksums           rmd160  cb6c8201bf301d00999f8ff16b47f426be418b99 \
+                    sha256  86050cf0aa5b12f236f2be85fcfdcdd8adf54df281f22f160f1999dbdf79e612
 
 configure.args-append --enable-timezonedb
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-wddx/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-wddx/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-wddx/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     wddx 5.3.17 bundled
+php5extension.setup     wddx 5.3.19 bundled
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign
@@ -14,8 +14,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_build-append    port:expat \
                         port:libxml2

Modified: branches/pixilla-mysqls-55/dports/php/php5-xmlrpc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-xmlrpc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-xmlrpc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     xmlrpc 5.3.17 bundled
+php5extension.setup     xmlrpc 5.3.19 bundled
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign
@@ -14,8 +14,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_build-append    port:libiconv \
                         port:libxml2

Modified: branches/pixilla-mysqls-55/dports/php/php5-xsl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-xsl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-xsl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     xsl 5.3.17 bundled
+php5extension.setup     xsl 5.3.19 bundled
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign
@@ -15,8 +15,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_lib-append      port:libxslt
 

Modified: branches/pixilla-mysqls-55/dports/php/php5-yaz/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-yaz/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-yaz/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     yaz 1.1.4 pecl
+php5extension.setup     yaz 1.1.5 pecl
 categories-append       net databases devel
 platforms               darwin
 maintainers             ryandesign openmaintainer
@@ -14,7 +14,7 @@
 long_description        This extension implements a Z39.50 client \
                         for PHP using the YAZ toolkit.
 
-checksums               rmd160  3d75cc120f989cbe8b47377f0c728535ff8a416c \
-                        sha256  8ebd0657db16d59f1abe55001439fd338e1282dffec868ac26a4eeb30b0bfc70
+checksums               rmd160  10d952a60f5ea35e48ac954c17610284f9b0daf0 \
+                        sha256  d97e77b59aa86a8e5ea6d0da1ba9cc1750a13bfe65bb08d8f2c213b98f1087cc
 
 depends_lib-append      port:re2c port:yaz

Modified: branches/pixilla-mysqls-55/dports/php/php5-zip/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/php/php5-zip/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/php/php5-zip/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 PortGroup               php5extension 1.0
 
-php5extension.setup     zip 5.3.17 bundled
+php5extension.setup     zip 5.3.19 bundled
 categories-append       archivers
 platforms               darwin
 maintainers             ryandesign
@@ -14,8 +14,8 @@
 
 long_description        ${description}
 
-checksums               rmd160  40d0eee40b7c5218985ac490f2efa21d67f1279d \
-                        sha256  ad85e857d404b9e74f1e003deb574e94e3bb939f686e4e9a871d3a6b3f957509
+checksums               rmd160  0083b282091490789379d2443fd91d320f3e95a4 \
+                        sha256  814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6
 
 depends_build-append    port:pcre
 depends_lib-append      port:zlib

Modified: branches/pixilla-mysqls-55/dports/print/libLASi/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/print/libLASi/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/print/libLASi/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,8 +2,10 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               cmake 1.0
+
 name                    libLASi
-version                 1.1.0
+version                 1.1.1
 categories              print
 license                 LGPL
 maintainers             takeshi
@@ -17,27 +19,14 @@
 homepage                http://www.unifont.org/lasi/
 platforms               darwin
 master_sites            sourceforge:lasi
-checksums               md5    f18091569ed4fface75453b097c67459         \
-                        sha1   6b2db9dc8719eb7f31c63b70e04b2337812379a1 \
-                        rmd160 468ffda874ab78676408e8fbe7ab5fee3acc7de7
+checksums           md5     bc5161b1d820db3dbcea24ce1c2ed5ec \
+                    sha1    d17fdebf4bb4a29512e321c7af157a694dc855a0 \
+                    rmd160  dc9efdef39615b4c293c61e3506ee8f2e66bc751
 
-depends_build           port:cmake     \
-                        port:pkgconfig
+depends_build-append    port:pkgconfig
+
 depends_lib             path:lib/pkgconfig/pango.pc:pango
 
-pre-configure {
-    file mkdir ${workpath}/build
-}
-configure.dir           ${workpath}/build
-configure.cmd           cmake
-configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}
-configure.post_args     ../${distname}
-
-build.dir               ${workpath}/build
-
-if {[variant_isset universal]} {
-    configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
-}
 livecheck.type          regex
 livecheck.url           ${homepage}
-livecheck.regex         {([0-9]+\.[0-9]+\.[0-9]+) Latest Stable Release}
+livecheck.regex         {New Release Announcement: libLASi-([0-9]+\.[0-9]+\.[0-9]+)}


Property changes on: branches/pixilla-mysqls-55/dports/python/py-astlib/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: branches/pixilla-mysqls-55/dports/python/py-bpython/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-bpython/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-bpython/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,24 +6,27 @@
 PortGroup               select 1.0
 
 name                    py-bpython
-version                 0.10.1
+version                 0.11
 platforms               darwin
 categories              python 
-maintainers             nomaintainer
+maintainers             aronnax
+license                 MIT
 description             fancy interface to the Python interpreter
 long_description        a fancy interface to the Python interpreter for \
                         Unix-like operating systems
 
 homepage                http://www.bpython-interpreter.org/
-master_sites            ${homepage}/releases/
+master_sites            ${homepage}releases/
 distname                bpython-${version}
-checksums               rmd160  4a62158fce1e86c906900913e10c342820936050 \
-                        sha256  73546a3162ddd9da400ded365c65393989221397da54690e4d25f1ddef3dbc16
+checksums               rmd160  4e656ab4d372dcbb4da955977c0b115be3b0b73a \
+                        sha256  60cf39712564f0a2516f7b0acf86f3c0392e67a79914eeed189400ffaaaeb309
 
 python.versions         25 26 27 31 32
 python.default_version  27
 
 if {$name != $subport} {
+    livecheck.type          none
+
     depends_lib-append      port:py${python.version}-parsing \
                             port:py${python.version}-pygments \
                             port:py${python.version}-distribute
@@ -54,4 +57,8 @@
         xinstall -W ${worksrcpath} sample.theme light.theme \
             ${themedir}
     }                        
+} else {
+    livecheck.type          regex
+    livecheck.url           [lindex ${master_sites} 0]
+    livecheck.regex         bpython-(\\d+(\\.\\d+)*)[quotemeta ${extract.suffix}]
 }

Modified: branches/pixilla-mysqls-55/dports/python/py-dateutil/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-dateutil/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-dateutil/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,9 +6,8 @@
 
 name              py-dateutil
 set my_name       python-dateutil
-version           1.5
+version           2.0
 revision          1
-categories        python
 platforms         darwin
 supported_archs   noarch
 maintainers       dh ram openmaintainer
@@ -21,13 +20,20 @@
 master_sites      http://labix.org/download/python-dateutil
 distname          ${my_name}-${version}
 
-checksums         md5 35f3732db3f2cc4afdc68a8533b60a52 \
-                  sha1 f489e1a70e415731d401422f711670288571040b \
-                  rmd160 5f7c80ec9bf68f1708213596a994130964e91e52
+checksums         md5 22297f7e891bcd79a80d9446d8b20542 \
+                  sha1 946337a273866cc4f51d32c86cdbc4209ab84a43 \
+                  rmd160 a7ae3c4948c69471c95466236a388d63fcdac120
 
-python.versions   24 25 26 27
+python.versions   24 25 26 27 31 32
 
 if {${subport} != ${name}} {
+    if {${python.version} < 30} {
+        version 1.5
+        checksums md5 35f3732db3f2cc4afdc68a8533b60a52 \
+                  sha1 f489e1a70e415731d401422f711670288571040b \
+                  rmd160 5f7c80ec9bf68f1708213596a994130964e91e52
+        distname  ${my_name}-${version}
+    }
     depends_run   path:${python.pkgd}/pytz:py${python.version}-tz \
                   port:py${python.version}-distribute
 
@@ -37,16 +43,17 @@
     test.env          PYTHONPATH=${worksrcpath}/build/lib
 
     post-destroot {
-      if {${name} != ${subport}} {
       set docdir ${prefix}/share/doc/${subport}
       xinstall -d ${destroot}${docdir}
       xinstall -m 0644 -W ${worksrcpath} LICENSE README NEWS ${destroot}${docdir}
-      }
     }
 }
 
 if {${name} == ${subport}} {
     livecheck.type    regex
+    livecheck.regex   /${my_name}-(\\d+(?:\\.\\d+)*)
+} elseif {${subport} == "py27-dateutil"} {
+    livecheck.type    regex
     livecheck.regex   /${my_name}-(1.(\\d+)*)
 } else {
     livecheck.type    none

Modified: branches/pixilla-mysqls-55/dports/python/py-distribute/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-distribute/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-distribute/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-distribute
-version             0.6.30
+version             0.6.32
 categories-append   devel
 license             {PSF ZPL}
 maintainers         jmr openmaintainer
@@ -16,14 +16,15 @@
    distributions.
 
 platforms           darwin
+supported_archs     noarch
 
 homepage            http://pypi.python.org/pypi/distribute/
 master_sites        http://pypi.python.org/packages/source/d/distribute/
 distname            distribute-${version}
 
-checksums           md5    d239a2c7d40e126274dab3e2aa89d591 \
-                    rmd160 36a1aee85544f118eb01f481087b089a1a7ee148 \
-                    sha256 7ff34c3a9a844ee881ff28efc5d1f74603b72e0a5235a9d6dc76e603149e8eab
+checksums           md5    acb7a2da81e3612bfb1608abe4f0e568 \
+                    rmd160 022b82cdcc43b9c276cc464a418665c0d2ae83ee \
+                    sha256 8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df
 
 python.versions     24 25 26 27 31 32 33
 python.default_version 27
@@ -40,6 +41,9 @@
        } else {
           ln -s "${python.prefix}/bin/easy_install-${python.branch}" "${destroot}${prefix}/bin/"
        }
+       foreach exe [glob -directory "${destroot}${python.pkgd}/setuptools" *.exe] {
+          file delete $exe
+       }
     }
     livecheck.type      none
 } else {

Modified: branches/pixilla-mysqls-55/dports/python/py-graph-tool/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-graph-tool/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-graph-tool/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,10 +3,12 @@
 
 PortSystem          1.0
 PortGroup           python 1.0
+PortGroup           active_variants 1.0
 
 set realname        graph-tool
 name                py-${realname}
 version             2.2.18
+revision            2
 categories          python science
 platforms           darwin
 license             GPL-3
@@ -23,18 +25,12 @@
                     sha1    c980d71250b297e04790bf51dc390dd1ea49af9d \
                     rmd160  49341afe929612ac12b1a3ce34d8040d6ad960ae
 distname            ${realname}-${version}
-python.versions     25 26 27
+python.versions     26 27
 python.default_version 27
 
-# graph-tool relies on Boost.Python, so make sure it is installed.
-pre-fetch {
-    if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
-        return -code error "Please reinstall boost with one of the python variants enabled."
-    }
-}
-
 if {$subport != $name} {
     universal_variant  no
+    depends_build-append port:pkgconfig
     depends_lib-append port:boost \
                        port:cairomm \
                        port:cgal \
@@ -44,6 +40,10 @@
                        port:py${python.version}-scipy \
                        port:py${python.version}-gobject3
     use_configure      yes
+    pre-configure {
+        # graph-tool relies on Boost.Python, so make sure it is installed.
+        require_active_variants boost python${python.version}
+    }
     configure.env-append PYTHON=${python.bin} \
                          PYTHON_VERSION=${python.branch} \
                          PYTHON_CPPFLAGS=-I${python.include} \

Modified: branches/pixilla-mysqls-55/dports/python/py-httplib2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-httplib2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-httplib2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortGroup         python 1.0
 
 name              py-httplib2
-version           2-0.7.6
-revision          1
+version           2-0.7.7
 categories        python devel net
 license           MIT
 platforms         darwin
@@ -21,8 +20,8 @@
 
 python.versions   24 25 26 27 31 32
 
-checksums         rmd160 2261d6659a0d6058d1db680eeab992bae06a81df \
-                  sha256 baa7bf431fa9d3c1016562de717e1ebb322a99df72a2918f6b5b8f65fa65bc2e
+checksums         rmd160 8b34577f317d63c6008227c6f06e81d30cb81983 \
+                  sha256 2e2ce18092c32d1ec54f8a447e14e33585e30f240b883bfeeca65f12b3bcfaf6
 
 if {${name} != ${subport}} {
   # Extracted files do not have correct 'group' and 'other' permissions.

Modified: branches/pixilla-mysqls-55/dports/python/py-icalendar/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-icalendar/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-icalendar/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -41,4 +41,4 @@
 
 livecheck.type regex
 livecheck.url http://icalendar.readthedocs.org/en/latest/changelog.html
-livecheck.regex <h2>(\[0-9.\]+)
\ No newline at end of file
+livecheck.regex <h2>(\[0-9.\]+)<

Modified: branches/pixilla-mysqls-55/dports/python/py-kombu/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-kombu/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-kombu/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-kombu
-version             2.4.8
+version             2.5.3
 revision            0
 categories-append   devel
 license             BSD
@@ -21,8 +21,8 @@
 master_sites        http://pypi.python.org/packages/source/k/kombu/
 distname            kombu-${version}
 
-checksums           rmd160  eaabf08d8f53384b18a9f442776e95f65dfcfdea \
-                    sha256  c6613158dcb21d630300dbb53fb76dabdc28c21ba2b13386ce39fda136c5907e
+checksums           rmd160  5dff5c65e13eccd1c48da0623a3836ca711b9722 \
+                    sha256  8f0708417777f573691eb793f401b444281dbe0ae9dc6a9a5784bf01e9471ad1
 
 python.versions     25 26 27 31 32 33
 python.default_version  27

Modified: branches/pixilla-mysqls-55/dports/python/py-mahotas/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-mahotas/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-mahotas/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-mahotas
-version             0.9.4
+version             0.9.5
 revision            0
 categories          python
 license             MIT
@@ -21,8 +21,8 @@
 
 distname            mahotas-${version}
 
-checksums           rmd160  62b58364d585fd8d95ee74bcb930d18ff4451650 \
-                    sha256  0f8cdd1a4b3b747256065e5154a376a28c86569e8c0c26c0db91227b56a5b469
+checksums           rmd160  0af2a57153e9d4dcc429748b7fd1a166ad843675 \
+                    sha256  7fee42b5ecccd007affce39b6fb8430225b9545993c0769dd72c3878bd9405b8
 
 python.default_version  27
 python.versions     26 27 32

Modified: branches/pixilla-mysqls-55/dports/python/py-matplotlib/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-matplotlib/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-matplotlib/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,11 +2,11 @@
 
 PortSystem         1.0
 PortGroup          python 1.0
+PortGroup          github 1.0
 
 categories-append  graphics math
+github.setup       matplotlib matplotlib 1.2.0 v
 name               py-matplotlib
-version            1.1.1
-revision           2
 maintainers        ram openmaintainer
 platforms          darwin
 license            {PSF BSD}
@@ -19,34 +19,21 @@
                    output backends. This port provides variants for the \
                    different GUIs (gtk2, tkinter, wxpython).
 
-homepage           http://matplotlib.sourceforge.net
-master_sites       sourceforge:matplotlib
-distname           matplotlib-${version}
+checksums          rmd160 ef8e5e83479633529e0cb60bb1033401fa9b390a \
+                   sha256 3c22488acd6d4ed0721c1cfe0c3563aaec41c8cf1e06270d19841f8b2b46fdce
 
-checksums          rmd160 d6289c7d001c078300ce360d33d424bd3eb93e13 \
-                   sha256 63b275eb8d98903264557ffbd6ec0fee2c31b5badb3678fce1ac7044594620ab
+python.versions    26 27
+python.default_version 27
 
-python.versions    24 25 26 27
-
-if {${subport} == "py24-matplotlib"} {
-  depends_lib-append port:py24-dateutil \
-                     port:py24-tz \
-                     port:py24-numpy \
-                     port:py-configobj \
-                     port:py-pyobjc2 \
-                     port:py-pyobjc2-cocoa
-} elseif {${subport} != ${name}} {
-  depends_lib-append port:py${python.version}-dateutil \
-                     port:py${python.version}-tz \
-                     port:py${python.version}-numpy \
-                     port:py${python.version}-configobj \
-                     port:py${python.version}-pyobjc-cocoa
-}
-
 if {$subport != $name} {
 
 depends_lib-append port:freetype \
-                   port:libpng
+                   port:libpng \
+                   port:py${python.version}-dateutil \
+                   port:py${python.version}-tz \
+                   port:py${python.version}-numpy \
+                   port:py${python.version}-configobj \
+                   port:py${python.version}-pyobjc-cocoa
 
 patchfiles         patch-setupext.py.diff \
                    patch-setup.cfg.diff
@@ -70,22 +57,14 @@
 }
 
 variant cairo description "Enable Cairo backends" {
-  if {${subport} == "py24-matplotlib"} {
-    depends_lib-append port:py-cairo
-  } elseif {${subport} != ${name}} {
-    depends_lib-append port:py${python.version}-cairo
-  }
+  depends_lib-append port:py${python.version}-cairo
   post-patch {
     reinplace "s|MP_Cairo=False|MP_Cairo=True|" ${worksrcpath}/setupext.py
   }
 }
 
 variant gtk2 description "Enable GTKAgg backend" {
-  if {${subport} == "py24-matplotlib"} {
-    depends_lib-append port:py-gtk2
-  } elseif {${subport} != ${name}} {
-    depends_lib-append port:py${python.version}-gtk
-  }
+  depends_lib-append port:py${python.version}-gtk
   post-patch {
     reinplace "s|^gtk=False|gtk=True|" ${worksrcpath}/setup.cfg
     reinplace "s|^gtkagg=False|gtkagg=True|" ${worksrcpath}/setup.cfg
@@ -100,11 +79,7 @@
 }
 
 variant wxpython description "Enable wxAgg backend" {
-  if {${subport} == "py24-matplotlib"} {
-    depends_lib-append port:py-wxpython
-  } elseif {${subport} != ${name}} {
-    depends_lib-append port:py${python.version}-wxpython
-  }
+  depends_lib-append port:py${python.version}-wxpython
   post-patch {
     reinplace "s|^wxagg=False|wxagg=True|" ${worksrcpath}/setup.cfg
   }
@@ -138,9 +113,7 @@
 }
 
 if {${name} == ${subport}} {
-  livecheck.type     regex
-  livecheck.url      ${homepage}
-  livecheck.regex    {Matplotlib (\d+(\.\d+)*) is available}
+  livecheck.regex    archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}"
 } else {
   livecheck.type     none
   notes "

Modified: branches/pixilla-mysqls-55/dports/python/py-matplotlib/files/patch-setupext.py.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-matplotlib/files/patch-setupext.py.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-matplotlib/files/patch-setupext.py.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,23 +1,15 @@
---- setupext.py	2012-08-08 22:08:49.000000000 -0500
-+++ setupext.py	2012-08-08 22:26:48.000000000 -0500
-@@ -58,15 +58,7 @@
-     'linux3' : ['/usr/local', '/usr'],
-     'linux'  : ['/usr/local', '/usr',],
-     'cygwin' : ['/usr/local', '/usr',],
--    '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
--                '/usr', '/sw'],
--    # it appears builds with darwin are broken because of all the
--    # different flags the deps can be compile with, so I am pushing
--    # people to :
--    #   make -f make.osx fetch deps mpl_build mpl_install
--
--    'darwin' : [],
--
+--- setupext.py	2012-11-08 10:38:38.000000000 -0600
++++ setupext.py	2012-11-17 10:46:42.000000000 -0600
+@@ -57,7 +57,7 @@
+ basedir = defaultdict(lambda: ['/usr/local', '/usr'], {
+     # execptions to the ['/usr/local', '/usr'] defaults
+     'win32'  : ['win32_static',],
+-    'darwin' : ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
 +    'darwin' : ['@@MPORTS_PREFIX@@'],
-     'freebsd4' : ['/usr/local', '/usr'],
-     'freebsd5' : ['/usr/local', '/usr'],
-     'freebsd6' : ['/usr/local', '/usr'],
-@@ -371,6 +363,7 @@
+     'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
+     'gnu0' : ['/usr'],
+     'aix5' : ['/usr/local'],
+@@ -386,6 +386,7 @@
                       [os.path.join(p, 'lib64')     for p in basedirlist ] )
  
      module.include_dirs.extend(incdirs)
@@ -25,7 +17,7 @@
      module.include_dirs.append('.')
      module.library_dirs.extend(libdirs)
  
-@@ -389,33 +382,43 @@
+@@ -404,33 +405,43 @@
      return '.'.join(temp)
  
  def check_for_qt():
@@ -90,7 +82,7 @@
  
  def check_for_pyside():
      try:
-@@ -430,14 +433,19 @@
+@@ -445,14 +456,19 @@
          return True
  
  def check_for_cairo():
@@ -114,11 +106,11 @@
 -        print_status("Cairo", cairo.version)
 -        return True
  
- def check_for_datetime():
-     try:
-@@ -496,36 +504,51 @@
-             return False
+ def check_provide_pytz():
+     if options['provide_pytz'] is True:
+@@ -531,36 +547,51 @@
  
+ 
  def check_for_dvipng():
 -    try:
 -        stdin, stdout = run_child_process('dvipng -version')
@@ -190,7 +182,7 @@
          print_status("latex", "no")
          return False
  
-@@ -926,10 +949,10 @@
+@@ -974,10 +1005,10 @@
      return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
  
  def hardcoded_tcl_config():
@@ -205,7 +197,7 @@
      return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
  
  def add_tk_flags(module):
-@@ -950,52 +973,6 @@
+@@ -998,52 +1029,6 @@
              raise RuntimeError('No tk/win32 support for this python version yet')
          module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
  

Modified: branches/pixilla-mysqls-55/dports/python/py-matplotlib-basemap/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-matplotlib-basemap/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-matplotlib-basemap/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -21,7 +21,8 @@
 checksums         rmd160 0946df06327b2fd048d4888bed56e17523eb2336 \
                   sha256 a270203fa36e9fe69cd3bf3c53412f1f2d6a49748cc43a54c12d8d589777b7c1
 
-python.versions   24 25 26 27
+python.versions   26 27
+python.default_version 27
 
 build.env-append    GEOS_DIR="${prefix}"
 destroot.env-append GEOS_DIR="${prefix}"

Modified: branches/pixilla-mysqls-55/dports/python/py-milk/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-milk/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-milk/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-milk
-version             0.4.3
+version             0.5
 revision            0
 categories          python science
 license             MIT
@@ -21,12 +21,31 @@
 
 distname            milk-${version}
 
-checksums           rmd160  0fcdb0766147e0a16fffa4aabcf6a165678f43e9 \
-                    sha256  ac34d688a493ccd7ff45e79b2638fa0b26e4260c725f179d9b3a8f17c2a18fdd
+checksums           rmd160  84a73d328d11c6f936e18e1e0dfda221157a8259 \
+                    sha256  69be63eb301873f5dd39a23e669a671ff68ff118f328907637f839445a29bec5
 
 python.versions     26 27
 python.default_version  27
 
+variant gcc45 conflicts gcc46 gcc47 description {Compile with gcc 4.5} {
+    configure.compiler macports-gcc-4.5
+    depends_lib-append port:gcc45
+}
+
+variant gcc46 conflicts gcc45 gcc47 description {Compile with gcc 4.6} {
+    configure.compiler macports-gcc-4.6
+    depends_lib-append port:gcc46
+}
+
+variant gcc47 conflicts gcc45 gcc46  description {Compile with gcc 4.7} {
+    configure.compiler macports-gcc-4.7
+    depends_lib-append port:gcc47
+}
+
+if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
+    default_variants +gcc47
+}
+
 if {$subport != $name} {
     depends_build-append  port:py${python.version}-distribute
     depends_lib-append    port:py${python.version}-numpy

Modified: branches/pixilla-mysqls-55/dports/python/py-novas_py/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-novas_py/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-novas_py/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -33,7 +33,7 @@
 if {${name} == ${subport}} {
 
 livecheck.type          regex
-livecheck.url           ${master_sites}
+livecheck.url           ${homepage}
 livecheck.regex         {NOVAS_Py-(\d+(?:\.\d+)*).tar.gz}
 
 } else {

Modified: branches/pixilla-mysqls-55/dports/python/py-pandas/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pandas/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pandas/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-pandas
-version             0.9.0
+version             0.9.1
 revision            0
 categories-append   science
 license             BSD
@@ -22,8 +22,8 @@
 
 distname            pandas-${version}
 
-checksums           rmd160  1f6ad317d19107a96192a0384292969db0a3dee9 \
-                    sha256  d5924c09d737bb91ed3dc9a120814f20c0c0ca21fc81a9e0df96c701effb87d3
+checksums           rmd160  4e0c1682803535e1b1557cbb0763f4e70cc3227d \
+                    sha256  7088d9ef239504626e6235084ae7fa88949c83c8bb4249d169e642521bfa64e9
 
 python.default_version  27
 python.versions     26 27 32

Modified: branches/pixilla-mysqls-55/dports/python/py-pika/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pika/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pika/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-pika
-version             0.9.6
+version             0.9.8
 revision            0
 categories-append   devel
 license             MPL
@@ -21,8 +21,8 @@
 master_sites        http://pypi.python.org/packages/source/p/pika/
 distname            pika-${version}
 
-checksums           rmd160  19f7e1c5343e79296e7a8167609f9ccdbd8c0f6a \
-                    sha256  218c5acc05878958a58a9eeb126ba60d91335879016054eb257e53cdfeab1863
+checksums           rmd160  9df122d66a174b450428ea24e1995646c85bd2e9 \
+                    sha256  666fd522f4a1059d5b8b4996e576fa7862f505528e11cf1ef5546311c60c3e4d
 
 python.versions     25 26 27
 

Modified: branches/pixilla-mysqls-55/dports/python/py-pyfftw/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pyfftw/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pyfftw/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -25,14 +25,14 @@
 python.default_version  27
 
 if {${subport} == ${name}} {
-    livecheck.type      none
+    livecheck.type      regex
+    livecheck.url       {http://pypi.python.org/pypi?:action=doap&name=pyFFTW}
+    livecheck.regex     {<release><Version><revision>([^<]+)</revision></Version></release>}
 } else {
     depends_lib-append  port:py${python.version}-numpy \
                         port:fftw-3 \
                         port:fftw-3-single \
                         port:fftw-3-long
 
-    livecheck.type      regex
-    livecheck.url       {http://pypi.python.org/pypi?:action=doap&name=pyFFTW}
-    livecheck.regex     {<release><Version><revision>([^<]+)</revision></Version></release>}
+    livecheck.type      none
 }


Property changes on: branches/pixilla-mysqls-55/dports/python/py-pyfftw/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: branches/pixilla-mysqls-55/dports/python/py-pygccxml-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pygccxml-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pygccxml-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,11 +4,9 @@
 PortGroup           python 1.0
 
 name                py-pygccxml-devel
-version             20120123
-revision            1
-dist_subdir         ${name}/${version}_1
+version             20121113
 
-python.versions     25 26 27
+python.versions     26 27 31 32 33
 python.default_version 27
 categories-append   devel
 maintainers         mmoll openmaintainer
@@ -17,10 +15,10 @@
 long_description    ${description}
 platforms           darwin
 homepage            http://sourceforge.net/projects/pygccxml/
-master_sites        https://downloads.sourceforge.net/project/ompl/dependencies/
-checksums           rmd160  353d819d3789af9efce4e56f5eafcb1fb65d9411 \
-                    sha256  4155e18cf3de7e7ee1a9f6a3924778940eca5a088d0c20755277d698bea00cca
-distname            pygccxml-r1856
+master_sites        https://bitbucket.org/ompl/pygccxml/downloads/
+checksums           rmd160  37a8fb79e09a187576d0d8dd908d589ff25cba12 \
+                    sha256  bc7069dca42914d4e47e39f60c2104f9de7718920cd4887d24845da7ef0869c0
+distname            pygccxml-r575
 extract.suffix      .tgz
 worksrcdir          pygccxml
 

Modified: branches/pixilla-mysqls-55/dports/python/py-pygrib/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pygrib/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pygrib/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-pygrib
-version             1.9.2
+version             1.9.5
 categories-append   science
 platforms           darwin
 maintainers         fastmail.fm:jswhit openmaintainer
@@ -16,9 +16,9 @@
 license             MIT
 
 distname            pygrib-${version}
-checksums           md5    cf720a99c93625a069bfb3ecdcbb6082 \
-                    sha1   67d9ec7959c1b33a2e238210448544126cb2f695 \
-                    rmd160 aa92e26d9a6888b5386c714b9ec501694ba629ed
+checksums           md5    e14a9c7fa6bc0c8036b6f45cac6eb187 \
+                    sha1   29b288d0bad17d0cb375800bd3d2b496744658f5 \
+                    rmd160 b167fe0221e39470fa4a78afcb79eb761b00d7fb \
 
 python.versions        26 27
 python.default_version 27

Modified: branches/pixilla-mysqls-55/dports/python/py-pymongo/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pymongo/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pymongo/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-pymongo
-version             2.3
+version             2.4
 revision            0
 categories-append   databases
 license             Apache
@@ -23,10 +23,10 @@
 
 distname            pymongo-${version}
 
-checksums           rmd160  79c2486012331e0f7606bd58aece0cf03cbe78f0 \
-                    sha256  8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc
+checksums           rmd160  fb3897d75445368860b6cad010eae7599b0aa5ef \
+                    sha256  11d6a2934188eea6a6b6c55f3a0b1ac610175e6de92b0e5632bb8d90acb3d48d
 
-python.versions     25 26 27
+python.versions     25 26 27 32 33
 python.default_version  27
 
 if {$subport != $name} {

Modified: branches/pixilla-mysqls-55/dports/python/py-pynds/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pynds/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pynds/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup               python 1.0
 
 name                    py-pynds
-version                 0.7.0
+version                 0.7.2
 categories              python science
 platforms               darwin
 maintainers             aronnax ram
@@ -17,9 +17,8 @@
 homepage                http://www.lsc-group.phys.uwm.edu/daswg/
 master_sites            ${homepage}download/software/source/
 distname                pynds-${version}
-checksums               md5     fb5ad5fa944c9f5252c8385a55ac76eb \
-                        sha1    79d730534ac7fac2280f8b027f2b3017c5bfb323 \
-                        rmd160  e629494a1dabdf747845e0b69faa87746c3a2a37
+checksums               sha1    0f856f8251c75925ffe4bd1867adf1153d6a28ea \
+                        rmd160  191b7e8a6b2b5fa22111f05194ec8c961903f6dc
 
 python.versions         25 26 27
 python.default_version  27
@@ -61,6 +60,10 @@
         }
     }
 
+    post-patch {
+        reinplace       "s/boost_python/boost_python-mt/" ${worksrcpath}/setup.py
+    }
+
     build.env           PYTHON_CFLAGS="-I${prefix}/include/boost" \
                         CFLAGS="-I${prefix}/include/boost"
 

Modified: branches/pixilla-mysqls-55/dports/python/py-pyplusplus-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pyplusplus-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pyplusplus-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,9 +4,9 @@
 PortGroup           python 1.0
 
 name                py-pyplusplus-devel
-version             20120123
+version             20121113
 revision            1
-python.versions     25 26 27
+python.versions     25 26 27 31 32 33
 python.default_version 27
 categories-append   devel
 maintainers         mmoll openmaintainer
@@ -15,10 +15,10 @@
 long_description    ${description}
 platforms           darwin
 homepage            http://sourceforge.net/projects/pygccxml/
-master_sites        https://downloads.sourceforge.net/project/ompl/dependencies/
-checksums           rmd160  0cd27cb176f3f479d38798dd5c111d686d3e645f \
-                    sha256  791889deacfe3c0afa8a00eca0a16d86801b325b6ec4cf736a8fc255d88d4fb8
-distname            pyplusplus-r1856
+master_sites        https://bitbucket.org/ompl/pyplusplus/downloads/
+checksums           rmd160  4010abdbe2e34ed428ab6db98da1f2d76119c2ba \
+                    sha256  4e5dfefc666b724cfcd026538eaf438fe91cc9e3f37b343efc4f9fc13cb54490
+distname            pyplusplus-r1238
 extract.suffix      .tgz
 worksrcdir          pyplusplus
 

Modified: branches/pixilla-mysqls-55/dports/python/py-pyrxp/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pyrxp/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pyrxp/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -14,7 +14,7 @@
 description       Fast validating XML parser for python
 long_description  ${description}
 
-homepage          http://www.reportlab.org/pyrxp.html
+homepage          http://www.reportlab.com/software/opensource/pyrxp/
 master_sites      http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/
 distname          pyRXP-${version}
 

Modified: branches/pixilla-mysqls-55/dports/python/py-pyside/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-pyside/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-pyside/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -24,7 +24,7 @@
 homepage            http://qt-project.org/wiki/PySide
 platforms           darwin
 license             LGPL
-master_sites        http://www.pyside.org/files/
+master_sites        http://qt-project.org/wiki/PySideDownloads
 
 checksums           md5     59c8653734b020b0128b82adc98ee704 \
                     rmd160  36545d230fee80ee023a5640a24b39e911e5f287 \

Modified: branches/pixilla-mysqls-55/dports/python/py-redis/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-redis/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-redis/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-redis
-version             2.7.1
+version             2.7.2
 revision            0
 categories-append   devel
 license             MIT
@@ -21,8 +21,8 @@
 master_sites        http://pypi.python.org/packages/source/r/redis/
 distname            redis-${version}
 
-checksums           rmd160  dda05947da6853717d0f69da4781c919af36ad34 \
-                    sha256  e59c0258d3a831299915ba47640f388107943f3e510a0e89d5ca51e56d2d0474
+checksums           rmd160  96cc00fff0c19de4b2cc597b7ed2711758b427e7 \
+                    sha256  c22e7129f21b8bd1690c2cefc07b2caf1088c66a9dd159aed0621dcbaf2dfb09
 
 python.versions     25 26 27 31 32 33
 python.default_version 27

Modified: branches/pixilla-mysqls-55/dports/python/py-regex/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-regex/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-regex/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-regex
-version             0.1.20121105
+version             0.1.20121120
 revision            0
 categories-append   devel
 license             Python
@@ -20,8 +20,8 @@
 master_sites        http://pypi.python.org/packages/source/r/regex/
 distname            regex-${version}
 
-checksums           rmd160  db49dbb97f51613b69c0fbea0f8e37a12f1e6cf6 \
-                    sha256  62555f0307ed3b6202e0e52b00413785c70175edb2120a5db851c06f5b26827e
+checksums           rmd160  6882efade612fd2dd301a399c85fd1daabe2dccd \
+                    sha256  91a048135448cf6758e7ca32729c382664701b1156c257665dc43026ba84f954
 
 python.versions     26 27 31 32 33
 python.default_version  27


Property changes on: branches/pixilla-mysqls-55/dports/python/py-reportlab
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/python/py25-reportlab:40939-40943
   + /trunk/dports/python/py-reportlab:99672-100173
/trunk/dports/python/py25-reportlab:40939-40943

Modified: branches/pixilla-mysqls-55/dports/python/py-reportlab/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-reportlab/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-reportlab/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,11 +1,10 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           python24 1.0
+PortGroup           python 1.0
 
 name                py-reportlab
-version             2.3
-revision            1
+version             2.6
 license             BSD
 maintainers         nomaintainer
 platforms           darwin freebsd
@@ -15,17 +14,28 @@
    in Adobe's Portable Document Format (PDF) using the python programming \
    language.
 
-homepage            http://www.reportlab.org/rl_toolkit.html
-master_sites        http://www.reportlab.org/ftp/
-distname            ReportLab_2_3
-checksums           md5     057b846bd3b7b2c3498bf14f6a523632 \
-                    sha1    cb5e27fef02eceaab79236d5a074cdfb92bff179 \
-                    rmd160  ebb347765d516e74b965ec89c7909ec7592e3f54
-depends_lib-append  port:py24-pil
+python.versions     24 25 26 27
 
-patchfiles          patch-src_reportlab_lib_testutils.py.diff
+homepage            http://www.reportlab.com/software/opensource/rl-toolkit/
+master_sites        http://www.reportlab.com/ftp/
+distname            reportlab-${version}
 
-post-destroot {
-   xinstall -m 644 -W ${worksrcpath} README.txt CHANGES.txt LICENSE.txt \
-      ${destroot}${prefix}/share/doc/${name}
+checksums           rmd160  1128a37b6cf020a44fa3a1bac57cdebebd0dea59 \
+                    sha256  76c3cda08f6eac9b0adf0e3c86202fe5e9cb075c00503bef5760cd9e75ec34ff
+
+if {${name} != ${subport}} {
+    depends_lib-append  port:py${python.version}-pil
+    
+    patchfiles      patch-src_reportlab_lib_testutils.py.diff
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -m 644 -W ${worksrcpath} README.txt CHANGES.txt LICENSE.txt \
+            ${destroot}${docdir}
+    }
+    livecheck.type  none
+} else {
+    livecheck.type  regex
+    livecheck.url   [lindex ${master_sites} 0]
+    livecheck.regex reportlab-(\[0-9.\]+)${extract.suffix}
 }

Modified: branches/pixilla-mysqls-55/dports/python/py-robotframework-ride/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-robotframework-ride/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-robotframework-ride/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 name				py-robotframework-ride
 set internal_name	robotframework-ride
 
-version             0.51
+version             0.53
 
 license             Apache-2
 
@@ -23,13 +23,13 @@
 python.default_version	27
 
 universal_variant	no
-configure.build_arch	i386
+supported_archs	i386
 
 master_sites        https://github.com/downloads/robotframework/RIDE/
 distname            ${internal_name}-${version}
 
-checksums           rmd160  f7a354f8b58264a010395852e7ea6442ef2b757f \
-                    sha256  28f331af7d313466e0ce53f424b433ddfb8831501d6acfc9bdf52bf6f782aaf3
+checksums           rmd160  15b404bbafc67a40d02a3607f112918e315f1e01 \
+                    sha256  3b25ba6a8d5cc77b6c85e332a1aabf7e70fe76bd5ac58fa2087656e2c6761388
 
 if {$subport != $name} {
     build.cmd           ${python.bin} setup.py
@@ -38,6 +38,12 @@
         port:py${python.version}-wxpython \
         port:py${python.version}-paver
 
+    platform darwin 12 {
+        supported_archs    x86_64
+        depends_lib-delete port:py${python.version}-wxpython
+        depends_lib-append port:py${python.version}-wxpython30
+    }
+
     post-extract {
         reinplace "s/pybot/pybot-${python.branch}/g" $worksrcpath/src/robotide/contrib/testrunner/runprofiles.py
     }

Modified: branches/pixilla-mysqls-55/dports/python/py-roman/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-roman/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-roman/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -30,11 +30,7 @@
         if {[file exists ${python.pkgd}/roman.py] 
             && ![catch {set vers [lindex [registry_active py${python.version}-docutils] 0]}]
             && [vercmp [lindex $vers 1] 0.6] < 0} {
-            set deactivate_proc registry_deactivate_composite
-            if {[info commands registry_deactivate_composite] == {}} {
-                set deactivate_proc registry_deactivate
-            }
-            $deactivate_proc py${python.version}-docutils "" [list ports_nodepcheck 1]
+            registry_deactivate_composite py${python.version}-docutils "" [list ports_nodepcheck 1]
         }
     }
 }

Modified: branches/pixilla-mysqls-55/dports/python/py-shiboken/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-shiboken/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-shiboken/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -20,7 +20,7 @@
                     source code.
 homepage            http://qt-project.org/wiki/PySide
 platforms           darwin
-master_sites        http://www.pyside.org/files/
+master_sites        http://qt-project.org/wiki/PySideDownloads
 
 checksums           md5     0a37b5011b3a7276bf4584317412a4b6 \
                     rmd160  ea4ecb00af002bef43e2a9093c536cc7ae12be87 \

Modified: branches/pixilla-mysqls-55/dports/python/py-thrift/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-thrift/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-thrift/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup       python 1.0
 
 name            py-thrift
-version         0.8.0
+version         0.9.0
 categories      python
 license         BSD
 platforms       darwin
@@ -26,9 +26,9 @@
 dist_subdir     thrift
 distname        thrift-${version}
 
-checksums       md5     d29dfcd38d476cbc420b6f4d80ab966c \
-                sha1    1d652d7078d9cc70e2a45d3119b13e86ebd446da \
-                rmd160  bb0e1d2b6d30b70590752a7f9318e14de285c505
+checksums       sha1    fefcf4d729bf80da419407dfa028740aa95fa2e3 \
+                rmd160  a507447718048bec2e7a4077658c43b07714ddb1 \
+                sha256  71d129c49a2616069d9e7a93268cdba59518f77b3c41e763e09537cb3f3f0aac
 
 python.versions 25 26 27
 python.default_version 27

Modified: branches/pixilla-mysqls-55/dports/python/py-xhtml2pdf/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-xhtml2pdf/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-xhtml2pdf/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,3 +1,4 @@
+# -*- 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
@@ -4,9 +5,10 @@
 PortGroup               python 1.0
 
 name                    py-xhtml2pdf
-version                 0.0.3
+version                 0.0.4
 maintainers             perry openmaintainer
 platforms               darwin
+supported_archs         noarch
 
 description             HTML/CSS to PDF converter based on Python
 long_description        ${description}
@@ -20,7 +22,8 @@
 distname                xhtml2pdf-${version}
 master_sites            http://pypi.python.org/packages/source/x/xhtml2pdf/
 
-checksums               rmd160 76541029347f73229e4af9e9a1d2d2a87905e355
+checksums               rmd160  7196b4a8aec1569c8a72fc74fb151c3ce4404f2e \
+                        sha256  2a533f80874338069739d013737b2fd35f0143a46366097ad907fb24ee881233
 
 python.default_version  27
 python.versions         26 27

Modified: branches/pixilla-mysqls-55/dports/python/py-xlib/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-xlib/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-xlib/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,7 @@
 name                py-xlib
 version             0.15rc1
 categories-append   x11
+license             GPL-2+
 platforms           darwin
 maintainers         nomaintainer
 supported_archs     noarch
@@ -29,7 +30,6 @@
                     sha256  15f8e93e9d4c04eb11d567e59ed49799e44a1f26df70711d3df2f75b80f97f57
 
 python.versions     24 25 26 27
-python.default_version 27
 
 
 post-destroot {

Modified: branches/pixilla-mysqls-55/dports/python/py-xlutils/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-xlutils/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-xlutils/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,10 +7,11 @@
 name            py-xlutils
 version         1.5.2
 platforms       darwin
+supported_archs noarch
 python.versions	25 26 27
-python.default_version	27
 
 maintainers     jwa openmaintainer
+license         MIT
 description     Utilities for working with Excel files
 long_description \
    This package provides a collection of utilities for working with Excel files.
@@ -34,4 +35,3 @@
 } else {
     livecheck.type		none
 }
-

Modified: branches/pixilla-mysqls-55/dports/python/py-yt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/py-yt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/py-yt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -9,6 +9,7 @@
 maintainers         robitaille openmaintainer
 
 categories-append   science
+license             GPL-3+
 description         Astrophysical simulation Analysis and Viz
 long_description    The yt project aims to produce an integrated \
                     science environment for collaboratively asking and \
@@ -21,7 +22,6 @@
                     between codes.
 
 platforms           darwin
-supported_archs     noarch
 
 homepage            http://yt-project.org/
 master_sites        http://pypi.python.org/packages/source/y/yt/
@@ -31,7 +31,6 @@
                     rmd160 26a91719bd2d53a1bd6a8c815847ce5b6cbfe6a3
 
 python.versions     26 27
-python.default_version 27
 
 patchfiles          iyt.diff
 

Modified: branches/pixilla-mysqls-55/dports/python/repo/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/python/repo/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/python/repo/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                repo
-version             1.17
+version             1.18
 epoch               20120914
 license             Apache-2
 categories          python
@@ -22,8 +22,8 @@
 homepage            http://source.android.com/source/git-repo.html
 master_sites        googlecode:git-repo
 
-checksums           sha1    ddd79b6d5a7807e911b524cb223bc3544b661c28 \
-                    rmd160  568886d5c043702e9d82373b3debc1a7d7b54b9e
+checksums           sha1    562a9091b4529d7a2afb87131e548a9d12241da5 \
+                    rmd160  1bf65c8c31699353b677a82534c153589159827e
 
 depends_run         port:git-core
 extract.suffix      

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-configuration/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-configuration/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-configuration/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,7 @@
 
 maintainers         gmail.com:blair.christensen openmaintainer
 categories-append   devel
+license             {Ruby GPL-2}
 description         Pure ruby scoped configuration files.
 long_description    ${description}
 homepage            http://github.com/ahoward/configuration/tree/master

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-cri/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-cri/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-cri/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,14 +1,17 @@
 # $Id$
+
 PortSystem          1.0
 PortGroup           ruby 1.0
 
 ruby.setup          cri 1.0.1 gem
 revision            0
+license             MIT
 maintainers         nomaintainer
 description         Cri is a library for building easy-to-use commandline tools.
 long_description    \
     ${description}
 platforms           darwin
+supported_archs     noarch
 homepage            http://rubygems.org/gems/cri
 master_sites        http://rubygems.org/downloads/
 checksums           md5     91e095058ab65e25ac9933aab74882c7 \

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-diff-lcs/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-diff-lcs/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-diff-lcs/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,10 +6,12 @@
 ruby.setup          diff-lcs 1.1.2 gem {} rubyforge_gem
 
 maintainers         gmail.com:blair.christensen openmaintainer
+license             {GPL-2+ Artistic-1 Ruby}
 description         Diff::LCS is a port of Algorithm::Diff.
 long_description    ${description}
 homepage            http://rubyforge.org/projects/ruwiki/
 platforms           darwin
+supported_archs     noarch
 
 checksums           md5 60524d29b37f76d56ce835323e324879 \
                     rmd160 f57dcbd09658cea31f286039ec3f0b599c99ff25 \

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-innate/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-innate/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-innate/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,7 @@
 
 maintainers         gmail.com:blair.christensen openmaintainer
 categories-append   www devel
+license             MIT
 description         Powerful web-framework wrapper for Rack.
 long_description    ${description}
 homepage            http://github.com/manveru/innate

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-launchy/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-launchy/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-launchy/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,7 @@
 
 maintainers         gmail.com:blair.christensen openmaintainer
 categories-append   devel
+license             ISC
 description         cross-platform application launcher class
 long_description    Launchy is a helper class for launching cross-platform \
                     applications in a fire and forget manner.

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-rack/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-rack/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-rack/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,7 @@
 
 maintainers         gmail.com:blair.christensen openmaintainer
 categories-append   www devel
+license             MIT
 description         Rack provides a common API for connecting web frameworks, \
                     web servers and layers of software inbetween. 
 long_description    ${description}

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-term-ansicolor/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-term-ansicolor/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-term-ansicolor/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 
 ruby.setup          term-ansicolor 1.0.4 gem {} rubyforge_gem
 
+license             GPL-2
 maintainers         gmail.com:blair.christensen openmaintainer
 description         Small Ruby library that colors strings using ANSI escape sequences.
 long_description    ${description}

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-treetop/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-treetop/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-treetop/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 
 ruby.setup          treetop 1.4.2 gem {} rubyforge_gem
 
+license             MIT
 maintainers         gmail.com:blair.christensen openmaintainer
 description         Treetop is a Ruby-based DSL for text parsing and interpretation.
 long_description    ${description}

Modified: branches/pixilla-mysqls-55/dports/ruby/rb-twitter-stream/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb-twitter-stream/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb-twitter-stream/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 PortGroup			ruby 1.0
 
 ruby.setup			twitter-stream 0.1.14 gem {} rubygems
+license				MIT
 maintainers			kimuraw openmaintainer
 description			Simple Ruby client library for twitter streaming API.
 long_description	Simple Ruby client library for twitter streaming API. \
@@ -18,4 +19,3 @@
 					sha1    7947e8df96408e1fd535ae82bf632997f7534702 \
 					rmd160  f118795035fe8f326c32939e82a32e315955d744
 platforms			darwin
-

Modified: branches/pixilla-mysqls-55/dports/ruby/rb19-arrayfields/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb19-arrayfields/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb19-arrayfields/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 PortGroup           ruby 1.0
 
 ruby.setup          arrayfields 4.7.4 gem {} rubygems ruby19
+license             {Ruby BSD}
 description         allow keyword access to array instances
 long_description    \
     Allow keyword access to array instances.  arrayfields works by adding \

Modified: branches/pixilla-mysqls-55/dports/ruby/rb19-configuration/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb19-configuration/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb19-configuration/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 PortGroup           ruby 1.0
 
 ruby.setup          configuration 1.1.0 gem {} rubygems ruby19
+license             {Ruby BSD}
 description         Pure ruby scoped configuration files.
 long_description    ${description}
 maintainers         gmail.com:blair.christensen openmaintainer

Modified: branches/pixilla-mysqls-55/dports/ruby/rb19-cri/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb19-cri/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb19-cri/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 PortGroup           ruby 1.0
 
 ruby.setup          cri 1.0.1 gem {} rubygems ruby19
+license             MIT
 description         Cri is a library for building easy-to-use commandline tools.
 long_description    \
     ${description}

Modified: branches/pixilla-mysqls-55/dports/ruby/rb19-daemons/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb19-daemons/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb19-daemons/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 PortGroup			ruby 1.0
 
 ruby.setup			daemons 1.1.0 gem {} rubyforge_gem ruby19
+license				MIT
 maintainers			nomaintainer
 description			A toolkit to create and control daemons in different ways
 long_description	Daemons provides an easy way to wrap existing ruby \

Modified: branches/pixilla-mysqls-55/dports/ruby/rb19-launchy/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb19-launchy/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb19-launchy/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 PortGroup           ruby 1.0
 
 ruby.setup          launchy 0.3.5 gem {} rubygems ruby19
+license             ISC
 description         cross-platform application launcher class
 long_description    \
     Launchy is a helper class for launching cross-platform applications \

Modified: branches/pixilla-mysqls-55/dports/ruby/rb19-main/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/ruby/rb19-main/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/ruby/rb19-main/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -8,6 +8,7 @@
 long_description    \
     ${description}. In short, main.rb aims to drastically lower the barrier to \
     writing uniform command line applications.
+license             {Ruby BSD}
 maintainers         singingwolfboy openmaintainer
 homepage            http://github.com/ahoward/main
 platforms           darwin

Modified: branches/pixilla-mysqls-55/dports/science/arb/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/arb/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/arb/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,10 +5,9 @@
 
 name                    arb
 epoch                   1
-version                 5.3
-revision                7
+version                 5.5
 categories              science
-maintainers             mac.com:matt.cottrell 
+maintainers             mac.com:matt.cottrell
 platforms               darwin
 
 description             ARB graphical DNA, RNA and amino acid sequence analysis tool
@@ -28,10 +27,10 @@
 distname                arbsrc
 extract.suffix          .tgz
 dist_subdir             ${name}/${version}
-worksrcdir              arbsrc_8210
+worksrcdir              arbsrc_9167
 
-checksums               sha1    535b72bfbf99f498deee17824c1f167228ad2088 \
-                        rmd160  d4b240da693f903d0e8bd59f4b1f1043b6935508
+checksums               rmd160  f8b7b12cd9259b1b0f7cbbc29aca4f85585e8b9f \
+                        sha256  25246355ccaebff2e3350a553732636896f0f9f21eca3bb2bcf75cbeb7ac92a9
 
 depends_build           port:imake \
                         port:makedepend
@@ -44,22 +43,33 @@
                         port:glew \
                         port:xfig \
                         port:gv \
-                        port:xorg-libXaw
+                        port:xorg-libXaw \
+                        port:gtime
 
 patchfiles              patch-ARB-config.makefile.diff \
-                        patch-ARB-makefile.diff \
-                        patch-ARB-RNA3D_GlobalHeader.hxx.diff \
-                        patch-ARB-DARWIN.pl.diff \
                         patch-ARB-intro.fig.diff \
-                        patch-GDEHELP-Makefile.diff
-                       
+                        patch-ARB-glpng.h.diff \
+                        patch-ARB-glpng.c.diff \
+                        patch-ARB-RNA3D_Textures.cxx.diff
+
 configure               {
+                        if {${build_arch} == "ppc" || ${build_arch} == "i386"} {
+                            set is64bit 0
+                        } else {
+                            set is64bit 1
+                        }
+
+                        file copy ${worksrcpath}/config.makefile.template ${worksrcpath}/config.makefile
+                        reinplace "s|@@64BIT@@|${is64bit}|g" ${worksrcpath}/config.makefile
+                        file copy ${filespath}/arb_macsetup ${worksrcpath}/bin
+                        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/bin/arb_macsetup ${worksrcpath}/SH/arb
+                        reinplace "s|@@GPP@@|${configure.cxx}|g" ${worksrcpath}/PERL2ARB/DARWIN.PL
+                        reinplace "s|@@LIBPERLDIR@@|[exec ${prefix}/bin/perl -e "use Config; print \$Config{archlib};"]/CORE|g" ${worksrcpath}/PERL2ARB/DARWIN.PL
                         reinplace -locale C "s| sed | gsed |g" ${worksrcpath}/GDEHELP/MENUS/align.menu \
                                                      ${worksrcpath}/util/arb_check_build_env.pl \
                                                      ${worksrcpath}/arb_install.sh \
                                                      ${worksrcpath}/WINDOW/AW_status.cxx \
                                                      ${worksrcpath}/SH/example_batch_probe_match.sh \
-                                                     ${worksrcpath}/GDEHELP/GDEmenus \
                                                      ${worksrcpath}/GDEHELP/genhelp.sh \
                                                      ${worksrcpath}/GDEHELP/genhelptree.sh \
                                                      ${worksrcpath}/SOURCE_TOOLS/make_java_dependencies.sh \
@@ -68,17 +78,6 @@
                                                      ${worksrcpath}/GDEHELP/Makefile \
                                                      ${worksrcpath}/HELP_SOURCE/genhelp/Makefile \
                                                      ${worksrcpath}/GDEHELP/Makefile.helpfiles
-                        file copy ${worksrcpath}/config.makefile.template ${worksrcpath}/config.makefile
-                        file copy ${filespath}/arb_macsetup ${worksrcpath}/bin
-                        reinplace "s|@@LIBPERLDIR@@|[exec ${prefix}/bin/perl -e "use Config; print \$Config{archlib};"]/CORE|g" ${worksrcpath}/PERL2ARB/DARWIN.PL
-                        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/bin/arb_macsetup
-
-                        if {${build_arch} == "ppc" || ${build_arch} == "i386"} {
-                            set is64bit 0
-                        } else {
-                            set is64bit 1
-                        }
-                        reinplace "s|@@64BIT@@|${is64bit}|g" ${worksrcpath}/config.makefile
 }
 
 build.env-append        PREFIX=${prefix} \
@@ -86,31 +85,35 @@
                         PATH=${worksrcpath}/bin:$env(PATH)
 
 # https://trac.macports.org/ticket/33756
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
+compiler.blacklist      clang
 
 build.args              GCC=${configure.cc} \
                         GPP=${configure.cxx}
 
 destroot.keepdirs       ${destroot}${prefix}/share/arb/lib/pts
+
 destroot                {
                         # Give the default settings a recognizable name ending in .default
                         file rename ${worksrcpath}/lib/arb_tcp.dat ${worksrcpath}/lib/arb_tcp.dat.default
                         file rename ${worksrcpath}/lib/macros ${worksrcpath}/lib/macros.default
 
                         eval xinstall -m 0755 [glob ${worksrcpath}/bin/*] ${destroot}${prefix}/bin
+
                         file mkdir ${destroot}${prefix}/share/arb/bin
+                        file copy ${worksrcpath}/PERL_SCRIPTS ${destroot}${prefix}/share/arb/PERL_SCRIPTS
+                        file copy ${worksrcpath}/GDEHELP ${destroot}${prefix}/share/arb/GDEHELP
                         file copy ${worksrcpath}/lib ${destroot}${prefix}/share/arb/lib
-                        file copy ${worksrcpath}/GDEHELP ${destroot}${prefix}/share/arb/GDEHELP
+                        file copy ${worksrcpath}/SH ${destroot}${prefix}/share/arb/SH
+                        file copy ${worksrcpath}/demo.arb ${destroot}${prefix}/share/arb
+
                         file mkdir ${destroot}${prefix}/lib/help
                         file copy ${worksrcpath}/HELP_SOURCE/oldhelp ${destroot}${prefix}/lib/help
-                        file copy ${worksrcpath}/PERL_SCRIPTS ${destroot}${prefix}/share/arb/PERL_SCRIPTS
-                        file copy ${worksrcpath}/SH ${destroot}${prefix}/share/arb/SH
-                        file copy ${worksrcpath}/demo.arb ${destroot}${prefix}/share/arb
+
                         ln -s ${prefix}/bin/arb_pt_server ${destroot}${prefix}/share/arb/bin/arb_pt_server
                         ln -s ${prefix}/bin/arb_name_server ${destroot}${prefix}/share/arb/bin/arb_name_server
+
                         xinstall -m 777 -d ${destroot}${prefix}/share/arb/lib/pts
+
 }
 
 # to be investigated later
@@ -162,9 +165,13 @@
 
       enter the following command:
       source ~/.cshrc
-3)
-create a text file in your home folder called .xmodmap that contains the text below:
 
+C) to set up ARB for another user on this computer log into their account and type ${prefix}/bin/arb_macsetup
+
+************************************************************************************************************************************
+You can set up keyboard shortcuts manually by creating a text file in your home folder called .xmodmap that contains the text below:
+************************************************************************************************************************************
+
 clear Mod1
 clear Mod2
 keycode 63 = Mode_switch
@@ -173,14 +180,16 @@
 add Mod1 = Meta_L Meta_R
 add Mod2 = Mode_switch
 
-C)
-to set up ARB for another user on this computer log into their account and type ${prefix}/bin/arb_macsetup
+*******************************************************************
+Use keys Control+Command Arrow Key to jump over bases
+Use Keys Option Arrow Key to pull in bases across alignment gaps
+Use the right Command Key plus a letter key to activate a menu item
+*******************************************************************
 
-D)
-type arb to start ARB
+*****************************
+Type 'arb' to start using ARB
+*****************************
 
-***********************************************************
-
 A demo data base is located at ${prefix}/share/arb/demo.arb
 
 User generated macros, arb_tcp.dat and pt_servers have been preserved,
@@ -195,10 +204,6 @@
 ${prefix}/share/arb/lib/macros.default/
 ${prefix}/share/arb/lib/arb_tcp.dat.default
 
-Use keys Control+Command Arrow Key to jump over bases
-Use Keys Option Arrow Key to pull in bases across alignment gaps
-Use the right Command Key plus a letter key to activate a menu item
-
 These notes can be viewed at any time by typing 'port notes arb'
 
 Please cite: Wolfgang Ludwig, et al. (2004) ARB: a software environment for sequence data. Nucleic Acids Research. 32:1363-1371

Copied: branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff (from rev 100173, trunk/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-RNA3D_Textures.cxx.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- RNA3D/RNA3D_Textures.cxx.orig	2012-11-17 17:33:22.000000000 -0500
++++ RNA3D/RNA3D_Textures.cxx	2012-11-17 17:33:30.000000000 -0500
+@@ -61,7 +61,7 @@
+         pngInfo  info;
+ 
+         // Using pngLoadAndBind to set texture parameters automatically.
+-        texture[i] = pngBind(ImageFile, PNG_NOMIPMAP, PNG_ALPHA, &info, GL_CLAMP, GL_NEAREST, GL_NEAREST);
++        texture[i] = pngBind(ImageFile, GLPNG_NOMIPMAP, GLPNG_ALPHA, &info, GL_CLAMP, GL_NEAREST, GL_NEAREST);
+ 
+         if (texture[i] == 0) {
+             throw string(GBS_global_string("Error loading %s", ImageFile));

Modified: branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-config.makefile.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-config.makefile.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-config.makefile.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,14 +1,6 @@
---- config.makefile	2012-09-20 07:33:17.000000000 -0400
-+++ config.makefile.template	2012-09-20 07:34:36.000000000 -0400
-@@ -13,14 +13,14 @@
- TRACESYM := 1# insert symbols for meaningful backtraces into executables 
- 
- # Include features using OPENGL? 
--OPENGL := 1
-+OPENGL := 0
- 
- # 0 = use old PTSERVER (recommended)
- # 1 = use the new PTPan implementation as pt-server (Not tested very well, do NOT use!)
+--- config.makefile.template.orig	2012-11-17 07:59:37.000000000 -0500
++++ config.makefile.template	2012-11-17 20:32:26.000000000 -0500
+@@ -20,7 +20,7 @@
  # 2 = compile both, use old (recommended for development only)
  PTPAN := 0
  

Copied: branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.c.diff (from rev 100173, trunk/dports/science/arb/files/patch-ARB-glpng.c.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.c.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.c.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,169 @@
+--- GL/glpng/glpng.c.orig	2012-11-17 16:28:36.000000000 -0500
++++ GL/glpng/glpng.c	2012-11-17 17:26:13.000000000 -0500
+@@ -38,9 +38,9 @@
+ #include <png.h>
+ 
+ #if 0
+-#define PNG_CHECK_SIG(header,size) png_check_sig(header,size) // old libpng
++#define GLPNG_CHECK_SIG(header,size) png_check_sig(header,size) // old libpng
+ #else
+-#define PNG_CHECK_SIG(header,size) (png_sig_cmp(header,0,size)==0)
++#define GLPNG_CHECK_SIG(header,size) (png_sig_cmp(header,0,size)==0)
+ #endif
+ 
+ /* Used to decide if GL/gl.h supports the paletted extension */
+@@ -284,14 +284,14 @@
+     if (pinfo == NULL) return 0;
+ 
+     fread(header, 1, 8, fp);
+-    if (!PNG_CHECK_SIG(header, 8)) return 0;
++    if (!GLPNG_CHECK_SIG(header, 8)) return 0;
+ 
+     png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+     info = png_create_info_struct(png);
+     endinfo = png_create_info_struct(png);
+ 
+     // DH: added following lines
+-    if (setjmp(png->jmpbuf))
++    if (setjmp(png_jmpbuf(png)))
+     {
+         png_destroy_read_struct(&png, &info, &endinfo);
+         return 0;
+@@ -389,7 +389,7 @@
+     png_uint_32 i;
+ 
+     fread(header, 1, 8, fp);
+-    if (!PNG_CHECK_SIG(header, 8)) return 0;
++    if (!GLPNG_CHECK_SIG(header, 8)) return 0;
+ 
+     png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+     info = png_create_info_struct(png);
+@@ -437,12 +437,12 @@
+     if (color == PNG_COLOR_TYPE_GRAY || color == PNG_COLOR_TYPE_GRAY_ALPHA)
+         png_set_gray_to_rgb(png);
+ 
+-    if (color&PNG_COLOR_MASK_ALPHA && trans != PNG_ALPHA) {
++    if (color&PNG_COLOR_MASK_ALPHA && trans != GLPNG_ALPHA) {
+         png_set_strip_alpha(png);
+         color &= ~PNG_COLOR_MASK_ALPHA;
+     }
+ 
+-    if (!(PalettedTextures && mipmap >= 0 && trans == PNG_SOLID))
++    if (!(PalettedTextures && mipmap >= 0 && trans == GLPNG_SOLID))
+         if (color == PNG_COLOR_TYPE_PALETTE)
+             png_set_expand(png);
+ 
+@@ -493,7 +493,7 @@
+         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ 
+ #ifdef SUPPORTS_PALETTE_EXT
+-        if (PalettedTextures && mipmap >= 0 && trans == PNG_SOLID && color == PNG_COLOR_TYPE_PALETTE) {
++        if (PalettedTextures && mipmap >= 0 && trans == GLPNG_SOLID && color == PNG_COLOR_TYPE_PALETTE) {
+             png_colorp pal;
+             int cols;
+             GLint intf;
+@@ -517,7 +517,7 @@
+         }
+         else
+ #endif
+-            if (trans == PNG_SOLID || trans == PNG_ALPHA || color == PNG_COLOR_TYPE_RGB_ALPHA || color == PNG_COLOR_TYPE_GRAY_ALPHA) {
++            if (trans == GLPNG_SOLID || trans == GLPNG_ALPHA || color == PNG_COLOR_TYPE_RGB_ALPHA || color == PNG_COLOR_TYPE_GRAY_ALPHA) {
+                 GLenum glformat;
+                 GLint glcomponent;
+ 
+@@ -542,9 +542,9 @@
+                         return 0;
+                 }
+ 
+-                if (mipmap == PNG_BUILDMIPMAPS)
++                if (mipmap == GLPNG_BUILDMIPMAPS)
+                     Build2DMipmaps(glcomponent, width, height, glformat, data, 1);
+-                else if (mipmap == PNG_SIMPLEMIPMAPS)
++                else if (mipmap == GLPNG_SIMPLEMIPMAPS)
+                     Build2DMipmaps(glcomponent, width, height, glformat, data, 0);
+                 else
+                     glTexImage2D(GL_TEXTURE_2D, mipmap, glcomponent, width, height, 0, glformat, GL_UNSIGNED_BYTE, data);
+@@ -574,13 +574,13 @@
+ #define ALPHA *q
+ 
+                 switch (trans) {
+-                    case PNG_CALLBACK:
++                    case GLPNG_CALLBACK:
+                         FORSTART
+                             ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
+                         FOREND
+                             break;
+ 
+-                    case PNG_STENCIL:
++                    case GLPNG_STENCIL:
+                         FORSTART
+                             if (r == StencilRed && g == StencilGreen && b == StencilBlue)
+                                 ALPHA = 0;
+@@ -589,48 +589,48 @@
+                         FOREND
+                             break;
+ 
+-                    case PNG_BLEND1:
++                    case GLPNG_BLEND1:
+                         FORSTART
+                             a = r+g+b;
+                         if (a > 255) ALPHA = 255; else ALPHA = a;
+                         FOREND
+                             break;
+ 
+-                    case PNG_BLEND2:
++                    case GLPNG_BLEND2:
+                         FORSTART
+                             a = r+g+b;
+                         if (a > 255*2) ALPHA = 255; else ALPHA = a/2;
+                         FOREND
+                             break;
+ 
+-                    case PNG_BLEND3:
++                    case GLPNG_BLEND3:
+                         FORSTART
+                             ALPHA = (r+g+b)/3;
+                         FOREND
+                             break;
+ 
+-                    case PNG_BLEND4:
++                    case GLPNG_BLEND4:
+                         FORSTART
+                             a = r*r+g*g+b*b;
+                         if (a > 255) ALPHA = 255; else ALPHA = a;
+                         FOREND
+                             break;
+ 
+-                    case PNG_BLEND5:
++                    case GLPNG_BLEND5:
+                         FORSTART
+                             a = r*r+g*g+b*b;
+                         if (a > 255*2) ALPHA = 255; else ALPHA = a/2;
+                         FOREND
+                             break;
+ 
+-                    case PNG_BLEND6:
++                    case GLPNG_BLEND6:
+                         FORSTART
+                             a = r*r+g*g+b*b;
+                         if (a > 255*3) ALPHA = 255; else ALPHA = a/3;
+                         FOREND
+                             break;
+ 
+-                    case PNG_BLEND7:
++                    case GLPNG_BLEND7:
+                         FORSTART
+                             a = r*r+g*g+b*b;
+                         if (a > 255*255) ALPHA = 255; else ALPHA = (int) sqrt(a);
+@@ -642,9 +642,9 @@
+ #undef FOREND
+ #undef ALPHA
+ 
+-                if (mipmap == PNG_BUILDMIPMAPS)
++                if (mipmap == GLPNG_BUILDMIPMAPS)
+                     Build2DMipmaps(4, width, height, GL_RGBA, data2, 1);
+-                else if (mipmap == PNG_SIMPLEMIPMAPS)
++                else if (mipmap == GLPNG_SIMPLEMIPMAPS)
+                     Build2DMipmaps(4, width, height, GL_RGBA, data2, 0);
+                 else
+                     glTexImage2D(GL_TEXTURE_2D, mipmap, 4, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data2);

Copied: branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.h.diff (from rev 100173, trunk/dports/science/arb/files/patch-ARB-glpng.h.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.h.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/science/arb/files/patch-ARB-glpng.h.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,49 @@
+--- GL/glpng/glpng.h.orig	2012-11-17 16:18:10.000000000 -0500
++++ GL/glpng/glpng.h	2012-11-17 16:20:13.000000000 -0500
+@@ -47,28 +47,28 @@
+ #endif
+ 
+     /* Mipmapping parameters */
+-#define PNG_NOMIPMAPS      0 /* No mipmapping                        */
+-#define PNG_BUILDMIPMAPS  -1 /* Calls a clone of gluBuild2DMipmaps() */
+-#define PNG_SIMPLEMIPMAPS -2 /* Generates mipmaps without filtering  */
++#define GLPNG_NOMIPMAPS      0 /* No mipmapping                        */
++#define GLPNG_BUILDMIPMAPS  -1 /* Calls a clone of gluBuild2DMipmaps() */
++#define GLPNG_SIMPLEMIPMAPS -2 /* Generates mipmaps without filtering  */
+ 
+     /* Who needs an "S" anyway? */
+-#define PNG_NOMIPMAP     PNG_NOMIPMAPS
+-#define PNG_BUILDMIPMAP  PNG_BUILDMIPMAPS
+-#define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
++#define GLPNG_NOMIPMAP     GLPNG_NOMIPMAPS
++#define GLPNG_BUILDMIPMAP  GLPNG_BUILDMIPMAPS
++#define GLPNG_SIMPLEMIPMAP GLPNG_SIMPLEMIPMAPS
+ 
+     /* Transparency parameters */
+-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
+-#define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
+-#define PNG_SOLID     -1 /* No transparency                                */
+-#define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
+-#define PNG_BLEND1     1 /* a = r+g+b                                      */
+-#define PNG_BLEND2     2 /* a = (r+g+b)/2                                  */
+-#define PNG_BLEND3     3 /* a = (r+g+b)/3                                  */
+-#define PNG_BLEND4     4 /* a = r*r+g*g+b*b                                */
+-#define PNG_BLEND5     5 /* a = (r*r+g*g+b*b)/2                            */
+-#define PNG_BLEND6     6 /* a = (r*r+g*g+b*b)/3                            */
+-#define PNG_BLEND7     7 /* a = (r*r+g*g+b*b)/4                            */
+-#define PNG_BLEND8     8 /* a = sqrt(r*r+g*g+b*b)                          */
++#define GLPNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
++#define GLPNG_ALPHA     -2 /* Use alpha channel in GLPNG file, if there is one */
++#define GLPNG_SOLID     -1 /* No transparency                                */
++#define GLPNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
++#define GLPNG_BLEND1     1 /* a = r+g+b                                      */
++#define GLPNG_BLEND2     2 /* a = (r+g+b)/2                                  */
++#define GLPNG_BLEND3     3 /* a = (r+g+b)/3                                  */
++#define GLPNG_BLEND4     4 /* a = r*r+g*g+b*b                                */
++#define GLPNG_BLEND5     5 /* a = (r*r+g*g+b*b)/2                            */
++#define GLPNG_BLEND6     6 /* a = (r*r+g*g+b*b)/3                            */
++#define GLPNG_BLEND7     7 /* a = (r*r+g*g+b*b)/4                            */
++#define GLPNG_BLEND8     8 /* a = sqrt(r*r+g*g+b*b)                          */
+ 
+     typedef struct {
+         unsigned int Width;

Modified: branches/pixilla-mysqls-55/dports/science/clhep/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/clhep/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/clhep/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           cmake 1.0
 
 name                clhep
-version             2.1.2.5
+version             2.1.3.0
 categories          science
 maintainers         pd.infn.it:cristiano.fontana
 license             LGPL-3
@@ -17,8 +17,8 @@
 extract.suffix      .tgz
 master_sites        http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/
 
-checksums           rmd160  d9a5aa86b18000c9b480072cf20967c20011c94a \
-                    sha256  f4a05768c87a46c512690b103f267d8f4294a1df65cd8649920573cb93e562d5
+checksums           rmd160  9ae973803e7ad37e019e1089cbb1c7d803585f9d \
+                    sha256  3a4b70693dab627fa34393a53277db8d14332f09eb19b7998df37239c9b81e3f
 
 worksrcdir          ${version}/CLHEP
 
@@ -39,5 +39,16 @@
     }
 }
 
+# clean the files bypassing destroot (a bug in 2.1.2.5)
+# may be removed in November 2013
+pre-activate {
+    foreach afile {lib/libCLHEP.a lib/libCLHEP.dylib} {
+        set filepath ${prefix}/${afile}
+        if {[registry_file_registered ${filepath}] == "0"} {
+            catch {delete ${filepath}}
+        }
+    }
+}
+
 livecheck.type      regex
 livecheck.regex     {<b>([0-9.]+)</b>}

Modified: branches/pixilla-mysqls-55/dports/science/ds9/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/ds9/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/ds9/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -99,3 +99,6 @@
     xinstall ${worksrcpath}/bin/ds9 ${destroot}${prefix}/bin
     xinstall -m 644 ${worksrcpath}/bin/ds9.zip ${destroot}${prefix}/bin
 }
+
+livecheck.url           ${homepage}/site/Download.html
+livecheck.regex         {DS9 Version (\d+(\.\d+)+)}


Property changes on: branches/pixilla-mysqls-55/dports/science/ds9/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: branches/pixilla-mysqls-55/dports/science/geos/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/geos/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/geos/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem       1.0
 
 name             geos
-version          3.3.5
+version          3.3.6
 license          LGPL-2.1
 categories       science
 platforms        darwin
@@ -19,8 +19,8 @@
 master_sites     http://download.osgeo.org/geos/
 use_bzip2        yes
 
-checksums        sha1    791e2b36a9a6114c7f213fae3fc995960c35a428 \
-                 rmd160  bbfa2ce6719db9330af77dbe619977c04bb34706
+checksums           sha1    454c9b61f158de509db60a69512414a0a1b0743b \
+                    rmd160  bc7d2fdb8a8df309b0b24988167e1166325b92a4
 
 
 if {${configure.compiler} == "llvm-gcc-4.2"} {

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,86 +1,461 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
+PortGroup           cmake 1.0
 
-name			gnuradio
-version         3.3.0
-maintainers		michaelld
-description		GNU Radio META-port installer.
-long_description GNU Radio META-port installer: \
-Provides every installable package of GNU Radio using MacPorts. \
-This package does not do any compiling or installation itself.
+name                gnuradio
+maintainers		    michaelld openmaintainer
 
-categories		science
-homepage        http://gnuradio.org/
+description		    GNU Radio Software Defined Radio
 
-distfiles
+categories		    science
+homepage            http://gnuradio.org/
+license             GPL-3
+platforms           darwin macosx
 
-platforms		darwin macosx
+dist_subdir         gnuradio
 
-depends_lib		port:gnuradio-atsc \
-                port:gnuradio-audio-jack \
-				port:gnuradio-audio-osx \
-				port:gnuradio-audio-portaudio \
-				port:gnuradio-companion \
-				port:gnuradio-cvsd-vocoder \
-				port:gnuradio-examples \
-				port:gnuradio-gpio \
-				port:gnuradio-gsm-fr-vocoder \
-				port:gnuradio-msdd6000 \
-				port:gnuradio-noaa \
-				port:gnuradio-pager \
-				port:gnuradio-qtgui \
-				port:gnuradio-radar-mono \
-				port:gnuradio-radio-astronomy \
-				port:gnuradio-sounder \
-				port:gnuradio-trellis \
-				port:gnuradio-usrp \
-				port:gnuradio-utils \
-				port:gnuradio-video-sdl
+if {${subport} == ${name}} {
 
-use_configure	no
-build			{}
-destroot		{
-	xinstall -d ${destroot}${prefix}/share/doc/${name}-${version}
-	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}-${version}/README.MacPorts"
+    long_description    ${description}: \
+        This port is kept up with the GNU Radio release, which is typically updated every few months.
+
+    version			3.6.2
+
+    conflicts       gnuradio-next gnuradio-devel
+
+    master_sites.mirror_subdir gnuradio
+    distname		gnuradio-${version}
+    master_sites	http://gnuradio.org/releases/gnuradio gnu
+
+    checksums \
+        rmd160  111ecf4bcdeb0b48be01fd0c9312c60093cedc6d \
+        sha256  4ce84bf9c6591b5ddc2c384e03e40fc2f0cb8cd1add485ee2d6f26052cc6de35
+
+    if {${configure.compiler} == "clang"} {
+        patchfiles patch-clang.diff
+    }
+
+    post-configure {
+
+        # make sure the build depends on the local version of GRUEL,
+        # not any already-installed version
+
+        if {[file exists ${prefix}/include/gruel/api.h]} {
+            foreach fixfile [exec find ${build.dir} -name "build\.make"] {
+                reinplace "s|${prefix}/include/gruel/|${worksrcpath}/gruel/src/include/gruel/|g" ${fixfile}
+            }
+        }
+    }
+
+    livecheck.type  regex
+    livecheck.url	http://gnuradio.org/releases/gnuradio/?C=M&O=D
+    livecheck.regex gnuradio-(\[0-9\.\]+\[0-9\])\\.
+
 }
 
+subport gnuradio-devel {
+
+    long_description    ${description}: \
+        This port is kept up with the GNU Radio GIT Master branch, which is typically updated every few days to week.  This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.
+
+    version             3.6.3_20121127
+
+    conflicts           gnuradio gnuradio-next
+
+    fetch.type          git
+    git.url             git://gnuradio.org/gnuradio.git
+    git.branch          61b99449eeaaebe5ccc10758549add9c9e23f710
+
+    post-configure {
+
+        # make sure the build depends on the local version of GRUEL,
+        # not any already-installed version
+
+        if {[file exists ${prefix}/include/gruel/api.h]} {
+            foreach fixfile [exec find ${build.dir} -name "build\.make"] {
+                reinplace "s|${prefix}/include/gruel/|${worksrcpath}/gruel/src/include/gruel/|g" ${fixfile}
+            }
+        }
+    }
+
+    livecheck.type      none
+
+}
+
+subport gnuradio-next {
+
+    long_description    ${description}: \
+        This port is kept up with the GNU Radio GIT Next branch, which is typically updated every few days to week.  This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.
+
+    version             3.7.0_20121127
+
+    conflicts           gnuradio gnuradio-devel
+
+    fetch.type          git
+    git.url             git://gnuradio.org/gnuradio.git
+    git.branch          e5929906700f3d6fa474fc5d9a8650b1fafbc2a1
+
+    post-configure {
+
+        # make sure the build depends on the local version of GRUEL,
+        # not any already-installed version
+
+        if {[file exists ${prefix}/include/gruel/api.h]} {
+            foreach fixfile [exec find ${build.dir} -name "build\.make"] {
+                reinplace "s|${prefix}/include/gruel/|${worksrcpath}/gruel/src/include/gruel/|g" ${fixfile}
+            }
+        }
+    }
+
+    livecheck.type      none
+
+}
+
 use_parallel_build	yes
 
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+depends_lib-append	\
+    port:boost \
+    port:cppunit \
+    port:fftw-3-single \
+    port:pkgconfig
+
+# do VPATH build
+
+post-extract        { file mkdir ${workpath}/build }
+configure.dir       ${workpath}/build
+build.dir           ${workpath}/build
+
+# VOLK compiles best with GCC of some type;
+# print a warning if using clang
+
+pre-configure {
+    if {${configure.compiler} == "clang"} {
+        ui_msg "WARNING: GNU Radio's VOLK component (which handles vector optimized instructions and routines) compiles best when using GCC.  The selected compiler is CLANG, which will result in a fully functioning GNU Radio install but the VOLK component will not utilize the CPU's capabilities."
+    }
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
+# always enable VOLK, with or without orc
+
+configure.args-append -DENABLE_VOLK=ON
+
+# set last configure argument to the reletive path
+# to the top-level cmake source
+
+configure.post_args ../${worksrcdir}
+
+# be verbose when building, for debugging purposes
+
+build.post_args VERBOSE=1
+
+# shortcut to installing all variants except Python
+
+variant full \
+    requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
+    description {Enable all variants except python} {}
+
+# set Python variants
+
+set pythons_suffixes {26 27}
+global chosen_python_suffix
+set chosen_python_suffix ""
+
+set pythons_ports {}
+foreach s ${pythons_suffixes} {
+    lappend pythons_ports python${s}
 }
 
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
+foreach s ${pythons_suffixes} {
+    set p python${s}
+    set v [join [split ${s} ""] "."]
+    set i [lsearch -exact ${pythons_ports} ${p}]
+    set c [lreplace ${pythons_ports} ${i} ${i}]
+    eval [subst {
+        variant ${p} description "Build GNU Radio using Python ${v}" \
+            conflicts ${c} {
+
+            set chosen_python_suffix ${s}
+
+            # specify the Python dependencies
+
+            depends_lib-append \
+                port:${p} \
+                port:py${s}-numpy \
+                port:py${s}-cheetah
+
+            # specify the Python version to use
+
+            configure.args-append \
+                -DPYTHON_EXECUTABLE=${prefix}/bin/python${v} \
+                -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Headers \
+                -DPYTHON_LIBRARY=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Python
+
+            # check for variants that require Python
+
+            if {[variant_isset docs]} {
+
+                depends_lib-append \
+                    port:py${s}-sphinx
+
+                configure.args-append \
+                    -DSPHINX_EXECUTABLE=${prefix}/bin/sphinx-build-${v}
+
+            }
+
+            if {[variant_isset grc]} {
+
+                depends_lib-append \
+                    port:py${s}-lxml \
+                    port:py${s}-gtk
+
+            }
+
+            if {[variant_isset qtgui]} {
+
+                depends_lib-append \
+                    port:py${s}-pyqt4
+
+            }
+
+            if {[variant_isset wxgui]} {
+
+                depends_lib-append \
+                    port:py${s}-wxpython-devel
+
+            }
+
+            post-destroot {
+
+                if {[variant_isset swig]} {
+
+                    # move python scripts from
+                    # ${prefix}/lib/python${v}/site-packages/* to
+                    # ${frameworks_dir}/Python.framework/Versions/${v}/
+                    #   lib/python${v}/site-packages/*
+
+                    xinstall -m 755 -d ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}
+                    move ${destroot}${prefix}/lib/python${v}/site-packages \
+                        ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}
+
+                }
+            }
+        }
+    }]
 }
 
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
+# Python is required; default to 2.7
+
+if {![variant_isset python26] && ![variant_isset python27]} {
+    default_variants +python27
 }
 
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
+# Make sure -python27 was not specified alone
+
+if {![variant_isset python26] && ![variant_isset python27]} {
+    ui_error "GNU Radio requires a Python to be selected; you cannot use -python27 as a variant alone."
+    return -code error "Invalid variant selection"
 }
 
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
+variant docs description "Install GNU Radio documentation" {
+
+    depends_lib-append \
+        port:doxygen \
+        port:xmlto
+
+    configure.args-append \
+        -DENABLE_DOXYGEN=ON \
+        -DENABLE_SPHINX=ON
+
 }
 
-livecheck.type  regex
-livecheck.url	http://ftp.gnu.org/gnu/gnuradio/?C=M&O=D
-livecheck.regex gnuradio-(\[0-9\.\]+\[0-9\])\\.
+if {![variant_isset docs]} {
+
+    configure.args-append \
+        -DENABLE_DOXYGEN=OFF \
+        -DENABLE_SPHINX=OFF
+
+}
+
+variant grc description "Install GNU Radio Companion" {
+
+    configure.args-append \
+        -DENABLE_GRC=ON
+
+}
+
+if {![variant_isset grc]} {
+
+    configure.args-append \
+        -DENABLE_GRC=OFF
+
+}
+
+variant qtgui description "Install GNU Radio with support for Qt GUI" {
+
+    depends_lib-append \
+        port:qt4-mac \
+        path:lib/libqwt.dylib:qwt \
+        port:qwtplot3d
+
+    configure.args-append \
+        ENABLE_GR_QTGUI=ON \
+        -DQT_QMAKE_EXECUTABLE=${prefix}/bin/qmake
+
+}
+
+if {![variant_isset qtgui]} {
+
+    configure.args-append \
+        -DENABLE_GR_QTGUI=OFF \
+        -DQT_QMAKE_EXECUTABLE=
+
+}
+
+variant wxgui description "Install GNU Radio with support for Wx GUI" {
+
+    depends_lib-append \
+        port:wxWidgets-devel
+
+    configure.args-append \
+        -DENABLE_GR_WXGUI=ON
+
+}
+
+if {![variant_isset wxgui]} {
+
+    configure.args-append \
+        -DENABLE_GR_WXGUI=OFF
+
+}
+
+variant uhd description "Install GNU Radio with support for UHD" {
+
+    depends_lib-append \
+        path:lib/libuhd.dylib:uhd
+
+    configure.args-append \
+        -DENABLE_GR_UHD=ON \
+        -DUHD_INCLUDE_DIRS=${prefix}/include \
+        -DUHD_LIBRARIES=${prefix}/lib/libuhd.dylib
+
+}
+
+if {![variant_isset uhd]} {
+
+    configure.args-append \
+        -DENABLE_GR_UHD=OFF \
+        -DUHD_INCLUDE_DIRS= \
+        -DUHD_LIBRARIES=
+
+}
+
+variant orc description "Install GNU Radio Volk with support for ORC" {
+
+    depends_lib-append \
+        port:orc
+
+    configure.args-append \
+        -DORCC_EXECUTABLE=${prefix}/bin/orcc
+
+}
+
+if {![variant_isset orc]} {
+
+    configure.args-append \
+        -DORCC_EXECUTABLE=
+
+}
+
+variant wavelet description "Install GNU Radio Wavelet component" {
+
+    depends_lib-append \
+        port:gsl
+
+    configure.args-append \
+        ENABLE_GR_WAVELET=ON
+
+}
+
+if {![variant_isset wavelet]} {
+
+    configure.args-append \
+        -DENABLE_GR_WAVELET=OFF
+
+}
+
+variant jack description "Install GNU Radio with support for JACK audio" {
+
+    depends_lib-append \
+        port:jack
+
+    configure.args-append \
+        -DJACK_INCLUDE_DIR=${prefix}/include \
+        -DJACK_LIBRARY=${prefix}/lib/libjack.dylib
+
+}
+
+if {![variant_isset jack]} {
+
+    configure.args-append \
+        -DJACK_INCLUDE_DIR= \
+        -DJACK_LIBRARY=
+
+}
+
+variant portaudio description "Install GNU Radio with support for portaudio audio" {
+
+    depends_lib-append \
+        port:portaudio
+
+    configure.args-append \
+        -DPORTAUDIO_INCLUDE_DIRS=${prefix}/include \
+        -DPORTAUDIO_LIBRARIES=${prefix}/lib/libportaudio.dylib
+
+}
+
+if {![variant_isset portaudio]} {
+
+    configure.args-append \
+        -DPORTAUDIO_INCLUDE_DIRS= \
+        -DPORTAUDIO_LIBRARIES=
+
+}
+
+variant swig description "Install GNU Radio with support for SWIG-base Python bindings" {
+
+    depends_lib-append \
+        port:swig-python
+
+    configure.args-append \
+        -DSWIG_EXECUTABLE=${prefix}/bin/swig
+
+}
+
+if {![variant_isset swig]} {
+
+    configure.args-append \
+        -DSWIG_EXECUTABLE=
+
+}
+
+variant sdl description "Install GNU Radio with support for SDL-based video" {
+
+    depends_lib-append \
+        port:libsdl
+
+    configure.args-append \
+        -DENABLE_GR_VIDEO_SDL=ON \
+        -DSDLMAIN_LIBRARY=${prefix}/lib/libSDLmain.a \
+        -DSDL_INCLUDE_DIR=${prefix}/include/SDL
+
+}
+
+if {![variant_isset sdl]} {
+
+    configure.args-append \
+        -DENABLE_GR_VIDEO_SDL=OFF \
+        -DSDLMAIN_LIBRARY= \
+        -DSDL_INCLUDE_DIR=
+
+}

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-atsc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-atsc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-atsc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-atsc
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		ATSC Component of GNU Radio.
 long_description ATSC Component of GNU Radio: \
 Provides ATSC (HDTV) transmitter and receiver blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build	port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-atsc
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-audio-jack/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-audio-jack/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-audio-jack/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,76 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-audio-jack
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		JACK component of GNU Radio.
 long_description JACK component of GNU Radio: \
 Provides JACK audio source and sink blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core \
-				port:jack
-
-archcheck.files lib/libgnuradio-core.dylib \
-				lib/libjack.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-audio-jack
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-audio-osx/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-audio-osx/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-audio-osx/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-audio-osx
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Mac OS X Audio component of GNU Radio.
 long_description Mac OS X Audio component of GNU Radio: \
 Provides Mac OS X native audio input and output blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-audio-osx
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-audio-portaudio/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-audio-portaudio/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-audio-portaudio/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,76 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-audio-portaudio
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		PortAudio component of GNU Radio.
 long_description PortAudio component of GNU Radio: \
 Provides PortAudio audio source and sink blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core \
-				port:portaudio
-
-archcheck.files lib/libgnuradio-core.dylib \
-				lib/libportaudio.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-audio-portaudio
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-companion/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-companion/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-companion/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,78 +4,26 @@
 PortSystem 1.0
 
 name			gnuradio-companion
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		GRC component of GNU Radio.
 long_description GRC component of GNU Radio: \
 GNU Radio Companion (GRC): Graphical interface to editing, \
 creating, and running applications which use GNU Radio.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_lib		port:gnuradio-wxgui
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--with-gr-wxgui \
-				--enable-grc
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25 \
-					   port:py25-lxml \
-					   port:py25-cheetah \
-					   port:py25-gtk
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26 \
-					   port:py26-lxml \
-					   port:py26-cheetah \
-				   	   port:py26-gtk
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27 \
-					   port:py27-lxml \
-					   port:py27-cheetah \
-				   	   port:py27-gtk
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-core/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-core/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-core/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,81 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-core
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		GNU Radio Core component of GNU Radio.
 long_description GNU Radio Core component of GNU Radio: \
 Core functionality for all of GNU Radio.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_lib		port:gnuradio-gruel
-
-archcheck.files lib/libgruel.dylib
-
-# fix up configure to handle 10.7 and up correctly.
-patchfiles      patch-configure.diff
-
-# unknown directive .version "01.01"
-compiler.blacklist  clang
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--enable-gnuradio-core
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25 \
-					   port:py25-numpy
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26 \
-					   port:py26-numpy
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27 \
-					   port:py27-numpy
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-cvsd-vocoder/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-cvsd-vocoder/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-cvsd-vocoder/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,75 +2,28 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-cvsd-vocoder
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		CVSD Vocoder component of GNU Radio.
 long_description CVSD Vocoder component of GNU Radio: \
 Provides Continuously Variable Slope Delta Modulation (CVSD) \
 vocoder source and sink blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-cvsd-vocoder
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-examples/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-examples/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-examples/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-examples
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Examples component of GNU Radio.
 long_description Examples component of GNU Radio: \
 Python (GRC and plain scripts) and C++ examples for using GNU Radio.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gnuradio-examples
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-gpio/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-gpio/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-gpio/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,72 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
 
 name			gnuradio-gpio
-version			3.3.0
-maintainers		nomaintainer
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		GPIO component of GNU Radio.
 long_description GPIO component of GNU Radio: \
 Provides GPIO block.
 
 categories		science
-license			GPL-3+
+license			GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build	port:pkgconfig port:swig-python
-depends_lib		port:gnuradio-gruel port:usrp
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-usrp \
-				--enable-gr-gpio
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.python      ${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.python      ${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.python      ${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-grc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-grc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-grc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,9 +4,8 @@
 PortSystem 1.0
 
 name			gnuradio-grc
-version			3.2.2
-revision        2
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		GRC component of GNU Radio.
 long_description GRC component of GNU Radio: \
 GNU Radio Companion (GRC): Graphical interface to editing, \
@@ -15,19 +14,20 @@
 please uninstall this port and install that one.\n
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-distfiles
-
 platforms		darwin macosx
 
-use_configure	no
-build			{}
-destroot		{}
+# disable this port
 
-pre-extract {
-    ui_msg "\n\
-NOTE: This port has been renamed to 'gnuradio-companion'\; \n\
-please uninstall this port and install that one.\n"
-    error "obsolete port"
+replaced_by gnuradio
+
+livecheck.type none
+
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
+
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-gruel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-gruel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-gruel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,12 +2,10 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-gruel
-version         3.3.0
-maintainers		michaelld
+version         3.6.2
+maintainers		michaelld openmaintainer
 description		GRUEL component of GNU Radio.
 long_description GRUEL component of GNU Radio: \
 GNU Radio Utility Etcetera Library - \
@@ -15,79 +13,18 @@
 on the full GNU Radio core or other libraries.
 
 categories		science
-license         GPL-3+
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-# gruel gets built by the main configure script, which requires a
-# whole slew of ports, included here and then making all other
-# gnuradio ports dependent on this one.
-
-depends_build	port:gawk \
-				port:guile \
-				port:libtool \
-				port:pkgconfig \
-				port:swig-python
-
-depends_lib		port:boost \
-				port:cppunit \
-				port:fftw-3-single \
-				port:gsl \
-				port:zlib
-
-archcheck.files lib/libboost_thread-mt.dylib \
-				lib/libcppunit.dylib \
-				lib/libfftw3f.dylib \
-				lib/libgsl.dylib \
-				lib/libz.dylib
-
-configure.args	--disable-all-components \
-				--enable-gruel
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-gsm-fr-vocoder/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-gsm-fr-vocoder/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-gsm-fr-vocoder/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-gsm-fr-vocoder
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		GSM FR Vocoder Component of GNU Radio.
 long_description GSM FR Vocoder Component of GNU Radio: \
 Provides GSM FR voice encoder and decoder blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-gsm-fr-vocoder
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-mblock/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-mblock/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-mblock/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,13 +2,10 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-mblock
-version			3.2.2
-revision        2
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Message block GNU Radio component.
 long_description Message block GNU Radio component: \
 Message blocks (or m-blocks) are a GNU Radio extension, \
@@ -17,67 +14,18 @@
 will not be updated or maintained past GNU Radio version ${version}.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		3fedcd64c2f51671cc1417b4c1e06834 \
-				sha1	6177d13e42937383e622edadc0b9f06391d0e5fc \
-				rmd160	42d1a496400ebc77e054f59d9f33cc8ba24a4234
-
-depends_lib		port:gnuradio-pmt
-
-archcheck.files lib/libpmt.dylib
-
-notes "${name} is deprecated, and will not be updated or maintained past GNU Radio version ${version}."
-
-# version 3.2.2 requires this; next version won't
-patchfiles		patch-configure.diff
-
-configure.args	--disable-all-components \
-				--with-omnithread \
-				--with-pmt \
-				--enable-mblock
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-    configure.env      PYTHON=${prefix}/bin/python2.5
-    depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-    configure.env      PYTHON=${prefix}/bin/python2.6
-    depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-    configure.env      PYTHON=${prefix}/bin/python2.7
-    depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-    default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-msdd6000/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-msdd6000/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-msdd6000/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-msdd6000
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		MSDD6000 Component of GNU Radio.
 long_description MSDD6000 Component of GNU Radio: \
 Provides an interface block between the Softronics MSDD6000 and GNU Radio.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-msdd6000
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-noaa/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-noaa/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-noaa/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,77 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-noaa
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		NOAA Component of GNU Radio.
 long_description NOAA Component of GNU Radio: \
 Provides a NOAA POES HRPT receiver / demodulator block.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_lib		port:gnuradio-wxgui \
-                port:gnuradio-companion
-
-archcheck.files lib/libgruel.dylib \
-                lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--with-gr-wxgui \
-				--with-grc \
-				--enable-gr-noaa
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-omnithread/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-omnithread/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-omnithread/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,97 +2,28 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-omnithread
-version			3.2.2
-revision        2
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Omnithread component of GNU Radio.
 long_description Omnithread component of GNU Radio: \
 a cross-platform C++ thread library. ${name} is deprecated, and \
 will not be updated or maintained past GNU Radio version ${version}.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		3fedcd64c2f51671cc1417b4c1e06834 \
-				sha1	6177d13e42937383e622edadc0b9f06391d0e5fc \
-				rmd160	42d1a496400ebc77e054f59d9f33cc8ba24a4234
-
-# gromnithread gets built by the main configure script, which requires
-# a whole slew of ports, included here and then making all other
-# remaining GNU Radio 3.2.2 ports dependent on this one.
-
-depends_build   port:gawk \
-                port:guile \
-                port:libtool \
-                port:pkgconfig \
-                port:swig-python
-
-depends_lib     port:boost \
-                port:cppunit \
-                port:fftw-3-single \
-                port:gsl \
-                port:zlib
-
-archcheck.files lib/libboost_thread-mt.dylib \
-                lib/libcppunit.dylib \
-                lib/libfftw3f.dylib \
-                lib/libgsl.dylib \
-                lib/libz.dylib
-
-notes "${name} is deprecated, and will not be updated \
-or maintained past GNU Radio version ${version}."
-
-# version 3.2.2 requires this; next version won't
-patchfiles		patch-configure.diff
-
-configure.args	--disable-all-components \
-				--enable-omnithread
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-    configure.env      PYTHON=${prefix}/bin/python2.5
-    depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-    configure.env      PYTHON=${prefix}/bin/python2.6
-    depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-    configure.env      PYTHON=${prefix}/bin/python2.7
-    depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-    default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-pager/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-pager/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-pager/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-pager
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Pager Component of GNU Radio.
 long_description Pager Component of GNU Radio: \
 Provides FLEX radio-pager receiver / demodulator block.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-pager
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-pmt/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-pmt/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-pmt/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,13 +2,10 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-pmt
-version			3.2.2
-revision        2
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		PMT component of GNU Radio.
 long_description PMT component of GNU Radio: \
 polymorphic types using C++.  In GNU Radio version 3.3, \
@@ -16,69 +13,18 @@
 using the port 'gnuradio-gruel' instead of this one.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		3fedcd64c2f51671cc1417b4c1e06834 \
-				sha1	6177d13e42937383e622edadc0b9f06391d0e5fc \
-				rmd160	42d1a496400ebc77e054f59d9f33cc8ba24a4234
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-omnithread
-
-archcheck.files lib/libgromnithread.dylib
-
-notes "In GNU Radio version 3.3, \
-${name} was moved into gnuradio-gruel.  Please consider \
-using the port 'gnuradio-gruel' instead of this one."
-
-# version 3.2.2 requires this; next version won't
-patchfiles		patch-configure.diff
-
-configure.args	--disable-all-components \
-				--with-omnithread \
-				--enable-pmt
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-    configure.env      PYTHON=${prefix}/bin/python2.5
-    depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-    configure.env      PYTHON=${prefix}/bin/python2.6
-    depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-    configure.env      PYTHON=${prefix}/bin/python2.7
-    depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-    default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-qtgui/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-qtgui/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-qtgui/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,94 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
-PortGroup qt4 1.0
 
 name            gnuradio-qtgui
-version         3.3.0
-revision        2
-maintainers     michaelld
+version         3.6.2
+maintainers     michaelld openmaintainer
 description     Qt GUI component of GNU Radio.
 long_description Qt GUI component of GNU Radio: \
 Qt-based GUI widgets.
 
 categories      science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir     gnuradio
-master_sites.mirror_subdir gnuradio
-distname        gnuradio-${version}
-master_sites    gnu
+replaced_by gnuradio
 
-platforms       darwin macosx
+livecheck.type none
 
-checksums       md5     cef9ef65d626e1273c6381966ae9d4bc \
-                sha1    41d5c177b173ce73404f5fe539b013c82600f73f \
-                rmd160  ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_lib     port:gnuradio-core \
-                port:qwtplot3d \
-                path:lib/libqwt.dylib:qwt-devel
-
-archcheck.files lib/libgnuradio-core.dylib \
-                lib/libqwtplot3d.dylib \
-                lib/libqwt.dylib
-
-# fix various 'time' functions that are not on OSX;
-# should be unnecessary in version 3.3.1.
-patchfiles      patch_gr-qtgui_src_lib_highResTimeFunctions.h.diff
-
-configure.args  --disable-all-components \
-                --with-gruel \
-                --with-gnuradio-core \
-                --enable-gr-qtgui \
-                --with-qwt-libdir=${prefix}/lib \
-                --with-qwt-incdir=${prefix}/include/qwt \
-                --with-qwtplot3d-libdir=${prefix}/lib \
-                --with-qwtplot3d-incdir=${prefix}/include/qwtplot3d
-
-# Include the Qt framework directory; GNU Radio 3.3.0's configure
-# script ignores this part of the QtCore PKGCONFIG file.
-configure.ldflags-append -F${qt_dir}/lib
-
-use_parallel_build yes
-
-variant docs description "build documentation for ${name}" {
-    configure.args-append --enable-doxygen --enable-docs
-    depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-    configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-    configure.env      PYTHON=${prefix}/bin/python2.5
-    depends_lib-append port:python25 \
-                       port:py25-pyqt4
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-    configure.env      PYTHON=${prefix}/bin/python2.6
-    depends_lib-append port:python26 \
-                       port:py26-pyqt4
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-    configure.env      PYTHON=${prefix}/bin/python2.7
-    depends_lib-append port:python27 \
-                       port:py27-pyqt4
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-    default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-radar-mono/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-radar-mono/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-radar-mono/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,12 +2,10 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-radar-mono
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Radar Mono Component of GNU Radio.
 long_description Radar Mono Component of GNU Radio: \
 Provides monostatic radar transmitter and receiver blocks. \
@@ -16,66 +14,18 @@
 to a file for offline analysis.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build	port:pkgconfig
-depends_lib		port:gnuradio-core \
-				port:usrp
-
-archcheck.files lib/libgnuradio-core.dylib \
-				lib/libusrp.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--with-usrp \
-				--enable-gr-radar-mono
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-radio-astronomy/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-radio-astronomy/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-radio-astronomy/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-radio-astronomy
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Radio Astronomy component of GNU Radio.
 long_description Radio Astronomy of GNU Radio: \
 Provides Radio Astronomy blocks and scripts.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-radio-astronomy
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-sounder/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-sounder/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-sounder/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,77 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-sounder
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Sounder component of GNU Radio.
 long_description Sounder of GNU Radio: \
 Provides blocks and scripts for determining the impulse response of a channel.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build	port:pkgconfig
-depends_lib		port:gnuradio-core \
-				port:usrp
-
-archcheck.files lib/libgnuradio-core.dylib \
-				lib/libusrp.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--with-usrp \
-				--enable-gr-sounder
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-trellis/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-trellis/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-trellis/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,74 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-trellis
-version			3.3.0
-maintainers		michaelld
+version			3.6.2
+maintainers		michaelld openmaintainer
 description		Trellis component of GNU Radio.
 long_description Trellis component of GNU Radio: \
 Provides trellis-based encoder and decoding blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build   port:pkgconfig
-depends_lib		port:gnuradio-core
-
-archcheck.files lib/libgnuradio-core.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-trellis
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-usrp/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-usrp/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-usrp/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,81 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-usrp
-version         3.3.0
-maintainers		michaelld
+version         3.6.2
+maintainers		michaelld openmaintainer
 description		USRP component of GNU Radio.
 long_description USRP component of GNU Radio: \
 Provides USRP input and output blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_build	port:pkgconfig
-depends_lib		port:gnuradio-core \
-				port:usrp
-
-archcheck.files lib/libgnuradio-core.dylib \
-				lib/libusrp.dylib
-
-# fix #includes for already installed USRP SWIG and C++ headers;
-# will be fixed in 3.3.1.
-patchfiles      patch_gr-usrp_src_usrp_swig_files.diff
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--with-usrp \
-				--enable-gr-usrp
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-utils/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-utils/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-utils/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,70 +4,25 @@
 PortSystem 1.0
 
 name			gnuradio-utils
-version         3.3.0
-maintainers		michaelld
+version         3.6.2
+maintainers		michaelld openmaintainer
 description		GR Utils component of GNU Radio.
 long_description GR Utils component of GNU Radio: \
 Python-based scripts for plotting and USRP functions.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_lib		port:gnuradio-wxgui \
-				port:usrp
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--with-gr-wxgui \
-				--with-usrp \
-				--enable-gr-utils
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-video-sdl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-video-sdl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-video-sdl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,76 +2,27 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			gnuradio-video-sdl
-version         3.3.0
-maintainers		michaelld
+version         3.6.2
+maintainers		michaelld openmaintainer
 description		Video SDL component of GNU Radio.
 long_description Video SDL of GNU Radio: \
 Provides SDL video source and sink blocks.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_lib		port:gnuradio-core \
-				path:lib/pkgconfig/sdl.pc:libsdl
-
-archcheck.files lib/libgnuradio-core.dylib \
-				lib/libSDL.dylib
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-video-sdl \
-				--disable-sdltest
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env      PYTHON=${prefix}/bin/python2.5
-	depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env      PYTHON=${prefix}/bin/python2.6
-	depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env      PYTHON=${prefix}/bin/python2.7
-	depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gnuradio-wxgui/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gnuradio-wxgui/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gnuradio-wxgui/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,76 +4,25 @@
 PortSystem 1.0
 
 name			gnuradio-wxgui
-version         3.3.0
-maintainers		michaelld
+version         3.6.2
+maintainers		michaelld openmaintainer
 description		WX GUI component of GNU Radio.
 long_description WX GUI component of GNU Radio: \
 Wx-based GUI widgets, including OpenGL option.
 
 categories		science
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by gnuradio
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums		md5		cef9ef65d626e1273c6381966ae9d4bc \
-				sha1	41d5c177b173ce73404f5fe539b013c82600f73f \
-				rmd160	ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-depends_lib		port:gnuradio-core
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--with-gnuradio-core \
-				--enable-gr-wxgui
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'gnuradio' with variants; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-	configure.env PYTHON=${prefix}/bin/python2.5
-	depends_lib-append	port:python25 \
-						port:py25-wxpython \
-						port:py25-numpy \
-						port:py25-opengl
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-	configure.env PYTHON=${prefix}/bin/python2.6
-	depends_lib-append	port:python26 \
-						port:py26-wxpython \
-						port:py26-numpy \
-						port:py26-opengl
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-	configure.env PYTHON=${prefix}/bin/python2.7
-	depends_lib-append	port:python27 \
-						port:py27-wxpython \
-						port:py27-numpy \
-						port:py27-opengl
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-	default_variants +python26
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/science/gstlal/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gstlal/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gstlal/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 
 name          gstlal
 version       0.4.2
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram

Modified: branches/pixilla-mysqls-55/dports/science/gstlal-ugly/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/gstlal-ugly/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/gstlal-ugly/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,6 +4,7 @@
 
 name          gstlal-ugly
 version       0.3.1
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram

Modified: branches/pixilla-mysqls-55/dports/science/indi/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/indi/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/indi/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 
 name                indi
 
-version             0.9.5
+version             0.9.6
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          science
 license             LGPL-2.1+
@@ -22,15 +22,14 @@
                     more science with less time.
 
 homepage            http://www.indilib.org/
-#master_sites        sourceforge:project/indi/indilib/${branch}
-master_sites        macports_distfiles
+master_sites        sourceforge:project/indi/indilib/${branch}
 
 platforms           darwin
 
 distname            libindi_${version}
 
-checksums           rmd160  1e2900f5f1c9f61e9fa0930be43c9fd254200839 \
-                    sha256  4c8d373e464c941ef42324f559e0087127030fcb2e93d49afb69fb9d52c77b9c
+checksums           rmd160  aec032a5a131a67439fca36dc3a1bb71f0979dd5 \
+                    sha256  44ef0a943fe9f312f874b2e76b9892bd850c60cbd936f608fb2c224375d6d0b3
 
 depends_lib         port:libnova \
                     port:zlib \

Modified: branches/pixilla-mysqls-55/dports/science/lal/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lal/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lal/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lal
-version       6.7.2
+version       6.8.0
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,8 +18,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 28847d0a2240cb0d76ee6e67dd7b1a54be2b021c \
-              sha256 317824ee4cb936ae2bf7b8ccf66fd3f1394725951f54eeb3fcb470cabf09192e
+checksums     rmd160 089045cdb55076663f1c190f48fd0e73287d21db \
+              sha256 9f8d4534ea37fd660043880ab4678b3de6e0789382394b21dcc06eaa0bcbf68e
 
 depends_build port:pkgconfig \
               port:python27
@@ -35,6 +36,14 @@
 
 use_parallel_build yes
 
+variant swig_python description {Build python SWIG bindings} {
+  depends_build-append  port:swig-python \
+                        port:py27-numpy
+  configure.args-append --enable-swig-python
+}
+
+default_variants +swig_python
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lal-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/lalapps/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalapps/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalapps/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lalapps
-version       6.9.1
+version       6.10.0
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,8 +18,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite/
 
-checksums     rmd160 73253a6346604436f7607c8255c4ede631086b5d \
-              sha256 96acbf55c499e3315030cbbe816cfa035d7ae1dcb23cd79edb0a9bc028244291
+checksums     rmd160 1bb072ba0564ebef6a61bca581548b3c24dbb7b9 \
+              sha256 01ff7b9d813a060b2c000fac1ec4bda6ef4ab21029c55203a6efe03ca54b2ffc
 
 depends_build port:pkgconfig
 
@@ -31,7 +32,6 @@
               port:lal \
               port:lalframe \
               port:lalmetaio \
-              port:lalxml \
               port:lalsimulation \
               port:lalburst \
               port:lalinspiral \
@@ -43,12 +43,39 @@
 configure.python ${prefix}/bin/python2.7
 configure.args   --mandir=${prefix}/share/man \
                  --disable-silent-rules \
-                 --enable-lalxml \
                  --disable-gcc-flags \
                  --disable-debug
 
 use_parallel_build yes
 
+variant lalxml description {Build with LALXML support} {
+  pre-fetch {
+    if { ![file exists ${prefix}/include/lal/LALXMLVOTableSerializersPulsar.h] } {
+      ui_error "
+****
+**** LALApps +lalxml requires LALPulsar +lalxml, please
+**** reinstall LALPulsar with the +lalxml variant.
+****
+"
+    error "${name} +lalxml requires lalpulsar +lalxml"
+    }
+    if { ![file exists ${prefix}/include/lal/LALInferenceXML.h] } {
+      ui_error "
+****
+**** LALApps +lalxml requires LALInference +lalxml, please
+**** reinstall LALInference with the +lalxml variant.
+****
+"
+    error "${name} +lalxml requires lalinference +lalxml"
+    }
+  }
+  depends_lib-append    port:libxml2 \
+                        port:lalxml
+  configure.args-append --enable-lalxml
+}
+
+default_variants +lalxml
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lalapps-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/lalburst/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalburst/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalburst/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,8 +3,7 @@
 PortSystem    1.0
 
 name          lalburst
-version       1.1.3
-revision      1
+version       1.1.4
 categories    science
 platforms     darwin
 maintainers   ram
@@ -18,8 +17,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 906e808de17785187205cb3c0807d4265c1fc830 \
-              sha256 d9389a75a2d2acda6f9bf0779d6ea644fe7690d354388d7ea306d02d8a7c833e
+checksums     rmd160 22dfcf1178704bd7f25ea6d12139ab84af0ae451 \
+              sha256 94f58b8ad06fde0556d05d446b3d49dfa5c15811f1518bfa6affa9fe6054c111
 
 depends_build port:pkgconfig \
               port:python27

Modified: branches/pixilla-mysqls-55/dports/science/lalframe/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalframe/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalframe/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lalframe
-version       1.0.6
+version       1.0.7
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,8 +18,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 055477f597b9a05e5cf08139f5ead95daaff71e8 \
-              sha256 34f10f5767a062e67e5bac74118d10bb0526bea94ed3c325505f5de526daa02a
+checksums     rmd160 8a45abbebb73f2eea3125bcc285005be9ab4c967 \
+              sha256 02de9a22b77d82c0b2c39e74bac5174c1d496f9cd381a566fc0f381ddb50c9a9
 
 depends_build port:pkgconfig \
               port:python27
@@ -34,6 +35,25 @@
 
 use_parallel_build yes
 
+variant swig_python description {Build python SWIG bindings} {
+  pre-fetch {
+    if { ![file exists ${prefix}/lib/python2.7/site-packages/lal/_lal.so] } {
+      ui_error "
+****
+**** LALFrame +swig_python requires LAL +swig_python, please
+**** reinstall LAL with the +swig_python variant.
+****
+"
+    error "${name} +swig_python requires lal +swig_python"
+    }
+  }
+  depends_build-append  port:swig-python \
+                        port:py27-numpy
+  configure.args-append --enable-swig-python
+}
+
+default_variants +swig_python
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lalframe-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/lalinference/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalinference/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalinference/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lalinference
-version       0.4.0
+version       1.0.0
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,19 +18,17 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 17e95a768a1358ecdaafd2e774941a5ca282411a \
-              sha256 19475785304ef0fce2fa17a874932714923bd433359b92a2b35aa4e2bcef4442
+checksums     rmd160 d122e20f74f9e85d1efa90a7bf7fbb57fa558693 \
+              sha256 dba8b7f9bee4e5d5b505385dfb4b428929e59006b8ea18cd68d956755e794912
 
 depends_build port:pkgconfig \
               port:python27
 
 depends_lib   port:gsl \
               port:metaio \
-              port:libxml2 \
               port:lal \
               port:lalframe \
               port:lalmetaio \
-              port:lalxml \
               port:lalsimulation \
               port:lalinspiral \
               port:lalpulsar
@@ -37,12 +36,30 @@
 configure.python ${prefix}/bin/python2.7
 configure.args --mandir=${prefix}/share/man \
                --disable-silent-rules \
-               --enable-lalxml \
                --disable-gcc-flags \
                --disable-debug
 
 use_parallel_build yes
 
+variant lalxml description {Build with LALXML support} {
+  pre-fetch {
+    if { ![file exists ${prefix}/include/lal/LALXMLVOTableSerializersPulsar.h] } {
+      ui_error "
+****
+**** LALInference +lalxml requires LALPulsar +lalxml, please
+**** reinstall LALPulsar with the +lalxml variant.
+****
+"
+    error "${name} +lalxml requires lalpulsar +lalxml"
+    }
+  }
+  depends_lib-append    port:libxml2 \
+                        port:lalxml
+  configure.args-append --enable-lalxml
+}
+
+default_variants +lalxml
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lalinference-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/lalinspiral/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalinspiral/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalinspiral/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lalinspiral
-version       1.3.2
+version       1.4.0
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,8 +18,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 97cce122814b206cd87b2294576001e99ec40f9a \
-              sha256 987709595a897d29d7d4e6d6696e701fd0a1ba04825d1c2f2164938da800a541
+checksums     rmd160 5f32d64323717464eed117ce8ecba2d031fec939 \
+              sha256 69f74349155737e0017b457fb38516a4f1d4ac99b970ec2ccb4a4b8370e4b8a7
 
 depends_build port:pkgconfig \
               port:python27
@@ -38,6 +39,43 @@
 
 use_parallel_build yes
 
+variant swig_python description {Build python SWIG bindings} {
+  pre-fetch {
+    if { ![file exists ${prefix}/lib/python2.7/site-packages/lal/_lal.so] } {
+      ui_error "
+****
+**** LALInspiral +swig_python requires LAL +swig_python, please
+**** reinstall LAL with the +swig_python variant.
+****
+"
+    error "${name} +swig_python requires lal +swig_python"
+    }
+    if { ![file exists ${prefix}/lib/python2.7/site-packages/lalframe/_lalframe.so] } {
+      ui_error "
+****
+**** LALInspiral +swig_python requires LALFrame +swig_python, please
+**** reinstall LALFrame with the +swig_python variant.
+****
+"
+    error "${name} +swig_python requires lal +swig_python"
+    }
+    if { ![file exists ${prefix}/lib/python2.7/site-packages/lalsimulation/_lalsimulation.so] } {
+      ui_error "
+****
+**** LALInspiral +swig_python requires LALSimulation +swig_python,
+**** please reinstall LALSimulation with the +swig_python variant.
+****
+"
+    error "${name} +swig_python requires lalsimulation +swig_python"
+    }
+  }
+  depends_build-append  port:swig-python \
+                        port:py27-numpy
+  configure.args-append --enable-swig-python
+}
+
+default_variants +swig_python
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lalinspiral-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/lalmetaio/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalmetaio/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalmetaio/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem    1.0
 
 name          lalmetaio
-version       1.0.4
+version       1.0.5
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,8 +17,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 b8f789299f97638606f4423051c50f64f98423a1 \
-              sha256 c3092b64cb3e7034d8c86f5ff99f0580252affa0588d6df7abe46204ff43f050
+checksums     rmd160 61c4c6f9fb6e9f92454c99acee867371b37d40ea \
+              sha256 b91937a88ef91bcc5f7c2c6235a2d932b8d657fdfaa6568744b8d8cc81249e7d
 
 depends_build port:pkgconfig \
               port:python27

Modified: branches/pixilla-mysqls-55/dports/science/lalpulsar/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalpulsar/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalpulsar/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lalpulsar
-version       1.4.1
+version       1.5.0
+revision      2
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,25 +18,59 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 900c7e45063ebbade80d59a824f3e8cc903538f2 \
-              sha256 1d8c03ba3d23cc9d3fcead672485f697a0c81c82118fe0ebea4fee845203a58e
+checksums     rmd160 2a7f96ba13e92d0fe1a6ad03f7813784c9e94a23 \
+              sha256 805a15e447ff358403a8b2afc7b319c3b41288cbd08f37c8830020bf31c64840
 
 depends_build port:pkgconfig \
               port:python27
 
 depends_lib   port:gsl \
-              port:lal \
-              port:lalxml
+              port:lal
 
 configure.python ${prefix}/bin/python2.7
 configure.args --mandir=${prefix}/share/man \
                --disable-silent-rules \
-               --enable-lalxml \
                --disable-gcc-flags \
                --disable-debug
 
 use_parallel_build yes
 
+variant lalxml description {Build with LALXML support} {
+  depends_lib-append   port:libxml2 \
+                       port:lalxml
+  configure.args-append --enable-lalxml
+}
+
+variant swig_python description {Build python SWIG bindings} {
+  pre-fetch {
+    if { ![file exists ${prefix}/lib/python2.7/site-packages/lal/_lal.so] } {
+      ui_error "
+****
+**** LALPulsar +swig_python requires LAL +swig_python, please
+**** reinstall LAL with the +swig_python variant.
+****
+"
+    error "${name} +swig_python requires lal +swig_python"
+    }
+    if {[variant_isset lalxml]} {
+      if { ![file exists ${prefix}/lib/python2.7/site-packages/lalxml/_lalxml.so] } {
+        ui_error "
+****
+**** LALPulsar +swig_python requires LALXML +swig_python, please
+**** reinstall LALXML with the +swig_python variant.
+****
+"
+        error "${name} +swig_python requires lalxml +swig_python"
+      }
+    }
+  }
+  depends_build-append  port:swig-python \
+                        port:py27-numpy
+  configure.args-append --enable-swig-python
+}
+
+default_variants +lalxml +swig_python
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lalpulsar-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/lalsimulation/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalsimulation/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalsimulation/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lalsimulation
-version       0.4.0
+version       0.5.0
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,8 +18,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 7de188a2bc81f0a4d50262f7fa257c214c7147f2 \
-              sha256 a1d9c1412b6c7c329bae96c9f7dba381f0cd88f8f587479ca0213cdfd3f9c08d
+checksums     rmd160 8e467df0ca86527238dee6c138c71845602ea7aa \
+              sha256 b072ed5d6aee050aa43a9ea540bdcc889f94075f4de27a392644a658798e3eb7
 
 depends_build port:pkgconfig \
               port:python27
@@ -34,21 +35,25 @@
 
 use_parallel_build yes
 
-# check for earlier versions of lalburst and lalinspiral that contained
-# conflicting headers, deactivate if necessary
-pre-activate {
-  if {[file exists ${prefix}/include/lal/LALSimBurst.h]
-    && ![catch {set vers [lindex [registry_active lalburst] 0]}]
-    && [vercmp [lindex $vers 1] 1.0.1] < 0} {
-      registry_deactivate lalburst "" [list ports_nodepcheck 1]
+variant swig_python description {Build python SWIG bindings} {
+  pre-fetch {
+    if { ![file exists ${prefix}/lib/python2.7/site-packages/lal/_lal.so] } {
+      ui_error "
+****
+**** LALSimulation +swig_python requires LAL +swig_python, please
+**** reinstall LAL with the +swig_python variant.
+****
+"
+    error "${name} +swig_python requires lal +swig_python"
+    }
   }
-  if {[file exists ${prefix}/include/lal/LALSimInspiral.h]
-    && ![catch {set vers [lindex [registry_active lalinspiral] 0]}]
-    && [vercmp [lindex $vers 1] 1.1.0] < 0} {
-      registry_deactivate lalinspiral "" [list ports_nodepcheck 1]
-  }
+  depends_build-append  port:swig-python \
+                        port:py27-numpy
+  configure.args-append --enable-swig-python
 }
 
+default_variants +swig_python
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lalsimulation-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/lalstochastic/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalstochastic/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalstochastic/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem    1.0
 
 name          lalstochastic
-version       1.1.5
+version       1.1.6
 categories    science
 platforms     darwin
 maintainers   ram
@@ -18,8 +18,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160  4d1078113265efc4ae20b9d3ef8ff19aafa62843 \
-              sha256  aa49f0730501ebf3a49d76a5a42fb71ca79c8b5dee0dcab2625a45b76a5ed6a5
+checksums     rmd160 d8c660714fa62f0252ed2128bbc1b733263973e3 \
+              sha256 08a5726580e12a319cc09f54bd8dc25697200ff1f6a6742b1fb6c93741cb4f9f
 
 depends_build port:pkgconfig \
               port:python27

Modified: branches/pixilla-mysqls-55/dports/science/lalxml/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/lalxml/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/lalxml/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,8 @@
 PortSystem    1.0
 
 name          lalxml
-version       1.1.4
+version       1.1.5
+revision      1
 categories    science
 platforms     darwin
 maintainers   ram
@@ -17,8 +18,8 @@
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
 master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
 
-checksums     rmd160 33917570c4c8666e5e13c51f43bfb9e6131a45f4 \
-              sha256 51b7373e64db6672f23185ef5eb8835e1d2d56fe1dd5d580fb0f9db68e76ee0f
+checksums     rmd160 1821b005e02a11634918d3db1c3a2bd91686ceac \
+              sha256 2a1095739885dd409d7b4e9ea184fed8f811ee9be3d98a902a6db6a3e473e833
 
 depends_build port:pkgconfig \
               port:python27
@@ -35,6 +36,25 @@
 
 use_parallel_build yes
 
+variant swig_python description {Build python SWIG bindings} {
+  pre-fetch {
+    if { ![file exists ${prefix}/lib/python2.7/site-packages/lal/_lal.so] } {
+      ui_error "
+****
+**** LALXML +swig_python requires LAL +swig_python, please
+**** reinstall LAL with the +swig_python variant.
+****
+"
+    error "${name} +swig_python requires lal +swig_python"
+    }
+  }
+  depends_build-append  port:swig-python \
+                        port:py27-numpy
+  configure.args-append --enable-swig-python
+}
+
+default_variants +swig_python
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {lalxml-(\d+(?:\.\d+)*).tar.gz}

Modified: branches/pixilla-mysqls-55/dports/science/libframe/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/libframe/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/libframe/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem    1.0
 
 name          libframe
-version       8.15
+version       8.17.2
 epoch         1
 categories    science
 platforms     darwin
@@ -20,9 +20,8 @@
 master_sites  ${homepage} \
               https://www.lsc-group.phys.uwm.edu/daswg/download/software/source/
 
-checksums     md5 4232a49538dcfa5052a382be7384daf1 \
-              sha1 9850b7063ddd18c23aa0fd7c32bb49915028d0ad \
-              rmd160 cd79f9b97ae48e4c549a0f09d0f16c4c8285b01a
+checksums     rmd160 9462af1c7289f8d5344fb69c5e6644f8e286ec02 \
+              sha256 c7c0ecf02ada5bf3263120970f8d0b85eddd3cc2c4af27110beb3fea570c6721
 
 use_parallel_build yes
 

Modified: branches/pixilla-mysqls-55/dports/science/magic-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/magic-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/magic-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 
 name                magic-devel
 conflicts           magic
-version             8.0.122
+version             8.0.124
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          science
 # mostly very permissively licensed, but includes a copy of GNU readline
@@ -31,8 +31,8 @@
 
 depends_lib         port:tcl port:tk port:blt port:mesa
 
-checksums           rmd160  482aaa9c326a984d99f625384aeb5cec8f619e69 \
-                    sha256  2d430c1b5d9e6db2a09836a4616023855d8b73c642674b4a62414d398336076c
+checksums           rmd160  a48a9a2e79d22b8e0b17e0ce066a0b8ef860b0dc \
+                    sha256  430b6d11c0b51ecc551dc7889295aa2f772539b8c4c44517b1e716d537574916
 
 patchfiles          patch-scripts-configure.in.diff
 

Modified: branches/pixilla-mysqls-55/dports/science/magic-devel/files/patch-scripts-configure.in.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/science/magic-devel/files/patch-scripts-configure.in.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/magic-devel/files/patch-scripts-configure.in.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,5 +1,5 @@
---- scripts/configure.in.orig	2012-11-06 15:54:15.000000000 -0600
-+++ scripts/configure.in	2012-11-07 14:56:21.000000000 -0600
+--- scripts/configure.in.orig	2012-11-14 08:16:52.000000000 -0600
++++ scripts/configure.in	2012-11-15 15:11:14.000000000 -0600
 @@ -23,6 +23,7 @@
  dnl Checks for programs.
  AC_PROG_CC
@@ -16,7 +16,7 @@
  
  modules=""
  unused=""
-@@ -1376,7 +1376,7 @@
+@@ -1381,7 +1381,7 @@
        SHDLIB_EXT=".dylib"
        LDDL_FLAGS="-dynamiclib -flat_namespace -undefined suppress -noprebind"
        LDFLAGS="${LDFLAGS} ${LIB_SPECS}"
@@ -25,7 +25,7 @@
        ;;
  
      *cygwin*)
-@@ -1615,9 +1615,6 @@
+@@ -1620,9 +1620,6 @@
     DEPEND_FLAG="-MM"
  fi
  

Modified: branches/pixilla-mysqls-55/dports/science/molden/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/molden/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/molden/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -12,7 +12,7 @@
 PortGroup xcodeversion 1.0
 
 name                molden
-version             5.0.2-20120924114100
+version             5.0.3-20121109105300
 set version_number  [lindex [split ${version} -] 0]
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          science graphics
@@ -24,8 +24,8 @@
 dist_subdir         ${name}/${version}
 master_sites        ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
 
-checksums           rmd160  763af4930be40aa547206ad7461cd8b69eb885ca \
-                    sha256  cfe48142fa7f59dfb5f90d63e26ae3d7d29b5ab02c0f9424bceef9f7d27f0709
+checksums           rmd160  fbd3da6527a7069fafeae293cbf2d894269aa4c8 \
+                    sha256  b1f292d5c1c03264fc5f47c997f140a3e70eb065d05f12c13a988218fdf9cbfc
 
 description         Molecular graphics visualisation tool
 long_description    Molden is a package for displaying Molecular Density from \

Deleted: branches/pixilla-mysqls-55/dports/science/mpich/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/mpich/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/mpich/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,54 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-
-name			mpich
-version			1.2.7p1
-categories		science parallel net
-maintainers		nomaintainer
-description		Message Passing Interface (MPI) Library
-long_description	\
-	MPICH is a portable implementation of the MPI (Message Passing \
-	Interface) standard. The goal of MPI, simply stated, is to develop a \
-	widely used standard for writing message-passing programs. As such \
-	the interface should establish a practical, portable, efficient, and \
-	flexible standard for message passing. Included are a full set of \
-	documents and parallel programming examples.
-homepage		http://www-unix.mcs.anl.gov/mpi/mpich1/
-platforms		darwin
-master_sites	ftp://ftp.mcs.anl.gov/pub/mpi/
-checksums		md5     4fc0f20bddfbd5061a11047cf2d17d31 \
-				sha1    68424f3fe1746ae597aeb1729be50d205ccba91c \
-				rmd160  8192e0518f160c12b212ba260371db6159a34049
-use_bzip2		yes
-
-patchfiles      patch-bin_tarch.diff
-
-universal_variant	no
-
-build.target
-
-destroot.destdir	PREFIX=${destroot}${prefix}
-destroot.violate_mtree yes
-post-destroot	{
-	file delete -force ${destroot}${prefix}/man/mandesc \
-		${destroot}${prefix}/share/man \
-		${destroot}${prefix}/examples \
-		${destroot}${prefix}/sbin/mpiuninstall
-	file rename ${destroot}${prefix}/man \
-		${destroot}${prefix}/share/man
-	xinstall -m 755 -d ${destroot}${prefix}/share/doc
-	file rename ${destroot}${prefix}/doc \
-		${destroot}${prefix}/share/doc/${name}
-	file rename ${destroot}${prefix}/share/examples \
-		${destroot}${prefix}/share/doc/${name}/examples
-	file rename ${destroot}${prefix}/www \
-		${destroot}${prefix}/share/doc/${name}/html
-	file rename ${destroot}${prefix}/share/machines.freebsd_ppc \
-		${destroot}${prefix}/share/doc/${name}/machines.freebsd_ppc
-	file rename ${destroot}${prefix}/share/machines.sample \
-		${destroot}${prefix}/share/doc/${name}/machines.sample
-	file rename ${destroot}${prefix}/share/Makefile.sample \
-		${destroot}${prefix}/share/doc/${name}/Makefile.sample
-}
-

Copied: branches/pixilla-mysqls-55/dports/science/mpich/Portfile (from rev 100173, trunk/dports/science/mpich/Portfile)
===================================================================
--- branches/pixilla-mysqls-55/dports/science/mpich/Portfile	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/science/mpich/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,196 @@
+# -*- 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
+
+name                mpich
+set pkgname         mpich2
+version             1.5
+revision            0
+
+license             BSD
+categories          science parallel net
+platforms           darwin
+maintainers         eborisch \
+                    openmaintainer
+
+description         Message Passing Interface (MPI) Library
+
+long_description    MPICH is a high-performance and widely portable\
+                    implementation of the Message Passing Interface (MPI) \
+                    standard (MPI-1, MPI-2 and MPI-3). The goals of MPICH are:\
+                    (1) to provide an MPI implementation that efficiently\
+                    supports different computation and communication platforms\
+                    including commodity clusters (desktop systems,\
+                    shared-memory systems, multicore architectures), high-speed\
+                    networks (10 Gigabit Ethernet, InfiniBand, Myrinet,\
+                    Quadrics) and proprietary high-end computing systems (Blue\
+                    Gene, Cray) and (2) to enable cutting-edge research in MPI\
+                    through an easy-to-extend modular framework for other\
+                    derived implementations.
+
+homepage            http://www.mpich.org/
+checksums \
+    rmd160  69572f5c435aec1ef37af197f7509cfc073ce53a \
+    sha256  7175926fc2e4230f00201e880318c08de4f949c0dbe167fe1b2e256ac79d5f66
+
+configure.args      --disable-dependency-tracking \
+                    --disable-f77 \
+                    --disable-fc \
+                    --disable-silent-rules \
+                    --enable-base-cache \
+                    --enable-cache \
+                    --enable-cxx \
+                    --enable-fast=O2 \
+                    --enable-shared \
+                    --enable-smpcoll \
+                    --without-mpe \
+                    --with-device=ch3:nemesis \
+                    --with-pm=hydra \
+                    --with-thread-package=posix \
+                    "F90FLAGS='' F90=''"
+
+subport mpich-devel {
+    set pkgname         mpich
+    conflicts           mpich
+    version             3.0rc1
+
+    long_description-append \
+                    \n\nThe mpich-devel port follows the mpich 3.x line, and is\
+                    the successor to the mpich2 package. Starting with the\
+                    major release in November 2012, the project is renamed\
+                    back to MPICH (from MPICH2) with a version number of 3.0. 
+
+    checksums \
+        rmd160  f351263b455db2503f675ba5a8c11560098eecd2 \
+        sha256  5ff2599c0132b6ce9246925a790fa00a0a648c3049d858ade102512be509fe5f
+
+    configure.args-delete   --without-mpe
+}
+
+if {${subport} == ${name}} {
+    conflicts           mpich-devel
+}
+
+master_sites        ${homepage}static/tarballs/${version}/
+distname            ${pkgname}-${version}
+
+conflicts-append    mpich2 \
+                    mpich2-devel \
+                    lammpi \
+                    openmpi
+
+universal_variant   no
+
+depends_lib-append  port:libxml2
+
+
+platform darwin {
+    configure.args-append   --enable-timer-type=mach_absolute_time
+}
+
+# We're making compiler wrappers here... don't default to -O2 for wrappers.
+# Actual library code is compiled with -O2 via --enable-fast=O2 configure arg
+configure.cflags-delete     -O2
+configure.cxxflags-delete   -O2
+configure.fflags-delete     -O2
+configure.fcflags-delete    -O2
+configure.cppflags-delete   -I${prefix}/include
+
+# As MPICH creates compiler wrappers, there are lots of
+# variants for what compiler the user would like to wrap.
+
+variant gcc47 description {
+    Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc47 port
+} conflicts gcc43 gcc44 gcc45 gcc46 llvm clang clang31 {
+    depends_lib-append      port:gcc47
+    configure.compiler      macports-gcc-4.7
+}
+
+variant gcc46 description {
+    Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc46 port
+} conflicts gcc43 gcc44 gcc45 gcc47 llvm clang clang31 {
+    depends_lib-append      port:gcc46
+    configure.compiler      macports-gcc-4.6
+}
+
+variant gcc45 description {
+    Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45 port
+} conflicts gcc43 gcc44 gcc46 gcc47 llvm clang clang31 {
+    depends_lib-append      port:gcc45
+    configure.compiler      macports-gcc-4.5
+}
+
+variant gcc44 description {
+    Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44 port
+} conflicts gcc43 gcc45 gcc46 gcc47 llvm clang clang31 {
+    depends_lib-append      port:gcc44
+    configure.compiler      macports-gcc-4.4
+}
+
+variant gcc43 description {
+    Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43 port
+} conflicts gcc44 gcc45 gcc46 gcc47 llvm clang clang31 {
+    depends_lib-append      port:gcc43
+    configure.compiler      macports-gcc-4.3
+}
+
+if {[ variant_isset gcc43 ] ||
+    [ variant_isset gcc44 ] ||
+    [ variant_isset gcc45 ] ||
+    [ variant_isset gcc46 ] ||
+    [ variant_isset gcc47 ]} {
+    configure.args-append   --enable-f77 --enable-fc
+    configure.args-delete   --disable-f77 --disable-fc
+}
+
+variant llvm description {
+    Use Apple-supplied llvm-gcc
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 clang clang31 {
+    configure.compiler      llvm-gcc-4.2
+}
+
+# Apple clang version 4.1 currently segfaults (Xcode 4.5.1)
+# See https://trac.macports.org/ticket/36654#comment:9
+if {[vercmp ${xcodeversion} 4.5.1] >= 0} {
+    compiler.blacklist      clang
+    # Keeping variant so all the conflict lines don't balk and so upgrades
+    # of +clang are not moved to llvm without warning.
+    variant clang description {
+        !!THIS CLANG VERSION BREAKS. UNUSABLE VARIANT HERE AS PLACEHOLDER ONLY!!
+    } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
+        ui_error \
+          "This version of clang segfaults. Please select a different compiler."
+        return -code error "Unsupported clang version. Try +clang31 or +llvm ?"
+    }
+} else {
+    variant clang description {
+        Use Apple-supplied clang
+    } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
+        configure.compiler      clang
+    }
+}
+
+variant clang31 description {
+    Use clang 3.1 from MacPorts
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang {
+    depends_lib-append      port:clang-3.1
+    configure.compiler      macports-clang-3.1
+}
+
+variant gforker description {
+    Use gforker process manager instead of the default hydra
+} {
+    configure.args-append   --with-pm=gforker
+    configure.args-delete   --with-pm=hydra
+}
+
+variant tuned description {Build with more optimizations)} {
+    configure.args-delete       --enable-fast=O2
+    configure.args-append       --enable-fast=all \
+                                MPICHLIB_CFLAGS='-fomit-frame-pointer -O2'
+}
+
+livecheck.type      regex
+livecheck.regex     ${pkgname}-(\[0-9.pbrc\]+)${extract.suffix}
+livecheck.url       ${homepage}downloads/index.php?s=downloads

Modified: branches/pixilla-mysqls-55/dports/science/mpich2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/mpich2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/mpich2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,7 +6,7 @@
 name                mpich2
 set pkgname         mpich2
 version             1.5
-revision            4
+revision            5
 epoch               20121008 
 
 license             BSD
@@ -25,8 +25,8 @@
                     and for developing new and better parallel programming \
                     environments.
 
-homepage            http://www.mcs.anl.gov/research/projects/mpich2/
-master_sites        ${homepage}downloads/tarballs/${version}/
+homepage            http://www.mpich.org/
+master_sites        ${homepage}static/tarballs/${version}/
 distname            ${pkgname}-${version}
 
 checksums   \
@@ -41,7 +41,8 @@
 universal_variant   no
 
 depends_lib-append  port:libxml2
-conflicts-append    lammpi
+conflicts-append    lammpi \
+                    openmpi
 
 configure.args      --disable-dependency-tracking \
                     --disable-f77 \
@@ -53,13 +54,11 @@
                     --enable-fast=O2 \
                     --enable-shared \
                     --enable-smpcoll \
-                    --includedir=${prefix}/include/${pkgname} \
                     --with-device=ch3:nemesis \
                     --with-mpe \
                     --with-pm=hydra \
                     --with-thread-package=posix \
-                    "F90FLAGS='' F90=''" \
-                    MPICH2LIB_CPPFLAGS=-I${prefix}/include
+                    "F90FLAGS='' F90=''"
 
 platform darwin {
     configure.args-append   --enable-timer-type=mach_absolute_time
@@ -71,7 +70,6 @@
 configure.cxxflags-delete   -O2
 configure.fflags-delete     -O2
 configure.fcflags-delete    -O2
-configure.cppflags-delete   -I${prefix}/include
 
 post-destroot {
     # Move examples directories to preferred location

Modified: branches/pixilla-mysqls-55/dports/science/nco/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/nco/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/nco/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,16 +4,16 @@
 PortSystem                  1.0
 
 name                        nco
-version                     4.2.2
+version                     4.2.3
 platforms                   darwin
 maintainers                 takeshi
 license                     GPL-3
 categories                  science
 description                 The netCDF Operators
 master_sites                http://${name}.sourceforge.net/src/
-checksums           md5     b9353653051dce4c213660cb9feeca99 \
-                    sha1    f3cb8c47c5fa8bf7d6673f1619428d74c12fd9d5 \
-                    rmd160  9f83378784f1364e273a80647fa255cb4fe226ad
+checksums           md5     4b1e476ea56df2048edf9f35b4d62111 \
+                    sha1    cf3b6c5cd350a9e54375b82c5803005b1dc6404a \
+                    rmd160  61fbd1409433325a3c31e4ecd85af83c3ec25596
 homepage                    http://nco.sourceforge.net/
 long_description \
     Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), \

Modified: branches/pixilla-mysqls-55/dports/science/ompl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/ompl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/ompl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,9 +2,11 @@
 
 PortSystem 1.0
 PortGroup cmake 1.0
+PortGroup active_variants 1.0
 
 name                ompl
-version             0.11.1
+version             0.12.0
+revision            1
 categories          science
 maintainers         mmoll
 description         The Open Motion Planning Library (OMPL)
@@ -14,9 +16,9 @@
 platforms           darwin
 license             BSD
 master_sites        https://bitbucket.org/ompl/ompl/downloads
-checksums           md5     235ca56932ff20da0c01f8201657740a \
-                    sha1    e5b1827477f36d373f9a9a5dd88941bcdc7bae61 \
-                    rmd160  c45de5b40ff870f68cd62915f68ec05caaf3360d
+checksums           md5     c93885bf48ea1d6f134077a10480283f \
+                    sha1    68b21caa9acb8d4116ca426265652445e29bc3f7 \
+                    rmd160  366ec0324ac007589b99059eb2f0e7728a573923
 distname            ${name}-${version}-Source
 depends_lib-append  port:boost port:ode
 
@@ -31,7 +33,7 @@
 }
 
 # The +app variant includes all the content of the regular OMPL version, but
-# adds a simple GUI and an extra library with bindings to the assimp and pqp
+# adds a simple GUI and an extra library with bindings to the assimp and fcl
 # libraries. The cascade of dependencies due to pyqt4 is rather large, so by
 # default the +app variant is not enabled. Also, the additions to OMPL in
 # this variant are distributed under a slightly different license than the
@@ -46,69 +48,76 @@
 http://ompl.kavrakilab.org/license.html#ricelicense"
     }
     depends_build-append port:pkgconfig
-    depends_lib-append  port:assimp port:pqp port:flann port:libccd
-    checksums           md5     c5ed8fb9bb248632d762703239108ea0 \
-                        sha1    5ad5e77b4771b7faadddb19f2fd2c23bd9a77642 \
-                        rmd160  1911cf56b7c369591e18bf1af2766213fd9c8d4e
+    depends_lib-append  port:assimp port:fcl
+    configure.args-append -DOMPLAPP_PQP=OFF
+    checksums           md5     12a258bbe40621229418fb8573b0ba1c \
+                        sha1    baaad8f45f7cba9024441cee13ed114a7b1158ea \
+                        rmd160  c50f2614ac885c2dcdb218c938203694319cc565
 }
 
-variant python26 description {Use python2.6 for python bindings} conflicts python27 {
-    depends_build-append    port:py26-pyplusplus-devel
-    depends_lib-append      port:python26
-    configure.args-append   -DPYTHON_EXEC=${prefix}/bin/python2.6
-    if { [variant_isset app] } {
-        depends_lib-append      port:py26-pyqt4 port:py26-opengl
-        post-destroot {
-            reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python2.6|g" \
-                ${destroot}${prefix}/bin/ompl_app
-            # not needed and causes problems with rpaths
-            delete \
-                ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/ompl/util/libompl.dylib \
-                ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/ompl/app/libompl_app.dylib
+set pythons_suffixes {26 27 31 32 33}
+
+set pythons_ports {}
+foreach s ${pythons_suffixes} {
+    lappend pythons_ports python${s}
+}
+
+proc python_dir {} {
+    global pythons_suffixes
+    foreach s ${pythons_suffixes} {
+        if {[variant_isset python${s}]} {
+            set p python[string index ${s} 0].[string index ${s} 1]
+            return [file normalize [exec ${p} -c "import sys; print(sys.prefix)"]/lib/${p}/site-packages]
         }
-    } else {
-        post-destroot {
-            # not needed and causes problems with rpaths
-            delete  \
-                ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/ompl/util/libompl.dylib
-        }
     }
+    error "Python support not enabled."
 }
 
-variant python27 description {Use python2.7 for python bindings} conflicts python26 {
-    depends_build-append    port:py27-pyplusplus-devel
-    depends_lib-append      port:python27
-    configure.args-append   -DPYTHON_EXEC=${prefix}/bin/python2.7
-    if { [variant_isset app] } {
-        depends_lib-append  port:py27-pyqt4 port:py27-opengl
-        post-destroot {
-            reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python2.7|g" \
-                ${destroot}${prefix}/bin/ompl_app
-            # not needed and causes problems with rpaths
-            delete \
-                ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ompl/util/libompl.dylib \
-                ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ompl/app/libompl_app.dylib
+foreach s ${pythons_suffixes} {
+    set p python${s}
+    set v [string index ${s} 0].[string index ${s} 1]
+    set i [lsearch -exact ${pythons_ports} ${p}]
+    set c [lreplace ${pythons_ports} ${i} ${i}]
+    # python 3k conflicts with app, because py-opengl doesn't exist for python 3k
+    if { ${s} > 30 } { set a "app" } else { set a "" }
+    eval [subst {
+        variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} ${a} debug {
+            depends_build-append    port:py${s}-pyplusplus-devel
+            depends_lib-append      port:${p}
+            configure.args-append   -DPYTHON_EXEC=${prefix}/bin/python${v}
+            # the python bindings rely on Boost.Python, so make sure it is installed.
+            pre-configure {
+                require_active_variants boost ${p}
+            }
+            if { [variant_isset app] } {
+                depends_lib-append      port:py${s}-pyqt4 port:py${s}-opengl
+                post-destroot {
+                    reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g" \
+                        ${destroot}${prefix}/bin/ompl_app
+                    # not needed and causes problems with rpaths
+                    set site_packages \[python_dir\]
+                    delete ${destroot}\${site_packages}/ompl/util/libompl.dylib \
+                           ${destroot}\${site_packages}/ompl/app/libompl_app.dylib
+                }
+            } else {
+                post-destroot {
+                    # not needed and causes problems with rpaths
+                    set site_packages \[python_dir\]
+                    delete ${destroot}\${site_packages}/ompl/util/libompl.dylib
+                }
+            }
         }
-    } else {
-        post-destroot {
-            # not needed and causes problems with rpaths
-            delete \
-                ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ompl/util/libompl.dylib
-        }
-    }
+    }]
 }
 
 # enable one python variant so that the python bindings can be compiled
-if { ![variant_isset python26] && ![variant_isset python27] } {
-    default_variants        +python27
-}
-
-# the python bindings rely on Boost.Python, so make sure it is installed.
-pre-fetch {
-    if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
-        return -code error "Please reinstall boost with the +python26 or +python27 variant enabled."
+set selected_python python27
+foreach s ${pythons_suffixes} {
+    if {[variant_isset python${s}]} {
+        set selected_python python${s}
     }
 }
+default_variants +${selected_python}
 
 livecheck.type  regex
 livecheck.url   http://ompl.kavrakilab.org/download.html

Modified: branches/pixilla-mysqls-55/dports/science/plplot/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/plplot/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/plplot/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name            plplot
 version         5.9.9
-revision        4
+revision        9
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -48,7 +48,7 @@
     set cflags "${configure.cppflags} ${configure.cflags} ${configure.universal_cflags}"
     set cxxflags "${configure.cppflags} ${configure.cxxflags} ${configure.universal_cxxflags}"
 } else {
-    set cflags "${configure.cppflags} ${configure.cppflags}"
+    set cflags "${configure.cppflags} ${configure.cflags}"
     set cxxflags "${configure.cppflags} ${configure.cxxflags}"
 }
 
@@ -65,10 +65,8 @@
                         -DCMAKE_LIBRARY_PATH=${prefix}/lib \
                         -DTCL_INCLUDE_PATH=${prefix}/include \
                         -DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
-                        -DTCL_STUB_LIBRARY=${prefix}/lib/libtclstub8.5.a \
                         -DTK_INCLUDE_PATH=${prefix}/include \
                         -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
-                        -DTK_STUB_LIBRARY=${prefix}/lib/libtkstub8.5.a \
                         -DFREETYPE_INCLUDE_DIR=${prefix}/include/freetype2 \
                         -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
                         -DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
@@ -85,7 +83,9 @@
                         -DPLD_svgcairo=ON \
                         -DPLD_tk=ON \
                         -DPLD_wxwidgets=OFF \
-                        -DPLD_xcairo=ON  \
+                        -DPLD_xcairo=OFF  \
+                        -DPLD_xwin=OFF \
+                        -DPLD_xfig=OFF \
                         -DPLD_tkwin=OFF \
                         -DENABLE_ada=OFF \
                         -DENABLE_d=OFF \
@@ -147,7 +147,8 @@
 
 if {${os.platform}=="darwin"} {
     default_variants    +aquaterm
-} 
+}
+default_variants-append +x11
 
 subport ${name}-single {
     configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}/lib/${subport}
@@ -227,15 +228,14 @@
                             -DAQT_FRAMEWORK=${frameworks_dir}/AquaTerm.framework
 }
 
-variant no_x11 {
-    depends_lib-delete      path:lib/pkgconfig/pango.pc:pango \
-                            port:tk
-    configure.args-delete   -DPLD_xcairo=ON  \
-                            -DPLD_tk=ON \
-                            -DTK_INCLUDE_PATH=${prefix}/include \
-                            -DTK_LIBRARY=${prefix}/lib/libtk.dylib
-    configure.args-append   -DPLD_xcairo=OFF \
+variant no_x11 conflicts x11 description {Deprecated dummy variant} {
+}
+
+variant x11 conflicts no_x11 {
+    configure.args-append   -DPLD_xcairo=ON  \
+                            -DPLD_xwin=ON \
+                            -DPLD_xfig=ON
+    configure.args-delete   -DPLD_xcairo=OFF \
                             -DPLD_xwin=OFF \
-                            -DPLD_tk=OFF \
-                            -DENABLE_tk=OFF
+                            -DPLD_xfig=OFF
 }

Modified: branches/pixilla-mysqls-55/dports/science/pylal/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/pylal/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/pylal/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 
 name               pylal
 version            0.1.5
+revision           2
 categories         science
 platforms          darwin
 maintainers        ram gmail.com:nickolas.fotopoulos
@@ -45,6 +46,8 @@
                    port:lalburst \
                    port:lalinspiral
 
+build.env-append   CFLAGS="-std=gnu99"
+
 # py27-scipy is not universal
 universal_variant  no
 

Modified: branches/pixilla-mysqls-55/dports/science/pymol/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/pymol/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/pymol/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,10 +3,11 @@
 
 PortSystem          1.0
 PortGroup           python26 1.0
+PortGroup           active_variants 1.0
 
 name                pymol
 version             1.5
-revision            5
+revision            6
 categories          science
 maintainers         bromo.med.uc.edu:howarth
 description         Molecular graphics system
@@ -21,7 +22,7 @@
 master_sites        sourceforge
 fetch.type          svn
 svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
-svn.revision        3996
+svn.revision        4007
 worksrcdir          pymol
 
 depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numpy port:py26-scipy port:mesa port:glew port:py26-tkinter port:freeglut
@@ -32,6 +33,11 @@
 
 patchfiles          setup_py.diff pymol_shell.diff pmg_tk_platform.patch apbs-psize.patch
 
+pre-configure {
+	require_active_variants tcl "" corefoundation
+	require_active_variants tk "" quartz
+}
+
 post-patch {
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
     reinplace  "s|@@PYTHON_PKGDIR@@|${python.pkgd}|g" ${worksrcpath}/setup/pymol_macports

Modified: branches/pixilla-mysqls-55/dports/science/pymol-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/pymol-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/pymol-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,9 +6,11 @@
 
 name                pymol-devel
 conflicts           pymol
-svn.revision        3964
-version             1.4.1.${svn.revision}
-revision            5
+svn.revision        4007
+version             1.5.0.3.r${svn.revision}
+# license is equivalent to the 3-clause BSD (http://pymol.svn.sourceforge.net/viewvc/pymol/trunk/pymol/LICENSE)
+license             BSD
+#revision            1
 categories          science
 maintainers         adfernandes openmaintainer
 description         Molecular graphics system
@@ -28,10 +30,20 @@
 depends_lib         port:freetype port:libpng port:python27 port:py27-pmw port:py27-numpy port:py27-scipy port:mesa port:glew port:py27-tkinter port:freeglut
 depends_run         port:xdpyinfo
 
+pre-fetch {
+    set i [lindex [registry_active "tcl"] 0]
+    set regref [registry_open [lindex $i 0] [lindex $i 1] [lindex $i 2] [lindex $i 3] [lindex $i 5]]
+    set variants [registry_prop_retr $regref variants]
+    if {[regexp "\\+corefoundation(\\+|-|$)" ${variants}]} {
+        ui_debug "Port '${name}' is incompatible with the 'corefoundation' variant of the 'tcl' port."
+        return -code error "incompatible variant in dependent port"
+    }
+}
+
 # py27-scipy is not universal
 universal_variant   no
 
-patchfiles          setup_py.diff pymol_shell.diff
+patchfiles          pymol_shell.diff pmg_tk_platform.patch apbs-psize.patch
 
 post-patch {
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
@@ -41,35 +53,43 @@
 
 use_parallel_build yes
 
-platform darwin 11 {
-    python.add_archflags   no
-    build.env CC="/usr/bin/clang" CXX="/usr/bin/clang++"
-}
-
-variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
+variant gcc43 description conflicts gcc44 gcc45 gcc46 gcc47 description {build using macports-gcc-4.3} {
     depends_lib-append  port:gcc43
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
+    configure.compiler  macports-gcc-4.3
 }
 
-variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
+variant gcc44 description conflicts gcc43 gcc45 gcc46 gcc47 description {build using macports-gcc-4.4} {
     depends_lib-append  port:gcc44
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
+    configure.compiler  macports-gcc-4.4
 }
 
-variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
+variant gcc45 description conflicts gcc43 gcc44 gcc46 gcc47 description {build using macports-gcc-4.5} {
     depends_lib-append  port:gcc45
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
+    configure.compiler  macports-gcc-4.5
 }
 
-variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
+variant gcc46 description conflicts gcc43 gcc44 gcc45 gcc47 description {build using macports-gcc-4.6} {
     depends_lib-append  port:gcc46
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.6" CXX="${prefix}/bin/g++-mp-4.6"
+    configure.compiler  macports-gcc-4.6
 }
 
+variant gcc47 description conflicts gcc43 gcc44 gcc45 gcc46 description {build using macports-gcc-4.7} {
+    depends_lib-append  port:gcc47
+    python.add_archflags   no
+    configure.compiler  macports-gcc-4.7
+}
+
+build {
+}
+
+pre-destroot {
+    destroot.env CC="${configure.cc}" CXX="${configure.cxx}"
+}
+
 post-destroot {
      file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
      file attributes ${destroot}${prefix}/bin/pymol -permissions a+x

Copied: branches/pixilla-mysqls-55/dports/science/pymol-devel/files/apbs-psize.patch (from rev 100173, trunk/dports/science/pymol-devel/files/apbs-psize.patch)
===================================================================
--- branches/pixilla-mysqls-55/dports/science/pymol-devel/files/apbs-psize.patch	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/science/pymol-devel/files/apbs-psize.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,11 @@
+--- modules/pmg_tk/startup/apbs_tools.py.orig	2012-02-18 17:28:11.000000000 -0500
++++ modules/pmg_tk/startup/apbs_tools.py	2012-02-18 17:38:31.000000000 -0500
+@@ -832,7 +832,7 @@
+                                      label_pyclass = FileDialogButtonClassFactory.get(self.setPsizeLocation),
+                                      validate = {'validator':quickFileValidation,},
+                                      #value = '/usr/local/apbs-0.3.1/tools/manip/psize.py',
+-                                     value = get_default_location('psize.py'),
++                                     value = get_default_location('apbs-psize.py'),
+                                      label_text = 'APBS psize.py location:',
+                                      )
+         self.psize.pack(fill = 'x', padx = 20, pady = 10)

Copied: branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pmg_tk_platform.patch (from rev 100173, trunk/dports/science/pymol-devel/files/pmg_tk_platform.patch)
===================================================================
--- branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pmg_tk_platform.patch	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pmg_tk_platform.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,56 @@
+--- modules/pmg_tk/skins/normal/__init__.py.orig	2012-02-18 12:31:32.000000000 -0500
++++ modules/pmg_tk/skins/normal/__init__.py	2012-02-18 12:32:53.000000000 -0500
+@@ -250,7 +250,7 @@
+         self.buttonArea.destroy()
+ 
+     def my_show(self,win,center=1):
+-        if sys.platform!='linux2':
++        if (sys.platform!='linux2') and (sys.platform!='darwin'):
+             win.show()
+         else: # autocenter, deiconify, and run mainloop
+             # this is a workaround for a bug in the
+@@ -269,13 +269,13 @@
+ #         win.show()
+             
+     def my_withdraw(self,win):
+-        if sys.platform!='linux2':
++        if (sys.platform!='linux2') or (sys.platform!='darwin'):
+             win.withdraw()
+         else: 
+             win.destroy()
+ 
+     def my_activate(self,win,center=1,focus=None):
+-        if sys.platform!='linux2':
++        if (sys.platform!='linux2') and (sys.platform!='darwin'):
+             win.activate()
+         else: # autocenter, deiconify, and run mainloop
+             # this is a workaround for a bug in the
+@@ -296,7 +296,7 @@
+             win.mainloop()
+             
+     def my_deactivate(self,win):
+-        if sys.platform!='linux2':
++        if (sys.platform!='linux2') or (sys.platform!='darwin'):
+             win.deactivate()
+         else: # autocenter, deiconify, and run mainloop
+             win.destroy()
+--- modules/pmg_tk/PMGApp.py.orig	2012-02-18 12:35:29.000000000 -0500
++++ modules/pmg_tk/PMGApp.py	2012-02-18 12:36:46.000000000 -0500
+@@ -219,7 +219,7 @@
+ 
+ 
+     def my_show(self,win,center=1):
+-        if sys.platform!='linux2':
++        if (sys.platform!='linux2') and (sys.platform!='darwin'):
+             win.show()
+         else: # autocenter, deiconify, and run mainloop
+             # this is a workaround for a bug in the
+@@ -237,7 +237,7 @@
+             win.deiconify()
+ 
+     def my_withdraw(self,win):
+-        if sys.platform!='linux2':
++        if (sys.platform!='linux2') or (sys.platform!='darwin'):
+             win.withdraw()
+         else: 
+             win.destroy()

Modified: branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pymol_shell.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pymol_shell.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/pymol-devel/files/pymol_shell.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,6 +1,6 @@
 --- /dev/null	2011-04-22 23:16:48.000000000 -0400
 +++ setup/pymol_macports	2011-04-22 23:19:48.000000000 -0400
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,16 @@
 +#!/bin/sh
 +#
 +# PyMOL startup script
@@ -16,7 +16,4 @@
 +#
 +# python modules
 +#
-+APBS_PSIZE=@PREFIX@/bin/apbs-psize.py
-+export APBS_PSIZE
-+#
 +exec @@PYTHON_BINARY@@ @@PYTHON_PKGDIR@@/pymol/__init__.py -d "_ set stereo_double_pump_mono,quiet=1" "$@"

Modified: branches/pixilla-mysqls-55/dports/science/splash/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/splash/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/splash/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 
 name                splash
-version             2.1.1
-revision            1
+version             2.2.0
+revision            0
 categories          science graphics
 platforms           darwin
 maintainers         monash.edu:daniel.price
@@ -19,8 +19,8 @@
 
 worksrcdir          ${name}
 
-checksums           rmd160   2bfb9c9945f3f5669cbc1e6fc9be46572051f86b \
-                    sha256   0134d87e45927293fa579b568b64ccbbde88a19fca1a753668d1d38738b246e1
+checksums           rmd160   e10e38d3b5f0cc6774ffaa3645850598eb7d918c \
+                    sha256   af47d7990947c7273bcd0a4f06416cdd180165d6ca628337022341d7242a799f
 
 if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
    default_variants      +gcc45
@@ -40,7 +40,7 @@
 
 variant giza description {use giza as the backend graphics library} conflicts pgplot {
    depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo \
-                           port:xorg-libx11
+                           port:xorg-libX11
    build.args-append       X11DIR=${prefix} X11LIBS='-L${prefix}/lib -lX11'
 }
 
@@ -78,7 +78,7 @@
 
 variant h5part description {compiles H5Part data read} {
    build.args-append       h5part HDF5ROOT=${prefix} H5PART_DIR=${prefix} H5PART_LIBS="-L${prefix}/lib -lH5Part"
-   depends_lib-append      port:h5part
+   depends_lib-append      port:H5Part
 }
 
 variant read_extraformats1 description {compiles additional data reads: foulkes, mbatesph, oilonwater, rsph, urban (f/b/o/r/usplash)} conflicts read_extraformats2 {

Modified: branches/pixilla-mysqls-55/dports/science/triangle/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/triangle/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/triangle/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,6 +6,7 @@
 version			1.6
 revision                3
 categories		science
+license			Noncommercial Copyleft
 maintainers		jwa openmaintainer
 description		A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator
 long_description	Triangle generates exact Delaunay triangulations, \

Modified: branches/pixilla-mysqls-55/dports/science/uhd/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/uhd/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/uhd/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -40,12 +40,12 @@
     long_description ${description}: \
 Provides the GIT master version, which is typically updated every few days to week.
 
-    version         003_005_000_git
-    revision        1
+    set base_version 003_005_000
+    version         ${base_version}_20121113
     fetch.type      git
     git.url         https://github.com/EttusResearch/UHD-Mirror.git
-    git.branch      d66d697d6b3999e3bea91239c63ebc0a9ec0802b
-    worksrcdir      UHD-Mirror-release-${version}
+    git.branch      b65a3924808b48e170042f1f8ca416bd985a852f
+    worksrcdir      UHD-Mirror-release-${base_version}_git
     conflicts       uhd
     livecheck.type  none
 

Modified: branches/pixilla-mysqls-55/dports/science/usrp/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/science/usrp/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/science/usrp/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,118 +2,26 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup muniversal 1.0
-PortGroup archcheck 1.0
 
 name			usrp
-version         3.3.0
-revision        1
-maintainers		michaelld
+version         003_005_000
+maintainers		michaelld openmaintainer
 description		USRP user-space driver / interface via USB.
 long_description USRP user-space driver / interface via USB.
 
 categories		science
-license         GPL-3+
+license         GPL-3
 homepage        http://gnuradio.org/
 
-# all GNU Radio components come in a single tarball.
-# Reuse this tarball for each Port
+# disable this port
 
-dist_subdir		gnuradio
-master_sites.mirror_subdir gnuradio
-distname		gnuradio-${version}
-master_sites	gnu
+replaced_by uhd
 
-platforms		darwin macosx
+livecheck.type none
 
-checksums       md5     cef9ef65d626e1273c6381966ae9d4bc \
-                sha1    41d5c177b173ce73404f5fe539b013c82600f73f \
-                rmd160  ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-
-# USRP does not work with SDCC3
-depends_build	port:gnuradio-gruel \
-                port:sdcc29 \
-                port:pkgconfig \
-                port:swig-python
-
-# do not archcheck sdcc, just use it
-depends_skip_archcheck sdcc29
-
-configure.args	--disable-all-components \
-				--with-gruel \
-				--enable-usrp
-configure.env-append PATH=${prefix}/libexec/sdcc29/bin:$env(PATH)
-build.env-append PATH=${prefix}/libexec/sdcc29/bin:$env(PATH)
-
-use_parallel_build	yes
-
-variant docs description "build documentation for ${name}" {
-	configure.args-append --enable-doxygen --enable-docs
-	depends_lib-append port:doxygen
+pre-configure {
+    ui_error "This port has been replaced by 'uhd'; please install that instead."
+    return -code error
 }
 
-if { ![variant_isset docs] } {
-	configure.args-append --disable-doxygen --disable-docs
-}
-
-variant python25 conflicts python26 python27 \
-description "Use Python 2.5" {
-    configure.env-append PYTHON=${prefix}/bin/python2.5
-    depends_lib-append port:python25
-}
-
-variant python26 conflicts python25 python27 \
-description "Use Python 2.6" {
-    configure.env-append PYTHON=${prefix}/bin/python2.6
-    depends_lib-append port:python26
-}
-
-variant python27 conflicts python25 python26 \
-description "Use Python 2.7" {
-    configure.env-append PYTHON=${prefix}/bin/python2.7
-    depends_lib-append port:python27
-}
-
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-    default_variants +python26
-}
-
-# make sure -python26 is not alone
-if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
-     ![variant_isset python27] } {
-    return -code error \
-        "\n\nThe variant -python26 will not work alone.
-Please select one of +python25, +python26, or +python27 as a variant."
-}
-
-variant libusb_legacy \
-description "Use LIBUSB legacy version for USB transport" {
-    depends_lib-append     port:libusb-legacy
-    archcheck.files-append lib/libusb-legacy/libusb-legacy.dylib
-    # fix LIBUSB search to include 'usb_debug' symbol, so-as
-    # to avoid using the 'compat' library.
-    patchfiles      patch-configure-libusb.diff
-}
-
-variant libusb_1 \
-description "Use LIBUSB version 1.0 for USB transport" {
-    depends_lib-append     port:libusb
-    archcheck.files-append lib/libusb-1.0.dylib
-    configure.args-append  --with-fusb-tech=libusb1
-}
-
-if { ![variant_isset libusb_legacy] && \
-     ![variant_isset libusb_1] } {
-    default_variants +libusb_legacy
-}
-
-# make sure -libusb_legacy is not alone
-if { ![variant_isset libusb_legacy] && \
-     ![variant_isset libusb_1] } {
-    return -code error \
-"\n\nThe variant -libusb_legacy will not work alone.
-Please select one of +libusb_legacy or +libusb_1 as a variant.\n"
-}
+distfiles

Modified: branches/pixilla-mysqls-55/dports/security/stegdetect/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/security/stegdetect/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/security/stegdetect/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -32,6 +32,9 @@
    reinplace "s|install:|_install:|g" ${worksrcpath}/jpeg-6b/Makefile
 }
 
+# sed: RE error: illegal byte sequence
+build.env           LANG=C
+
 post-destroot {
    xinstall -m 755 -d ${destroot}${prefix}/share/stegbreak
    xinstall -m 644 -W ${filespath} rules.ini.sample \

Modified: branches/pixilla-mysqls-55/dports/sysutils/bacula/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/bacula/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/sysutils/bacula/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,66 +1,66 @@
 # -*- 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
+PortSystem          1.0
 
-name             bacula
-version          5.2.12
-categories       sysutils
-platforms        darwin
-license          GPL
-maintainers      macsforever2000
+name                bacula
+version             5.2.12
+categories          sysutils
+platforms           darwin
+license             GPL
+maintainers         macsforever2000 googlemail.com:robertoschwald
 
-description      network based backup program
-long_description Bacula is a set of computer programs that permit you to \
-                 manage backup, recovery, and verification of computer data across \
-                 a network of computers of different kinds.
+description         network based backup program
+long_description    Bacula is a set of computer programs that permit you to \
+                    manage backup, recovery, and verification of computer data across \
+                    a network of computers of different kinds.
 
-homepage         http://www.bacula.org/
-master_sites     sourceforge
+homepage            http://www.bacula.org/
+master_sites        sourceforge
 
-checksums        rmd160  dd5b9f457a524acd9cdbbe0c4842670c4ee5bd5a \
-                 sha256  360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887
+checksums           rmd160  dd5b9f457a524acd9cdbbe0c4842670c4ee5bd5a \
+                    sha256  360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887
 
-depends_lib      port:gawk \
-                 port:gettext \
-                 port:libiconv \
-                 port:ncurses \
-                 port:openssl \
-                 port:tcp_wrappers \
-                 port:zlib
+depends_build       port:pkgconfig
+depends_lib         port:gawk \
+                    port:gettext \
+                    port:libiconv \
+                    port:ncurses \
+                    port:openssl \
+                    port:tcp_wrappers \
+                    port:zlib
 
 # Comment out patchfiles in case they are needed in the future or for the non-client version which is completely untested at this point
-#patchfiles       patch-configure.diff \
-#                 patch-base64-typecast.diff
-
+#                patch-configure.diff \
+#                patch-base64-typecast.diff
 #post-patch {
 #                 reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
 #}
 
-configure.ccache no
-configure.args   --mandir=${prefix}/share/man \
-                 --docdir=${prefix}/share/doc/bacula \
-                 --datarootdir=${prefix}/share \
-                 --with-pid-dir=${prefix}/var/run \
-                 --with-subsys-dir=${prefix}/var/run/subsys \
-                 --sysconfdir=${prefix}/etc/${name} \
-                 --with-libintl-prefix=${prefix} \
-                 --with-openssl=${prefix} \
-                 --with-libiconv-prefix=${prefix} \
-                 --with-readline=${prefix} \
-                 --with-archivedir=/var/tmp \
-                 --with-included-gettext=${prefix} \
-                 --enable-smartalloc \
-                 --enable-largefile \
-                 --without-sqlite \
-                 --without-sqlite3 \
-                 --without-postgresql \
-                 --without-mysql \
-                 --disable-gnome \
-                 --disable-wx-console \
-                 --disable-tray-monitor \
-                 --with-tcp-wrappers \
-                 ac_cv_lib_ssl_EVP_PKEY_encrypt_old=yes
+configure.ccache    no
+configure.args      --mandir=${prefix}/share/man \
+                    --docdir=${prefix}/share/doc/bacula \
+                    --datarootdir=${prefix}/share \
+                    --with-pid-dir=${prefix}/var/run \
+                    --with-subsys-dir=${prefix}/var/run/subsys \
+                    --sysconfdir=${prefix}/etc/${name} \
+                    --with-libintl-prefix=${prefix} \
+                    --with-openssl=${prefix} \
+                    --with-libiconv-prefix=${prefix} \
+                    --with-readline=${prefix} \
+                    --with-archivedir=/var/tmp \
+                    --with-included-gettext=${prefix} \
+                    --enable-smartalloc \
+                    --enable-largefile \
+                    --without-sqlite \
+                    --without-sqlite3 \
+                    --without-postgresql \
+                    --without-mysql \
+                    --disable-gnome \
+                    --disable-wx-console \
+                    --disable-tray-monitor \
+                    --with-tcp-wrappers \
+                    ac_cv_lib_ssl_EVP_PKEY_encrypt_old=yes
 
 # The ac_cv_lib_ssl_EVP_PKEY_encrypt_old=yes line above is for openssl 1.0
 # to get around an apparent bug in bacula
@@ -73,9 +73,9 @@
 
 # Don't overwrite preference files
 post-destroot {
-  file rename ${destroot}${prefix}/etc/bacula/bacula-fd.conf ${destroot}${prefix}/etc/bacula/bacula-fd.conf.example
-  file rename ${destroot}${prefix}/etc/bacula/bconsole.conf ${destroot}${prefix}/etc/bacula/bconsole.conf.example
-  file rename ${destroot}${prefix}/etc/bacula/mtx-changer.conf ${destroot}${prefix}/etc/bacula/mtx-changer.conf.example
+    file rename ${destroot}${prefix}/etc/bacula/bacula-fd.conf ${destroot}${prefix}/etc/bacula/bacula-fd.conf.example
+    file rename ${destroot}${prefix}/etc/bacula/bconsole.conf ${destroot}${prefix}/etc/bacula/bconsole.conf.example
+    file rename ${destroot}${prefix}/etc/bacula/mtx-changer.conf ${destroot}${prefix}/etc/bacula/mtx-changer.conf.example
 }
 
 startupitem.create  yes
@@ -84,45 +84,64 @@
 startupitem.stop    "\[ -r \${PID} \] && /bin/kill \$(cat \${PID})"
 
 variant client_only conflicts mysql5 postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client (bacula-fd) only" {
-  configure.args-append --enable-client-only
+    configure.args-append --enable-client-only
 }
 
+variant console_bat description "Install BAT console GUI application" {
+    patchfiles            patch-qt-console-osx.diff
+    depends_build-append  port:tcp_wrappers \
+                          port:makeicns
+    depends_lib-append    port:qt4-mac \
+                          port:qwt52
+    configure.args-append --enable-bat
+    post-patch {
+        system "makeicns -in ${worksrcpath}/src/qt-console/images/bat_icon.png -out ${worksrcpath}/src/qt-console/images/bat_icon.icns"
+    }
+    post-destroot {
+        file rename ${destroot}${prefix}/etc/bacula/bat.conf ${destroot}${prefix}/etc/bacula/bat.conf.example
+        # for now, copy manually until upstream provider fixes bat.app install routines
+        xinstall -m 755 -d ${destroot}${applications_dir}
+        copy ${worksrcpath}/src/qt-console/bat.app ${destroot}${applications_dir}/Bacula-BAT.app
+    }
+    notes "To use the Bacula BAT GUI, you'll need to configure \"${prefix}/etc/bacula/bat.conf\"."
+}
+
 variant mysql5 conflicts client_only postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client and server with mysql 5 backend" {
-  depends_lib-append    path:bin/mysql_config5:mysql5
-  configure.args-append --with-mysql
-  configure.args-delete --without-mysql
+    depends_lib-append    path:bin/mysql_config5:mysql5
+    configure.args-append --with-mysql
+    configure.args-delete --without-mysql
 }
 
 variant postgresql83 conflicts mysql5 postgresql84 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.3 backend" {
-  depends_lib-append    port:postgresql83
-  configure.args-append --with-postgresql
-  configure.args-delete --without-postgresql
-  configure.env-append PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
+    depends_lib-append    port:postgresql83
+    configure.args-append --with-postgresql
+    configure.args-delete --without-postgresql
+    configure.env-append  PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
 }
 
 variant postgresql84 conflicts mysql5 postgresql83 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.4 backend" {
-  depends_lib-append    port:postgresql84
-  configure.args-append --with-postgresql
-  configure.args-delete --without-postgresql
-  configure.env-append PATH=${prefix}/lib/postgresql84/bin:$env(PATH)
+    depends_lib-append    port:postgresql84
+    configure.args-append --with-postgresql
+    configure.args-delete --without-postgresql
+    configure.env-append  PATH=${prefix}/lib/postgresql84/bin:$env(PATH)
 }
 
 variant sqlite2 conflicts client_only sqlite3 mysql5 postgresql83 postgresql84 description "Install bacula client and server with sqlite 2 backend" {
-  depends_lib-append    port:sqlite2
-  configure.args-append --with-sqlite=${prefix}
-  configure.args-delete --without-sqlite
+    depends_lib-append    port:sqlite2
+    configure.args-append --with-sqlite=${prefix}
+    configure.args-delete --without-sqlite
 }
 
 variant sqlite3 conflicts client_only sqlite2 mysql5 postgresql83 postgresql84 description "Install bacula client and server with sqlite 3 backend" {
-  depends_lib-append    port:sqlite3
-  configure.args-append --with-sqlite3=${prefix}
-  configure.args-delete --without-sqlite3
+    depends_lib-append    port:sqlite3
+    configure.args-append --with-sqlite3=${prefix}
+    configure.args-delete --without-sqlite3
 }
 
 if {![variant_isset mysql5] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset sqlite2] && ![variant_isset sqlite3]} {
-  default_variants +client_only
+    default_variants +client_only
 }
 
-livecheck.type          regex
-livecheck.url           http://sourceforge.net/projects/bacula/files/
-livecheck.regex         {bacula-([0-9\.]+)\.tar\.gz}
+livecheck.type           regex
+livecheck.url            http://sourceforge.net/projects/bacula/files/
+livecheck.regex          {bacula-([0-9\.]+)\.tar\.gz}

Copied: branches/pixilla-mysqls-55/dports/sysutils/bacula/files/patch-qt-console-osx.diff (from rev 100173, trunk/dports/sysutils/bacula/files/patch-qt-console-osx.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/bacula/files/patch-qt-console-osx.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/sysutils/bacula/files/patch-qt-console-osx.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,15 @@
+diff -ur src/qt-console/bat.pro.in.orig src/qt-console/bat.pro.in
+--- src/qt-console/bat.pro.in.orig	2012-11-13 11:37:22.000000000 +0100
++++ src/qt-console/bat.pro.in	2012-11-13 11:36:23.000000000 +0100
+@@ -31,6 +31,10 @@
+   LIBS        += @QWT_LDFLAGS@ @QWT_LIB@
+ }
+ 
++macx {
++  ICON = images/bat_icon.icns
++}
++
+ RESOURCES    = main.qrc
+ MOC_DIR      = moc
+ OBJECTS_DIR  = obj
+

Modified: branches/pixilla-mysqls-55/dports/sysutils/di/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/di/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/sysutils/di/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                di
-version             4.32
+version             4.33
 categories          sysutils
 platforms           darwin
 maintainers         mww
@@ -15,8 +15,8 @@
 homepage            http://www.gentoo.com/di/
 master_sites        ${homepage} http://fresh.t-systems-sfr.com/unix/src/privat2/
 
-checksums           rmd160  713d728582623b8b70995461fd54eb8c604ee5ad \
-                    sha256  b6483327484b9bd5a63eb7d3c51bdfa9f5614c06a1fc37b3b05ad710821a0dc8
+checksums           rmd160  62793693dd8203310b2d8bea4b386bc3d1bf9552 \
+                    sha256  58aef2d5238762b60468ec2ee760e022a72af6424bd14d33683748d9a09922d5
 
 depends_lib         port:gettext
 

Modified: branches/pixilla-mysqls-55/dports/sysutils/duply/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/duply/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/sysutils/duply/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                duply
-version             1.5.7
+version             1.5.9
 set branch          [join [lrange [split ${version} .] 0 1] .]
 platforms           darwin
 categories          sysutils
@@ -24,8 +24,8 @@
 extract.suffix      .tgz
 distname            ${name}_${version}
 
-checksums           rmd160  f9ed12cdf0e143c293f958b4efbd915e51614171 \
-                    sha256  7fec9bc16f7c7d6ee8fd93e5051ee3e694213921654354439d05d146f64d45c7
+checksums           rmd160  f5f56d5b3ca5a54e0b5ccbd0771d077a62c508d1 \
+                    sha256  e8de8e6b477f3abe9c5a959aabe7b6c030594aa982c54818b8bf6ac3612c6f7d
 
 depends_run         port:duplicity
 

Modified: branches/pixilla-mysqls-55/dports/sysutils/glances/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/glances/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/sysutils/glances/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 PortGroup           github 1.0
 PortGroup           python 1.0
 
-github.setup        nicolargo glances 1.4.2.1 v
+github.setup        nicolargo glances 1.5.1 v
 
 python.default_version  27
 categories          sysutils
@@ -17,8 +17,8 @@
 
 platforms           darwin
 
-checksums           rmd160  88ad1a4a1f8414d6f078ceb00f640be7ae20aa21 \
-                    sha256  9c093fbd7c3921f9da28be9b9e0620db050ee53d7c4e3b1cfc221910e555355f
+checksums           rmd160  efdb23b0e82aeab20031d972e68a2b4758a272a1 \
+                    sha256  284ec0b09d0955546ca3a42a6080d21892cbdcecc7bc147bf5ba5b564dfaa710
 
 depends_build       port:py${python.version}-distribute
 

Modified: branches/pixilla-mysqls-55/dports/sysutils/parallel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/parallel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/sysutils/parallel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                parallel
-version             20121022
+version             20121122
 categories          sysutils
 platforms           darwin
 license             GPL-3+
@@ -23,8 +23,8 @@
 
 depends_lib         port:perl5
 
-checksums           rmd160  fcce9f573172e991f50e3a65637ad8f3daf23536 \
-                    sha256  13626899b50f884d635e0bd21684e87e51d0f235e760f11b8df4a605e0fa03c8
+checksums           rmd160  6e5661e6037de1e0ce3b527a976d4d3270e839f5 \
+                    sha256  0315336141612ba2ec1f76e6c8c58a72f4531777c96b79b91ef64b3980be584f
 
 post-patch {
     set perl_bin ${prefix}/bin/perl

Modified: branches/pixilla-mysqls-55/dports/sysutils/sleuthkit/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/sleuthkit/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/sysutils/sleuthkit/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                sleuthkit
-version             3.2.3
+version             4.0.1
 categories          sysutils
 maintainers         gmail.com:jessekornblum
 platforms           darwin
@@ -24,8 +24,8 @@
 homepage            http://www.sleuthkit.org/sleuthkit/
 master_sites        sourceforge:project/sleuthkit/sleuthkit/${version}
 
-checksums           rmd160  ee9849ff34bd7d1ce90819f22f1e09a71e4d0e8c \
-                    sha256  ba5f63d7fd60d978de03777c72b1571004caa8dfe384f09757b6a8efa890ea62
+checksums           rmd160  262f6ef7ddb3aa76654c02a0d7d7380d0fc4ce1b \
+                    sha256  719d9a702f74c30302840301fe573c5bb5af5b88471b48657114eba6b0d76f12
 
 depends_build       port:file \
                     port:perl5.12

Modified: branches/pixilla-mysqls-55/dports/sysutils/terminator/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/sysutils/terminator/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/sysutils/terminator/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -2,10 +2,29 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               python 1.0
 
 name                    terminator
 version                 0.96
+revision                1
+categories              sysutils
+platforms               darwin
+maintainers             ryandesign openmaintainer
+license                 GPL-2
+supported_archs         noarch
 
+description             multiple terminal emulator
+
+long_description        ${name} lets you open multiple terminal emulators in \
+                        a single window.
+
+homepage                http://www.tenshu.net/p/terminator.html
+master_sites            http://launchpad.net/terminator/trunk/${version}/+download
+dist_subdir             ${name}
+
+checksums               rmd160  376ecd9c6f3d0cfdc4c151ebb2e90a5e118fee93 \
+                        sha256  d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201
+
 if {![variant_isset python26] && ![variant_isset python27]} {
     if {[file exists ${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages/gtk-2.0/vtemodule.so]} {
         default_variants +python26
@@ -17,49 +36,32 @@
 
 variant python26 conflicts python27 description {Use Python 2.6} {}
 if {[variant_isset python26]} {
-    PortGroup           python26 1.0
-    pre-configure {
-        if {![file exists ${python.pkgd}/gtk-2.0/vtemodule.so]} {
-            ui_error "To install ${name} with the +python26 variant, vte must be installed with the +python26 variant."
-            return -code error "incompatible vte installation"
-        }
-    }
+    python.default_version 26
 }
 
 variant python27 conflicts python26 description {Use Python 2.7} {}
 if {[variant_isset python27]} {
-    PortGroup           python27 1.0
-    pre-configure {
-        if {![file exists ${python.pkgd}/gtk-2.0/vtemodule.so]} {
-            ui_error "To install ${name} with the +python27 variant, vte must be installed with the +python27 variant."
-            return -code error "incompatible vte installation"
-        }
-    }
+    python.default_version 27
 }
 
-categories              sysutils
-platforms               darwin
-maintainers             ryandesign openmaintainer
-license                 GPL-2
-supported_archs         noarch
+depends_build-append    port:intltool
 
-description             multiple terminal emulator
+depends_lib-append      port:vte \
+                        port:hicolor-icon-theme \
+                        port:py${python.version}-keybinder \
+                        port:py${python.version}-notify-python
 
-long_description        ${name} lets you open multiple terminal emulators in \
-                        a single window.
+post-patch {
+    reinplace -E "s|^#!/usr/bin/env python|#!${python.bin}|" ${worksrcpath}/${name}
+}
 
-homepage                http://www.tenshu.net/p/terminator.html
-master_sites            http://launchpad.net/terminator/trunk/${version}/+download
-dist_subdir             ${name}
+pre-configure {
+    if {![file exists ${python.pkgd}/gtk-2.0/vtemodule.so]} {
+        ui_error "To install ${name} with the +python${python.version} variant, vte must be installed with the +python${python.version} variant."
+        return -code error "incompatible vte installation"
+    }
+}
 
-checksums               rmd160  376ecd9c6f3d0cfdc4c151ebb2e90a5e118fee93 \
-                        sha256  d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201
-
-depends_build-append    port:intltool
-
-depends_lib-append      port:vte \
-                        port:hicolor-icon-theme
-
 # no suffix since there are not multiple versions of this port
 python.link_binaries_suffix
 


Property changes on: branches/pixilla-mysqls-55/dports/tex
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex:72668-73311,94196-95338
   + /trunk/dports/tex:99672-100173
/users/dports/ports/tex:72668-73311,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/dvipng/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/dvipng/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/dvipng/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -43,10 +43,6 @@
          && ([vercmp [lindex $vers 1] 23089] < 0
              || [vercmp [lindex $vers 1] 23089] == 0
              && [lindex $vers 2] < 1)} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/tex/latexdiff/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/latexdiff/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/latexdiff/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -60,10 +60,6 @@
     if {[file exists $prefix/bin/latexdiff]
         && ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
         && [vercmp [lindex $vers 1] 19536] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
     }
 }


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-basic
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-basic:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-basic:99672-100173
/users/dports/ports/tex/texlive-basic:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-basic/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-basic/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-basic/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -68,23 +68,19 @@
                     patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg.diff
 
 pre-activate {
-    set deactivate_proc registry_deactivate_composite
-    if {[info commands registry_deactivate_composite] == {}} {
-        set deactivate_proc registry_deactivate
-    }
     # If texlive 2007 metaport is installed, deactivate it to avoid
     # conflicts on $prefix/bin/etex etc.
     if {[file exists $prefix/bin/etex] 
         && ![catch {set vers [lindex [registry_active texlive] 0]}]
         && [vercmp [lindex $vers 1] 2009] < 0} {
-        $deactivate_proc texlive "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive "" [list ports_nodepcheck 1]
     }
 
     # Deactivate texlive-fontutils to avoid conflicts on mft from the
     # 2009->2010 update
     if {![catch {set vers [lindex [registry_active texlive-fontutils] 0]}]
         && [vercmp [lindex $vers 1] 16392] < 0} {
-        $deactivate_proc texlive-fontutils "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-fontutils "" [list ports_nodepcheck 1]
     }
 
     # Deactivate 2009 version of texlive-lang-mongolian if it's
@@ -93,7 +89,7 @@
     if {![catch {set vers [lindex [registry_active texlive-lang-mongolian] 0]}]
          && [vercmp [lindex $vers 1] 14727] == 0
          && [lindex $vers 2] < 2} {
-        $deactivate_proc texlive-lang-mongolian "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-lang-mongolian "" [list ports_nodepcheck 1]
     }
 }
 


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-bin
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-bin:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-bin:99672-100173
/users/dports/ports/tex/texlive-bin:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-bin/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-bin/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-bin/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -236,21 +236,13 @@
          && ![catch {set vers [lindex [registry_active texlive-htmlxml] 0]}]
          && [vercmp [lindex $vers 1] 13822] == 0
          && [lindex $vers 2] <3} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-htmlxml "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-htmlxml "" [list ports_nodepcheck 1]
     }
 
     if { [file exists ${texlive_texmfmain}/scripts/tetex/updmap.pl]
          && ![catch {set vers [lindex [registry_active texlive-basic] 0]}]
          && [vercmp [lindex $vers 1] 23152] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-basic "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-basic "" [list ports_nodepcheck 1]
     }
 
     # TL2012: some scripts in texmf are now installed by this port


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-fonts-recommended
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-fonts-recommended:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-fonts-recommended:99672-100173
/users/dports/ports/tex/texlive-fonts-recommended:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-fonts-recommended/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-fonts-recommended/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-fonts-recommended/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -54,11 +54,7 @@
     # cmsuper moved from fonts-extra to fonts-recommended in TL2010
     if {![catch {set vers [lindex [registry_active texlive-fonts-extra] 0]}]
         && [vercmp [lindex $vers 1] 19491] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-fonts-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-fonts-extra "" [list ports_nodepcheck 1]
     }
 }
 


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-generic-recommended
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-generic-recommended:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-generic-recommended:99672-100173
/users/dports/ports/tex/texlive-generic-recommended:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-generic-recommended/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-generic-recommended/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-generic-recommended/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -30,11 +30,7 @@
     # kastrup moved from texlive-latex-extra to texlive-generic-recommended
     if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
         && [vercmp [lindex $vers 1] 19548] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
     }
 }
 


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-latex
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-latex:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-latex:99672-100173
/users/dports/ports/tex/texlive-latex:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-latex/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-latex/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-latex/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -46,11 +46,7 @@
     # 2009->2010 update
     if {![catch {set vers [lindex [registry_active texlive-context] 0]}]
         && [vercmp [lindex $vers 1] 18549] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-context "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-context "" [list ports_nodepcheck 1]
     }
 }
 


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-latex-recommended
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-latex-recommended:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-latex-recommended:99672-100173
/users/dports/ports/tex/texlive-latex-recommended:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-latex-recommended/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-latex-recommended/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-latex-recommended/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -35,21 +35,13 @@
     # fontspec moved from texlive-xetex in TL2011
     if {![catch {set vers [lindex [registry_active texlive-xetex] 0]}]
         && [vercmp [lindex $vers 1] 23080] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-xetex "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-xetex "" [list ports_nodepcheck 1]
     }
 
     # textcase moved from texlive-latex-extra in TL2011
     if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
         && [vercmp [lindex $vers 1] 22931] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
     }
 }
 


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-math-extra
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-math-extra:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-math-extra:99672-100173
/users/dports/ports/tex/texlive-math-extra:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-math-extra/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-math-extra/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-math-extra/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -39,11 +39,7 @@
     # binomexp moved from texlive-latex-extra to texlive-math-extra in TL2010
     if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
         && [vercmp [lindex $vers 1] 19538] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
     }
 }
 


Property changes on: branches/pixilla-mysqls-55/dports/tex/texlive-pictures
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive-pictures:79479-82096,94196-95338
   + /trunk/dports/tex/texlive-pictures:99672-100173
/users/dports/ports/tex/texlive-pictures:79479-82096,94196-95338

Modified: branches/pixilla-mysqls-55/dports/tex/texlive-pictures/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/tex/texlive-pictures/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/tex/texlive-pictures/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -44,11 +44,7 @@
 pre-activate {
     if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
         && [vercmp [lindex $vers 1] 19538] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
     }
 }
 

Modified: branches/pixilla-mysqls-55/dports/textproc/chasen-base/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/chasen-base/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/chasen-base/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -76,7 +76,7 @@
         && ([vercmp [lindex $vers 1] 2.4.4] < 0 ||
             [vercmp [lindex $vers 1] 2.4.4] == 0
             && [vercmp [lindex $vers 2] 1] < 1)} {
-        registry_deactivate chasen "" [list ports_nodepcheck 1]
+        registry_deactivate_composite chasen "" [list ports_nodepcheck 1]
     }
 }
 

Modified: branches/pixilla-mysqls-55/dports/textproc/cpi00/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/cpi00/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/cpi00/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                cpi00
-version             0.0.2
+version             0.0.3
 categories          textproc
 maintainers         hum openmaintainer
 
@@ -19,8 +19,8 @@
 license             BSD
 
 master_sites        googlecode
-checksums           rmd160  878e63957dcc55612a2d13d3df68f949c46503bb \
-                    sha256  30123b99cf6f2dc2932a6b0e51780c70027d9c9c8da5ef87d40a47cbde413b1e
+checksums           rmd160  76224eee7385acbc8a0776bc55773a382e165675 \
+                    sha256  6e6e635db08092f676f2e736885ba6838df93f94f11451f7c40b4c6cb6b7b4c6
 
 worksrcdir          ${name}
 

Modified: branches/pixilla-mysqls-55/dports/textproc/docbook-dsssl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/docbook-dsssl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/docbook-dsssl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -10,6 +10,7 @@
 platforms	darwin
 depends_run	port:xmlcatmgr
 maintainers     decibel.org:decibel
+supported_archs noarch
 master_sites	sourceforge:docbook
 homepage	http://docbook.sf.net/
 checksums	md5 8459913bbd8a5724a6fe4b9ed5bab5af

Modified: branches/pixilla-mysqls-55/dports/textproc/icat/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/icat/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/icat/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        atextor icat 0.3 v
+github.setup        atextor icat 0.3.1 v
 
 maintainers         g5pw
 
@@ -16,8 +16,8 @@
 
 depends_lib         port:imlib2
 
-checksums           rmd160  33663d6ef94f3b6ca993ea628ea707eca8931913 \
-                    sha256  eb027b0283b6e42bb5dcccd1673a244ec33eff57cbc9ca94b636841b45359a71
+checksums           rmd160  ce70161c5b99cca93700e6a7dd68243f46229f8b \
+                    sha256  fd0b5dba6ec90e306b6f48ea766d5919e30191ebdf34bf60b1cd71176d82edb4
 
 use_configure       no
 

Modified: branches/pixilla-mysqls-55/dports/textproc/lader/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/lader/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/lader/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                lader
-version             0.1.2
+version             0.1.3
 categories          textproc
 maintainers         hum openmaintainer
 
@@ -23,8 +23,8 @@
 license             EPL-1
 
 master_sites        ${homepage}download/
-checksums           rmd160  9b168aca8c5866832b0c8b8873dda5e7285c5872 \
-                    sha256  e865d8e4540010adb450cb87f3f1d45ea921df100ca0e18d4baa912934195a4c
+checksums           rmd160  5f14825dc4ca9c4d799f6e2fd01dd40ffaa67c98 \
+                    sha256  52325990ca337f3d1745c4374c729eaea74403158604f7e2ba71ca3d8999a02b
 
 depends_lib         port:boost
 

Modified: branches/pixilla-mysqls-55/dports/textproc/lilypond-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/lilypond-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/lilypond-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                lilypond-devel
 set my_name         lilypond
-version             2.17.6
+version             2.17.7
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          textproc
 maintainers         snc openmaintainer
@@ -23,8 +23,8 @@
 master_sites        http://download.linuxaudio.org/lilypond/sources/v${branch}/
 distname            ${my_name}-${version}
 dist_subdir         ${name}/${version}_${revision}
-checksums           rmd160  c61e57d3893350ba8361bf53635108083815e40f \
-                    sha256  dac4a1676aad4e0cb903d2736b500d63e74e1ecc68140dd0b3222d39f8379e26
+checksums           rmd160  d109ddc2fd03f5c32336141ad144cab913ca4d5f \
+                    sha256  304a7dc4130976492a52a002a731f7c32f889c578b591c8e5a6588023dd09ea3
 
 
 depends_build       port:t1utils \

Modified: branches/pixilla-mysqls-55/dports/textproc/mdocml/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/mdocml/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/mdocml/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                mdocml
 version             1.10.5
-categories          textproc sysutil
+categories          textproc sysutils
 platforms           darwin
 maintainers         nomaintainer
 

Modified: branches/pixilla-mysqls-55/dports/textproc/mecab-base/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/mecab-base/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/mecab-base/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -57,7 +57,7 @@
         && ([vercmp [lindex $vers 1] 0.98] < 0 ||
             [vercmp [lindex $vers 1] 0.98] == 0
             && [vercmp [lindex $vers 2] 1] < 1)} {
-        registry_deactivate mecab "" [list ports_nodepcheck 1]
+        registry_deactivate_composite mecab "" [list ports_nodepcheck 1]
     }
 }
 

Modified: branches/pixilla-mysqls-55/dports/textproc/ocaml-xtmpl/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/ocaml-xtmpl/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/ocaml-xtmpl/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,8 +4,7 @@
 PortGroup           ocaml 1.0
 
 name                ocaml-xtmpl
-version             0.3
-revision            1
+version             0.4
 categories          textproc devel ml
 maintainers         mww openmaintainer
 platforms           darwin
@@ -18,8 +17,8 @@
 
 distname            xtmpl-${version}
 
-checksums           rmd160  288a060dba9096e71e9535c0be9897b1b8e23407 \
-                    sha256  4f78d1b2362a8cca34d5247181c9598f5c4d05155ff9a5aa866a7a38a7894161
+checksums           rmd160  20639f684416e0e6b79bb6c0e5c1f1b9ec08954a \
+                    sha256  2f23f3784e5a3c239ab1de5375db0a4c297d4c171b87e5308a191deecb363ba1
 
 depends_lib         port:ocaml port:ocaml-findlib port:ocaml-xmlm
 

Modified: branches/pixilla-mysqls-55/dports/textproc/pdfjam/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/pdfjam/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/pdfjam/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -59,10 +59,6 @@
     if {[file exists $prefix/bin/pdfjam] 
         && ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
         && [vercmp [lindex $vers 1] 19536] < 0} {
-        set deactivate_proc registry_deactivate_composite
-        if {[info commands registry_deactivate_composite] == {}} {
-            set deactivate_proc registry_deactivate
-        }
-        $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
+        registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
     }
 }

Modified: branches/pixilla-mysqls-55/dports/textproc/rst2pdf/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/rst2pdf/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/rst2pdf/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,35 +1,41 @@
+# -*- 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           python26 1.0
+PortGroup           python 1.0
+
 name                rst2pdf
-version             0.16
+version             0.92
 categories          textproc python
 license             MIT
 maintainers         nomaintainer
+supported_archs     noarch
+
 description         Create PDF from reStructuredText
 long_description    ${description}
 
+python.versions     27
+
 platforms           darwin
 
 homepage            http://code.google.com/p/rst2pdf/
 master_sites        googlecode
 
-checksums           md5     67b8bfac3ac55a85a09fc35ba98794d3 \
-                    sha1    297f9ad8e91baa706321dd50d99b21adfa1f1e66 \
-                    rmd160  1ddf23532507dfafbfae58c759978bdfd65dec4e
+checksums           rmd160  c900a1a56c95660efdbdbfee049eb6146e690f50 \
+                    sha256  bb84b457eb454bb1159547d09cd2071efc95a5036a2c5f98b21bec508838b511
 
-depends_lib-append  port:py26-reportlab port:py26-docutils port:py26-distribute
-depends_run         port:py26-pygments
+depends_lib-append  port:py${python.version}-reportlab \
+                    port:py${python.version}-docutils \
+                    port:py${python.version}-distribute
 
-python.link_binaries no
+depends_run         port:py${python.version}-pygments
 
+python.link_binaries_suffix
+
 post-destroot {
-   ln -s ${python.prefix}/bin/rst2pdf ${destroot}${prefix}/bin/rst2pdf
-   xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-   xinstall -m 644 -W ${worksrcpath} CHANGES.txt Contributors.txt LICENSE.txt \
-      README.txt ${destroot}${prefix}/share/doc/${name}
-   xinstall -m 644 -W ${worksrcpath}/doc DEVELOPERS.txt manual.pdf \
-      sampler.txt ${destroot}${prefix}/share/doc/${name}
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
+    xinstall -m 644 -W ${worksrcpath} CHANGES.txt Contributors.txt LICENSE.txt \
+        README.txt ${destroot}${prefix}/share/doc/${name}
+    xinstall -m 644 -W ${worksrcpath}/doc DEVELOPERS.txt manual.txt \
+        sampler.txt ${destroot}${prefix}/share/doc/${name}
 }
-

Modified: branches/pixilla-mysqls-55/dports/textproc/xercesc3/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/textproc/xercesc3/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/textproc/xercesc3/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,9 @@
 
 name                xercesc3
 conflicts           xercesc
+if {[file exists ${prefix}/bin/memparse]} {
+    conflicts-append libmemcached
+}
 version             3.1.1
 revision            5
 categories          textproc xml shibboleth

Modified: branches/pixilla-mysqls-55/dports/www/lighttpd/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/www/lighttpd/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/lighttpd/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem                  1.0
 
 name                        lighttpd
-version                     1.4.31
+version                     1.4.32
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  www
 platforms                   darwin
@@ -23,11 +23,9 @@
 master_sites                http://download.lighttpd.net/lighttpd/releases-${branch}.x/
 use_xz                      yes
 
-checksums                   rmd160  97d6f165f60bf459131366ca111e771dc8d54b9b \
-                            sha256  8a0a4f1ab782c2a3554e031c7d8ad600aac9b4c0466710a6cc9aab10659fe3f2
+checksums                   rmd160  16d3204da703d01f37a5ae3b36c5fee15073aad2 \
+                            sha256  1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1
 
-use_autoreconf              yes
-
 depends_build-append        port:pkgconfig
 
 depends_lib                 port:bzip2 \
@@ -35,8 +33,7 @@
                             port:spawn-fcgi \
                             port:zlib
 
-patchfiles                  patch-conf.diff \
-                            patch-configure.ac.diff
+patchfiles                  patch-conf.diff
 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" \

Deleted: branches/pixilla-mysqls-55/dports/www/lighttpd/files/patch-configure.ac.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/www/lighttpd/files/patch-configure.ac.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/lighttpd/files/patch-configure.ac.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,23 +0,0 @@
-http://permalink.gmane.org/gmane.comp.handhelds.openembedded.core/19841
---- configure.ac.orig
-+++ configure.ac
-@@ -24,6 +24,11 @@ dnl AC_PROG_CXX
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- 
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
-+
- dnl check environment
- AC_AIX
- AC_ISC_POSIX
-@@ -39,7 +44,6 @@ AM_CONDITIONAL(NO_RDYNAMIC, test x$NO_RD
- AC_EXEEXT
- 
- dnl more automake stuff
--AM_C_PROTOTYPES
- 
- dnl libtool
- AC_DISABLE_STATIC

Modified: branches/pixilla-mysqls-55/dports/www/linkchecker/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/www/linkchecker/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/linkchecker/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -43,7 +43,7 @@
 }
 
 app.name            LinkChecker
-app.executable      linkchecker-gui
+app.executable      ${python.prefix}/bin/linkchecker-gui
 app.icon            doc/html/logo128x128.png
 
 python.link_binaries_suffix

Modified: branches/pixilla-mysqls-55/dports/www/mod_security2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/www/mod_security2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/mod_security2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 name                mod_security2
 set name_package    modsecurity-apache
-version             2.6.8
+version             2.7.1
 categories          www security
 platforms           darwin
 maintainers         pixilla openmaintainer
@@ -14,11 +14,11 @@
                     embedded into the web server, acting as a powerful \
                     umbrella - shielding applications from attacks.
 homepage            http://www.modsecurity.org
-master_sites        sourceforge:mod-security
+master_sites        https://github.com/downloads/SpiderLabs/ModSecurity
 distname            ${name_package}_${version}
 
-checksums           rmd160  dc9e8c435d86b60734148e97bf7075bd6bb9e298 \
-                    sha256  b903e526471b6d7214f03856f13ed3130b2f4b59c7e2df543bafc18e7cdc3515
+checksums           rmd160  92f080d946574d20d4cba80812bbc1dda2d6a624 \
+                    sha256  cb6b738f341c9ec673d17d22085dde56abdaf38ac772a5de25ddf529c785defc
 
 worksrcdir          ${distname}
 

Modified: branches/pixilla-mysqls-55/dports/www/nginx/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/www/nginx/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/nginx/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                nginx
-version             1.2.4
+version             1.2.5
 categories          www mail
 platforms           darwin
 license             BSD
@@ -29,8 +29,8 @@
 
 distfiles           ${name}-${version}${extract.suffix}:nginx
 checksums           ${name}-${version}${extract.suffix} \
-                    rmd160  00ad5f3e57f35da917cb952ad50f12a7a06f07ea \
-                    sha256  c587c25f2fa9c9dde6a58cbaf7bf2c808ee360cfa3cdaf00a13a33f728d96c43 \
+                    rmd160  67a46b1f4c073d67ced9949ef361f333606347b7 \
+                    sha256  87392b8ebc3a763589bdf3f0578cad323bb4ddd327a84243eb4a8babbbd79ddd \
 
 depends_lib         port:pcre \
                     port:zlib

Modified: branches/pixilla-mysqls-55/dports/www/phpmyadmin/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/www/phpmyadmin/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/phpmyadmin/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                phpmyadmin
 set my_name         phpMyAdmin
-version             3.5.3
+version             3.5.4
 categories          www php databases
 maintainers         ryandesign openmaintainer
 license             GPL-2+
@@ -25,8 +25,8 @@
 distname            ${my_name}-${version}-all-languages
 use_xz              yes
 
-checksums           rmd160  faba4759b004cfe67abff9d63f5d6f9b1c952dbd \
-                    sha256  4d2573d2cad3abc67997361ee3d5bf05cf2c3c6b8fb1b2c611030d32ec0db826
+checksums           rmd160  3300b72b4b26de3e1f94685e845ba2d1b41ed573 \
+                    sha256  7dcfa494f8efb988e3cad875ab7863119ed55a4db2f361f3266f85253ab421c9
 
 platforms           darwin freebsd
 

Modified: branches/pixilla-mysqls-55/dports/www/stog/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/www/stog/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/stog/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 PortGroup           ocaml 1.0
 
 name                stog
-version             0.3
+version             0.4
 revision            1
 categories          www ml
 platforms           darwin
@@ -14,8 +14,8 @@
 long_description    ${description}
 homepage            http://zoggy.github.com/stog/
 master_sites        http://zoggy.github.com/stog/
-checksums           rmd160  6079fba9d19e56549c05d5ee0837e0b2ecb39ed7 \
-                    sha256  04c65b0af19d33e9c3f04c437ee97648d62977669366269bbb4ecf7e53e37e3a
+checksums           rmd160  831ee5043437ef3d88d1f617762804fc45b908b0 \
+                    sha256  4a5018046f4d5039865d465d3b70dfff50f9d44f318287389187aab1332cc329
 
 depends_lib         port:ocaml port:ocaml-findlib port:ocaml-xmlm \
                     port:ocaml-ocamlrss port:ocaml-xtmpl port:ocaml-pcre \
@@ -32,6 +32,12 @@
 
 destroot.args       BINDIR=${prefix}/bin
 
+post-destroot {
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
+    xinstall -m 644 -W ${worksrcpath} README Changes LICENSE \
+        ${destroot}${prefix}/share/doc/${name}
+}
+
 livecheck.type      regex
 livecheck.url       http://zoggy.github.com/stog/install.html
 livecheck.regex     stog-(\[0-9.\]+)${extract.suffix}

Modified: branches/pixilla-mysqls-55/dports/www/stog/files/patch-Makefile.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/www/stog/files/patch-Makefile.diff	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/www/stog/files/patch-Makefile.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,11 +1,11 @@
---- Makefile	2012-06-19 22:56:08.000000000 +0200
-+++ Makefile	2012-07-31 11:07:15.000000000 +0200
-@@ -159,7 +159,7 @@
+--- work/stog-0.4/Makefile	2012-11-22 12:28:00.000000000 +0100
++++ Makefile	2012-11-26 07:50:36.000000000 +0100
+@@ -187,7 +187,7 @@
  		$(PLUGINS_BYTE) $(PLUGINS_OPT) $(PLUGINS_OPT:.cmxs=.cmx) $(PLUGINS_OPT:.cmxs=.o) \
  		$(LIB_CMIFILES) $(LIB_CMXFILES) $(LIB_CMXFILES:.cmx=.o) \
  		$(LIB_BYTE) $(LIB) $(LIB:.cmxa=.a)
--	$(CP) $(MAIN) $(MAIN_BYTE)  `dirname \`which $(OCAMLC)\``/
-+	$(CP) $(MAIN) $(MAIN_BYTE)  $(DESTDIR)$(BINDIR)
+-	$(CP) $(MAIN) $(MAIN_BYTE) $(OCAML_SESSION) `dirname \`which $(OCAMLC)\``/
++	$(CP) $(MAIN) $(MAIN_BYTE) $(OCAML_SESSION) $(DESTDIR)$(BINDIR)
  
  uninstall:
  	@$(OCAMLFIND) remove stog

Modified: branches/pixilla-mysqls-55/dports/x11/efreet/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/efreet/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/efreet/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,7 +5,7 @@
 
 name                    efreet
 epoch                   2
-version                 1.7.1
+version                 1.7.2
 maintainers             ryandesign openmaintainer
 categories              x11
 platforms               darwin
@@ -22,8 +22,8 @@
 master_sites            http://download.enlightenment.org/releases/
 use_bzip2               yes
 
-checksums               rmd160  c528caecf60c0df655e01ff5eab69d8ee345c7b9 \
-                        sha256  c844ed545f1c9438c73af4e4d037401a653babaab0a4e4b69377a2de49431eea
+checksums               rmd160  ead3aaec52f6ae75ef89d27e0b7d288c265dba0a \
+                        sha256  27cfa0be6dd8de0493d773c2ed18170f1e4c2f85df965c978846f1816ca62c1a
 
 depends_build           port:pkgconfig
 depends_lib             port:ecore

Modified: branches/pixilla-mysqls-55/dports/x11/font-alias/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/font-alias/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/font-alias/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,6 +7,8 @@
 categories          x11 x11-font graphics
 license             Permissive  
 maintainers         jeremyhu openmaintainer
+supported_archs     noarch
+
 description         X.org default fonts.alias files
 long_description    ${description}
 

Modified: branches/pixilla-mysqls-55/dports/x11/font-misc-ethiopic/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/font-misc-ethiopic/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/font-misc-ethiopic/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,6 +6,8 @@
 version             1.0.3
 categories          x11 x11-font graphics
 maintainers         jeremyhu openmaintainer
+supported_archs     noarch
+
 description         X.org Ethiopic TrueType fonts
 long_description    ${description}
 

Modified: branches/pixilla-mysqls-55/dports/x11/gtkspell2/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/gtkspell2/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/gtkspell2/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -37,6 +37,9 @@
 
 configure.args      --disable-debug
 
+# intltool needs to be run with the correct version of perl
+configure.env-append INTLTOOL_PERL=${prefix}/bin/perl5.12
+
 livecheck.type      regex
 livecheck.url       ${homepage}
 livecheck.regex     "The latest version is <b>(\\d+(?:\\.\\d+)*)</b>"

Modified: branches/pixilla-mysqls-55/dports/x11/pango/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/pango/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/pango/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 conflicts               pango-devel
 epoch                   1
 version                 1.30.1
-revision                2
+revision                3
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign openmaintainer
@@ -39,6 +39,7 @@
     port:libpng
 
 patchfiles              patch-ltmain.sh.diff
+patchfiles-append       patch-pango-pangocoretext-fontmap.c.diff
 
 configure.ccache        no
 

Copied: branches/pixilla-mysqls-55/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff (from rev 100173, trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff)
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,60 @@
+coretext: don't insert item in the hash if it originated from the hash
+https://github.com/GNOME/pango/commit/70a85d441d973883af4afb57599bc570eeea4c83
+--- pango/pangocoretext-fontmap.c.orig
++++ pango/pangocoretext-fontmap.c
+@@ -1284,13 +1284,11 @@ struct _PangoCoreTextFontKey
+ 
+   if (G_UNLIKELY (!fontset))
+     {
++      gboolean insert_in_hash = TRUE;
++
+       fontset = pango_core_text_fontset_new (&key, desc);
+ 
+-      if (G_LIKELY (fontset))
+-        g_hash_table_insert (ctfontmap->fontset_hash,
+-                             pango_core_text_fontset_get_key (fontset),
+-                             fontset);
+-      else
++      if (G_UNLIKELY (!fontset))
+         {
+           /* If no font(set) could be loaded, we fallback to "Sans",
+            * which should always work on Mac. We try to adhere to the
+@@ -1308,7 +1306,9 @@ struct _PangoCoreTextFontKey
+                                             language);
+ 
+           fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key);
+-          if (G_UNLIKELY (!fontset))
++          if (G_LIKELY (fontset))
++            insert_in_hash = FALSE;
++          else
+             fontset = pango_core_text_fontset_new (&key, tmp_desc);
+ 
+           if (G_UNLIKELY (!fontset))
+@@ -1335,7 +1335,9 @@ struct _PangoCoreTextFontKey
+                 }
+ 
+               fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key);
+-              if (G_UNLIKELY (!fontset))
++              if (G_LIKELY (fontset))
++                insert_in_hash = FALSE;
++              else
+                 fontset = pango_core_text_fontset_new (&key, tmp_desc);
+ 
+               if (G_UNLIKELY (!fontset))
+@@ -1346,11 +1348,12 @@ struct _PangoCoreTextFontKey
+                   g_error ("Could not load fallback font, bailing out.");
+                 }
+             }
+-
+-          g_hash_table_insert (ctfontmap->fontset_hash,
+-                               pango_core_text_fontset_get_key (fontset),
+-                               fontset);
+         }
++
++      if (insert_in_hash)
++        g_hash_table_insert (ctfontmap->fontset_hash,
++                             pango_core_text_fontset_get_key (fontset),
++                             fontset);
+     }
+ 
+   /* Cannot use pango_core_text_fontset_key_free() here */

Modified: branches/pixilla-mysqls-55/dports/x11/qt4-x11/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/qt4-x11/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/qt4-x11/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -22,7 +22,7 @@
 long_description    \
     Qt is a cross-platform application and UI framework for writing \
     cross-platform GUI applications. This version uses the X11 UI. \
-    For a native Aqua version, see qt4-aqua\[-devel\].
+    For a native Aqua version, see the port qt4-mac.
 master_sites        trolltech
 distname            qt-x11-opensource-src-${version}
 

Modified: branches/pixilla-mysqls-55/dports/x11/rgb/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/rgb/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/rgb/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                rgb
 version             1.0.4
 categories          x11 sysutils
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Display a color name database
 long_description    ${description}

Modified: branches/pixilla-mysqls-55/dports/x11/sessreg/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/sessreg/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/sessreg/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                sessreg
 version             1.0.7
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Manage utmp/wtmp entries for non-init clients
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/setxkbmap/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/setxkbmap/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/setxkbmap/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                setxkbmap
 version             1.3.0
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Set the keyboard using the X11 keyboard extension
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/showfont/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/showfont/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/showfont/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                showfont
 version             1.0.3
 categories          x11 graphics
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Font dumper for X11 font server
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/smproxy/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/smproxy/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/smproxy/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                smproxy
 version             1.0.5
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         X11 Session Manager
 long_description    smproxy allows X applications that do not support X11R6 session management to participate in an X11R6 session.

Modified: branches/pixilla-mysqls-55/dports/x11/tk/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/tk/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/tk/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -3,7 +3,7 @@
 PortSystem      1.0
 
 name            tk
-version         8.5.12
+version         8.5.13
 categories      x11
 license         Tcl/Tk
 maintainers     mww openmaintainer
@@ -15,14 +15,6 @@
   Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
 
 platforms       darwin
-# tk/aqua can't build 64-bit, ticket #20799
-if {[variant_isset quartz]} {
-    supported_archs i386 ppc
-    # Lion has no QuickDraw headers outside the 10.6 SDK, ticket #32329
-    if {${os.major} >= 11} {
-        macosx_deployment_target    10.6
-    }
-}
 
 master_sites    sourceforge:tcl
 dist_subdir     tcltk
@@ -31,12 +23,14 @@
 # suck in Tcl as well so we can use it internally.
 distfiles-append    tcl${version}-src${extract.suffix}
 
-checksums           tk8.5.12-src.tar.gz \
-                    rmd160  fc864df9f1e1ebd4b4375cc46572834095e77372 \
-                    sha256  c453d820925bf526bbe8a0d1c17ab3168b076fcb9844bea797ad75e3b9ad9291 \
-                    tcl8.5.12-src.tar.gz \
-                    rmd160  ada42e22f7b12413c88d9ec7dbd3789926f362d2 \
-                    sha256  20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2
+checksums           tk${version}-src.tar.gz \
+                    md5 1fc7dbb7495160756dbc805224afa360 \
+                    sha1 a7dc1a979201376d7e7d48ec9280839ebb52a09f \
+                    rmd160 f832c61d5006f9ddef93a63db9789d158b1d6202 \
+                    tcl${version}-src.tar.gz \
+                    md5 fa3a9bf9b2d6ed2431f1baa46f4058b8 \
+                    sha1 65b677dc699426233b926edfa9e304d456da7cad \
+                    rmd160 20cfb8adebd77a6d037f67a9af7e88d80032b3c2
 
 depends_build   port:pkgconfig
 
@@ -49,6 +43,9 @@
 
 worksrcdir      ${name}${version}/unix
 
+patchfiles      return-types.patch
+patch.dir       ${worksrcpath}/..
+
 post-patch {
     reinplace s|@TCL_SRC_DIR@|${worksrcpath}/../../tcl${version}/|g ${worksrcpath}/Makefile.in
 }
@@ -67,12 +64,23 @@
     configure.args-append   --enable-64bit
 }
 
-variant quartz {
-    depends_lib-delete port:Xft2 port:xorg-libXScrnSaver
-    configure.args-append   --enable-aqua
-    post-destroot {
-        delete ${destroot}${prefix}/include/X11
+if {${os.platform} == "darwin" && ${os.subplatform} == "macosx" && ${os.major} >= 10} {
+    variant quartz conflicts x11 {
+        depends_lib-delete port:Xft2 port:xorg-libXScrnSaver port:fontconfig
+        # tk.h still includes and uses types from X11/Xlib.h
+        depends_lib-append port:xorg-libX11
+        configure.ldflags-delete    -lfontconfig
+        configure.args-append   --enable-aqua
+        post-destroot {
+            delete ${destroot}${prefix}/include/X11
+        }
     }
+
+    variant x11 conflicts quartz {}
+
+    if {![variant_isset x11]} {
+        default_variants +quartz
+    }
 }
 
 platform darwin {

Modified: branches/pixilla-mysqls-55/dports/x11/twm/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/twm/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/twm/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                twm
 version             1.0.7
 categories          x11 x11-wm
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Tab Window Manager for X11
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/viewres/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/viewres/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/viewres/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                viewres
 version             1.0.3
 categories          x11 graphics
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Graphical class browser for Xt
 long_description \


Property changes on: branches/pixilla-mysqls-55/dports/x11/wine-crossover
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/x11/wine-devel:58381,60835,84933
   + /trunk/dports/x11/wine-crossover:99672-100173
/trunk/dports/x11/wine-devel:58381,60835,84933

Modified: branches/pixilla-mysqls-55/dports/x11/wine-crossover/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/wine-crossover/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/wine-crossover/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -4,7 +4,7 @@
 
 name                        wine-crossover
 conflicts                   wine wine-devel
-version                     11.2.2
+version                     11.3.0
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 jeremyhu openmaintainer
@@ -31,8 +31,8 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  948a7d76c0cdc5b6bd377511921088207f63df5b \
-                            sha256  58c5adae2f6f2d6f9b2559b7d93aeaadb3ade617f5bd920554eb469eb9649cec \
+                            rmd160  002356a69d81e672504075759df578355dc370be \
+                            sha256  a7649f2fbf6f2af196123a4276f70e3bd0c5640d48ca6b7e5341fe5086e24799 \
                             ${wine_gecko_distfile} \
                             rmd160  02363538a77a954f2bf1014b28ec1ed8fe2d1b6e \
                             sha256  b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
@@ -73,8 +73,8 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
-                            ScreenToClient.patch
-# ScreenToClient.patch is for http://bugs.winehq.org/show_bug.cgi?id=31979
+                            dlls-user32-winpos.c.patch
+# dlls-user32-winpos.c.patch is for http://bugs.winehq.org/show_bug.cgi?id=31979
 
 configure.ldflags-append    -framework CoreServices \
                             -lz

Deleted: branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/ScreenToClient.patch
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/ScreenToClient.patch	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/ScreenToClient.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -1,16 +0,0 @@
----
- dlls/user32/winpos.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
---- dlls/user32/winpos.c	
-+++ dlls/user32/winpos.c	
-@@ -251,8 +251,7 @@ BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
-  */
- BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
- {
--    MapWindowPoints( 0, hwnd, lppnt, 1 );
--    return TRUE;
-+    return MapWindowPoints( 0, hwnd, lppnt, 1 ) != 0;
- }
- 
- 
--- 

Copied: branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch (from rev 100173, trunk/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch)
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch	                        (rev 0)
+++ branches/pixilla-mysqls-55/dports/x11/wine-crossover/files/dlls-user32-winpos.c.patch	2012-12-01 21:28:45 UTC (rev 100174)
@@ -0,0 +1,193 @@
+X-Git-Url: http://source.winehq.org/git
+
+diff --git dlls/user32/winpos.c.orig dlls/user32/winpos.c
+index c620df9..0ce3ddd 100644
+--- dlls/user32/winpos.c.orig
++++ dlls/user32/winpos.c
+@@ -235,26 +235,6 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect )
+ }
+ 
+ 
+-/*******************************************************************
+- *		ClientToScreen (USER32.@)
+- */
+-BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
+-{
+-    MapWindowPoints( hwnd, 0, lppnt, 1 );
+-    return TRUE;
+-}
+-
+-
+-/*******************************************************************
+- *		ScreenToClient (USER32.@)
+- */
+-BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
+-{
+-    MapWindowPoints( 0, hwnd, lppnt, 1 );
+-    return TRUE;
+-}
+-
+-
+ /***********************************************************************
+  *           list_children_from_point
+  *
+@@ -588,6 +568,48 @@ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count
+ }
+ 
+ 
++/*******************************************************************
++ *		ClientToScreen (USER32.@)
++ */
++BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
++{
++    POINT offset;
++    BOOL mirrored;
++
++    if (!hwnd)
++    {
++        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
++        return FALSE;
++    }
++    if (!WINPOS_GetWinOffset( hwnd, 0, &mirrored, &offset )) return FALSE;
++    lppnt->x += offset.x;
++    lppnt->y += offset.y;
++    if (mirrored) lppnt->x = -lppnt->x;
++    return TRUE;
++}
++
++
++/*******************************************************************
++ *		ScreenToClient (USER32.@)
++ */
++BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
++{
++    POINT offset;
++    BOOL mirrored;
++
++    if (!hwnd)
++    {
++        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
++        return FALSE;
++    }
++    if (!WINPOS_GetWinOffset( 0, hwnd, &mirrored, &offset )) return FALSE;
++    lppnt->x += offset.x;
++    lppnt->y += offset.y;
++    if (mirrored) lppnt->x = -lppnt->x;
++    return TRUE;
++}
++
++
+ /***********************************************************************
+  *		IsIconic (USER32.@)
+  */
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Wed, 14 Nov 2012 15:26:13 +0000 (+0100)
+Subject: user32: Properly set last error in MapWindowPoints.
+X-Git-Tag: wine-1.5.18~240
+X-Git-Url: http://source.winehq.org/git
+
+user32: Properly set last error in MapWindowPoints.
+---
+
+diff --git dlls/user32/winpos.c.orig dlls/user32/winpos.c
+index eda5b78..c620df9 100644
+--- dlls/user32/winpos.c
++++ dlls/user32/winpos.c
+@@ -422,11 +422,11 @@ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags)
+  * Calculate the offset between the origin of the two windows. Used
+  * to implement MapWindowPoints.
+  */
+-static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
++static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POINT *ret_offset )
+ {
+     WND * wndPtr;
+     POINT offset;
+-    BOOL mirror_from, mirror_to;
++    BOOL mirror_from, mirror_to, ret;
+     HWND hwnd;
+ 
+     offset.x = offset.y = 0;
+@@ -435,7 +435,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
+     /* Translate source window origin to screen coords */
+     if (hwndFrom)
+     {
+-        if (!(wndPtr = WIN_GetPtr( hwndFrom ))) return offset;
++        if (!(wndPtr = WIN_GetPtr( hwndFrom )))
++        {
++            SetLastError( ERROR_INVALID_WINDOW_HANDLE );
++            return FALSE;
++        }
+         if (wndPtr == WND_OTHER_PROCESS) goto other_process;
+         if (wndPtr != WND_DESKTOP)
+         {
+@@ -466,7 +470,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
+     /* Translate origin to destination window coords */
+     if (hwndTo)
+     {
+-        if (!(wndPtr = WIN_GetPtr( hwndTo ))) return offset;
++        if (!(wndPtr = WIN_GetPtr( hwndTo )))
++        {
++            SetLastError( ERROR_INVALID_WINDOW_HANDLE );
++            return FALSE;
++        }
+         if (wndPtr == WND_OTHER_PROCESS) goto other_process;
+         if (wndPtr != WND_DESKTOP)
+         {
+@@ -496,35 +504,37 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored )
+ 
+     *mirrored = mirror_from ^ mirror_to;
+     if (mirror_from) offset.x = -offset.x;
+-    return offset;
++    *ret_offset = offset;
++    return TRUE;
+ 
+  other_process:  /* one of the parents may belong to another process, do it the hard way */
+-    offset.x = offset.y = 0;
+     SERVER_START_REQ( get_windows_offset )
+     {
+         req->from = wine_server_user_handle( hwndFrom );
+         req->to   = wine_server_user_handle( hwndTo );
+-        if (!wine_server_call( req ))
++        if ((ret = !wine_server_call_err( req )))
+         {
+-            offset.x = reply->x;
+-            offset.y = reply->y;
++            ret_offset->x = reply->x;
++            ret_offset->y = reply->y;
+             *mirrored = reply->mirror;
+         }
+     }
+     SERVER_END_REQ;
+-    return offset;
++    return ret;
+ }
+ 
+ /* map coordinates of a window region */
+ void map_window_region( HWND from, HWND to, HRGN hrgn )
+ {
+     BOOL mirrored;
+-    POINT offset = WINPOS_GetWinOffset( from, to, &mirrored );
++    POINT offset;
+     UINT i, size;
+     RGNDATA *data;
+     HRGN new_rgn;
+     RECT *rect;
+ 
++    if (!WINPOS_GetWinOffset( from, to, &mirrored, &offset )) return;
++
+     if (!mirrored)
+     {
+         OffsetRgn( hrgn, offset.x, offset.y );
+@@ -557,9 +567,11 @@ void map_window_region( HWND from, HWND to, HRGN hrgn )
+ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count )
+ {
+     BOOL mirrored;
+-    POINT offset = WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored );
++    POINT offset;
+     UINT i;
+ 
++    if (!WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored, &offset )) return 0;
++
+     for (i = 0; i < count; i++)
+     {
+         lppt[i].x += offset.x;


Property changes on: branches/pixilla-mysqls-55/dports/x11/wine-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/x11/wine:42908,42913
   + /trunk/dports/x11/wine:42908,42913
/trunk/dports/x11/wine-devel:99672-100173

Modified: branches/pixilla-mysqls-55/dports/x11/wine-devel/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/wine-devel/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/wine-devel/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -7,7 +7,7 @@
 name                        wine-devel
 conflicts                   wine wine-crossover
 set my_name                 wine
-version                     1.5.17
+version                     1.5.18
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -33,8 +33,8 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  72f1f25055260fa7709bde9f460896351ef5bafe \
-                            sha256  b15b4cbfab4b7f3d4cf80f88ea757e221feaefbd4e515edfb04cc57529464c15 \
+                            rmd160  af8fc36ed2ccbcdf390fc33fb6cb73a8760ee1a7 \
+                            sha256  a144900cc20e55623c8c9ab26e265eb2e76d88c9e21bd21a3bcfa030fdb3fbdf \
                             ${wine_gecko_distfile} \
                             rmd160  f7b86d2e5ff82bf345b2420c9a8e9cfbc3c9989c \
                             sha256  28f3b7e497e1f884a64b2d982b61dda3167efac4c843de198654a1c9144ff9dc

Modified: branches/pixilla-mysqls-55/dports/x11/x11perf/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/x11perf/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/x11perf/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                x11perf
 version             1.5.4
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         X11 server performance test program
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/xbacklight/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/xbacklight/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/xbacklight/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                xbacklight
 version             1.1.2
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Control an LCD backlight through RandR
 long_description    ${description}

Modified: branches/pixilla-mysqls-55/dports/x11/xcalc/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/xcalc/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/xcalc/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                xcalc
 version             1.0.4.1
 categories          x11 math science
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Scientific calculator for X11
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/xclipboard/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/xclipboard/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/xclipboard/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                xclipboard
 version             1.1.2
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         X11 clipboard client
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/xclock/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/xclock/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/xclock/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                xclock
 version             1.0.6
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Analog/digital clock for X11
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/xconsole/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/xconsole/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/xconsole/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -5,6 +5,7 @@
 name                xconsole
 version             1.0.4
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Monitor system console messages with X11
 long_description \

Modified: branches/pixilla-mysqls-55/dports/x11/xcursorgen/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/xcursorgen/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/xcursorgen/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -6,6 +6,7 @@
 version             1.0.5
 revision            1
 categories          x11
+license             X11
 maintainers         jeremyhu openmaintainer
 description         Create an X11 cursor file from a collection of PNG images
 long_description \
@@ -22,7 +23,7 @@
                     rmd160  a118d0f4191ad3073b5e0e401a9ca547907460a5 \
                     sha256  bc7171a0fa212da866fca2301241630e2009aea8c4ddb75f21b51a31c2e4c581
 
-depends_build       port:pkgconfig
+depends_build       port:pkgconfig port:xorg-util-macros
 
 depends_lib         port:xorg-libXcursor port:libpng
 

Modified: branches/pixilla-mysqls-55/dports/x11/xorg-libXcursor/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/x11/xorg-libXcursor/Portfile	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/dports/x11/xorg-libXcursor/Portfile	2012-12-01 21:28:45 UTC (rev 100174)
@@ -24,7 +24,8 @@
 depends_build \
 	port:pkgconfig \
 	port:xorg-fixesproto \
-	port:xorg-renderproto
+	port:xorg-renderproto \
+	port:xorg-util-macros
 
 depends_lib \
 	port:xorg-libXfixes \

Modified: branches/pixilla-mysqls-55/www/localized/es/downloads/index.php
===================================================================
--- branches/pixilla-mysqls-55/www/localized/es/downloads/index.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/localized/es/downloads/index.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -14,7 +14,7 @@
 $rep=opendir($chemin);
 chdir($chemin);
 while($file = readdir($rep)) {
-	if($file != '..' && $file !='.' && (!eregi('php$', $file))) {
+	if($file != '..' && $file !='.' && (!preg_match('/\.php$/i', $file))) {
 		if(!is_dir($file)) {
 			echo "<a href=\"/downloads/$file\">$file</a>";
 			echo "<br>";

Modified: branches/pixilla-mysqls-55/www/localized/es/ports.php
===================================================================
--- branches/pixilla-mysqls-55/www/localized/es/ports.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/localized/es/ports.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -178,7 +178,7 @@
 <?
 					while ( $nrow = mysql_fetch_array($nresult) ) {
 						// lib:libpng.3:libpng -> libpng
-						$library = eregi_replace("^([^:]*:[^:]*:|[^:]*:)", "", $nrow[0]);
+						$library = preg_replace("/^(?:[^:]*:){1,2}/", "", $nrow[0]);
 					?>
 						<a href="<?= $PHP_SELF; ?>?by=library&substr=<?= $library; ?>"><?= $library; ?></a>
 					<?

Modified: branches/pixilla-mysqls-55/www/localized/fr/downloads/index.php
===================================================================
--- branches/pixilla-mysqls-55/www/localized/fr/downloads/index.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/localized/fr/downloads/index.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -14,7 +14,7 @@
 $rep=opendir($chemin);
 chdir($chemin);
 while($file = readdir($rep)) {
-	if($file != '..' && $file !='.' && (!eregi('php$', $file))) {
+	if($file != '..' && $file !='.' && (!preg_match('/\.php$/i', $file))) {
 		if(!is_dir($file)) {
 			echo "<a href=\"/downloads/$file\">$file</a>";
 			echo "<br>";

Modified: branches/pixilla-mysqls-55/www/localized/fr/ports.php
===================================================================
--- branches/pixilla-mysqls-55/www/localized/fr/ports.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/localized/fr/ports.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -178,7 +178,7 @@
 <?
 					while ( $nrow = mysql_fetch_array($nresult) ) {
 						// lib:libpng.3:libpng -> libpng
-						$library = eregi_replace("^([^:]*:[^:]*:|[^:]*:)", "", $nrow[0]);
+						$library = preg_replace("/^(?:[^:]*:){1,2}/", "", $nrow[0]);
 					?>
 						<a href="<?= $PHP_SELF; ?>?by=library&substr=<?= $library; ?>"><?= $library; ?></a>
 					<?

Modified: branches/pixilla-mysqls-55/www/localized/it/downloads/index.php
===================================================================
--- branches/pixilla-mysqls-55/www/localized/it/downloads/index.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/localized/it/downloads/index.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -14,7 +14,7 @@
 $rep=opendir($chemin);
 chdir($chemin);
 while($file = readdir($rep)) {
-	if($file != '..' && $file !='.' && (!eregi('php$', $file))) {
+	if($file != '..' && $file !='.' && (!preg_match('/\.php$/i', $file))) {
 		if(!is_dir($file)) {
 			echo "<a href=\"/downloads/$file\">$file</a>";
 			echo "<br>";

Modified: branches/pixilla-mysqls-55/www/localized/it/ports.php
===================================================================
--- branches/pixilla-mysqls-55/www/localized/it/ports.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/localized/it/ports.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -179,7 +179,7 @@
 <?
 					while ( $nrow = mysql_fetch_array($nresult) ) {
 						// lib:libpng.3:libpng -> libpng
-						$library = eregi_replace("^([^:]*:[^:]*:|[^:]*:)", "", $nrow[0]);
+						$library = preg_replace("/^(?:[^:]*:){1,2}/", "", $nrow[0]);
 					?>
 						<a href="<?= $PHP_SELF; ?>?by=library&substr=<?= $library; ?>"><?= $library; ?></a>
 					<?

Modified: branches/pixilla-mysqls-55/www/localized/ru/ports.php
===================================================================
--- branches/pixilla-mysqls-55/www/localized/ru/ports.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/localized/ru/ports.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -177,7 +177,7 @@
 <?
 					while ( $nrow = mysql_fetch_array($nresult) ) {
 						// lib:libpng.3:libpng -> libpng
-						$library = eregi_replace("^([^:]*:[^:]*:|[^:]*:)", "", $nrow[0]);
+						$library = preg_replace("/^(?:[^:]*:){1,2}/", "", $nrow[0]);
 					?>
 						<a href="<?= $PHP_SELF; ?>?by=library&substr=<?= $library; ?>"><?= $library; ?></a>
 					<?

Modified: branches/pixilla-mysqls-55/www/ports.php
===================================================================
--- branches/pixilla-mysqls-55/www/ports.php	2012-12-01 20:34:12 UTC (rev 100173)
+++ branches/pixilla-mysqls-55/www/ports.php	2012-12-01 21:28:45 UTC (rev 100174)
@@ -48,7 +48,7 @@
                 <option value="platform"<?php if ($by == 'platform') { print ' selected="selected"'; } ?>>Platform</option>
 <!--                <option value="license"<?php if ($by == 'license') { print ' selected="selected"'; } ?>>License</option> -->
             </select>
-            <input type="text" name="substr" size="40" />
+            <input type="text" name="substr" value="<?php print htmlspecialchars($substr); ?>" size="40" />
             <input type="submit" value="Search" />
         </p>
     </form>
@@ -68,13 +68,13 @@
             $columns = 0;
             print '<h3>Port Categories</h3><div id="categories"><ul>';
             while ($columns < 4) {
-                $entries_per_colum = 0;
+                $entries_per_column = 0;
                 print '<li><ul>';
                 while ($row = mysql_fetch_assoc($result)) {
                     print "<li><a href=\"$_SERVER[PHP_SELF]?by=category&amp;substr=" . urlencode($row['category']) . '">'
                     . htmlspecialchars($row['category']) . '</a></li>';
-                    if ($entries_per_colum == $max_entries_per_column) break;
-                    $entries_per_colum++;
+                    if ($entries_per_column == $max_entries_per_column) break;
+                    $entries_per_column++;
                 }
                 print '</ul></li>';
                 $columns++;
@@ -146,7 +146,7 @@
                     if ($i == $page) {
                         $pagecontrol .= "<b>$i</b>";
                     } else {
-                        $pagecontrol .= "<a href=\"$_SERVER[PHP_SELF]?by=$by&amp;substr=" . htmlspecialchars($substr) . "&amp;page=$i&amp;pagesize=$pagesize\">$i</a>";
+                        $pagecontrol .= "<a href=\"$_SERVER[PHP_SELF]?by=$by&amp;substr=" . urlencode($substr) . "&amp;page=$i&amp;pagesize=$pagesize\">$i</a>";
                     }
                 }
                 $pagecontrol .= "</p>";
@@ -243,7 +243,7 @@
                 if ($nresult && mysql_num_rows($nresult) > 0) {
                     print '<br /><i>Dependencies:</i> ';
                     while ($nrow = mysql_fetch_row($nresult)) {
-                        $library = eregi_replace('^([^:]*:[^:]*:|[^:]*:)', '', $nrow[0]);
+                        $library = preg_replace('/^(?:[^:]*:){1,2}/', '', $nrow[0]);
                         print "<a href=\"$_SERVER[PHP_SELF]?by=library&amp;substr=" . urlencode($library) . '">'
                         . htmlspecialchars($library) . '</a> ';
                     }
@@ -262,7 +262,7 @@
                 }
 
                 print '<br /><br /></dd>';
-            } /* while (listing of macthing ports) */
+            } /* while (listing of matching ports) */
             print '</dl>';
 
             if ($paging) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121201/bad9e81d/attachment-0001.html>


More information about the macports-changes mailing list