Ad hoc update to latest Nginx as per pkgsrc trunk
Make sure Postfix references the correct sasl2 config file location in MESSAGE
Merge branch 'pkgsrc_2012Q2' of github.com:joyent/pkgsrc into pkgsrc_2012Q2
DATASET-597 Fix problem with usernames longer than 8 chars
Fix lighttpd ext dynamic load
pkgtools/rpm2pkg: Fix broken zlib 1.26+ support

gzFile wasn't used currently.  Trying to build rpm2pkg on zlib 1.27
exposed the misuse.  rpm2pkg should build on all version of zlib now.
lang/tcl: Upgrade from version 8.4.18 to 8.5.12

Highlights of Tcl 8.5
  * Features: 8.5 has over 90 TIPs included to provide a wide variety of
     new features.
  * Bignums: Tcl now supports arbitrary-precision integers, which improves
    math operations on large integers.
  * Safer interps: Tcl's powerful safe interpreter mechanism now has
    improved control of time and command limits in slave interpreters.
  * clock command: More robust implementation of command for specifying
    time, with significant l10n and i18n improvements.
  * dict command: New data structure that allows access to data by value
    rather than a variable name, which is substantially faster.
  * Additional improvements: Faster list search, new and improved
    mathematics procedures, anonymous procedures, new ways to package Tcl
    extensions, Tcl-level custom channel types, file and line location
    information for each command, and more.

There is of course much, much more.
See [8.5 Changes](http://wiki.tcl.tk/10630) on the wiki for a complete
list of new features.
lang/tcl: Ensure tclConfig.sh has embedded rpath

The runpath of the TCL_LIB_SPEC was missing as compared to version 8.4,
so the configure script was altered to add it back.
Also, the CONFIGURE_ARGS for thread options had unrecognized arguments.

Problems found and fixes suggested by he@
x11/tk: Upgrade from version 8.4.18 to 8.5.12

Highlights of Tk 8.5
  * New modern theming engine: New and complementary widgets that make use
    of platform-specific theming on Mac OS X and Windows to better fit in
    with those environments, and feature an improved look and feel under
    X11.
  * New widgets: Part of the themed widget set, Tk now has core notebook,
    combobox, treeview and progressbar widgets.
  * text widget: Smooth scrolling, widget peering, and improved procedures
    for counting and replacing text.
  * Font rendering: Now uses anti-aliased text under X11, and a more
    modern text engine (ATSUI) on Mac OS X.
  * Additional improvements: Window transparency, new fullscreen option
    for windows, enhancements to specific widgets and window layout,
    and more.

There is of course much, much more.
See [8.5 Changes](http://wiki.tcl.tk/10630) on the wiki for a complete
list of new features.
x11/tk: Ensure tkConfig.sh has embedded rpath

The version of the new tk package had some problems.
 - The x11 paths weren't coming through
 - The tkConfig.sh utility was missing runpath definition for TK_LIB_SPEC
 - Threading was automatically selected

The X11 problem was fixed with addition CONFIGURE_ARGS
The runpath for TK_LIB_SPEC was added in the configure patch
An options.mk file was added based on the tcl version.

Problems found and fixes suggested by he@
Fix build of the shared library on MirBSD and likely also on OpenBSD.
No pkgrevision bump, as it did not build on these platforms anyway.
For all but the default case the library file names use TCL_TRIM_DOTS
and end up with libtk85.so.  The default case would end up with libtk8.5.so
instead, which at least conflicts with what the PLIST says, but also
eventually failed to build on platforms ending up with the default behaviour.

Fixes the build on Linux platforms, should be no change elsewhere.
lang/tcl-expect: Upgrade from version 5.43 to 5.45

There doesn't appear to be a summary of changes between versions 5.43,
5.44 and 5.45.  Perusing the Changelog gives me the impression that
the updates are improvements and bug fixes against existing functionality.

Regardless, version 5.43 is incompatible with tcl8.5.  Expect had to
be updated after TCL was updated to version 8.5.
Add Ruby Sprockets version 2.2.2 as ruby-sprockets22 which is part of
Ruby on Rails 3.2.9.

Sprockets: Rack-based asset packaging

Sprockets is a Ruby library for compiling and serving web assets.
It features declarative dependency management for JavaScript and CSS
assets, as well as a powerful preprocessor pipeline that allows you to
write assets in languages like CoffeeScript, Sass, SCSS and LESS.
Update couchdb to 1.2.0
Backport MySQL SSL option fix
Backport cfengine update
Update curl to fix vulnerability
Bump PKGREVISION for the ldap feature change
Update php apc