miniupnpc Porfile removed; new and improved macdeployqtplus

* My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
* Documentation has been changed appropriately
* New pure-Python macdeployqt; leverages all problems with the stock macdeployqt

contrib/macdeploy/notes.txt

@@ -6,7 +6,7 @@ You will need the appscript package for the fancy disk image creation to work.
 Install it by invoking "sudo easy_install appscript".
 
 Ths script should be invoked in the target directory like this:
-$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,es,ru -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist
+$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2
 
 During the process, the disk image window will pop up briefly where the fancy
 settings are applied. This is normal, please do not interfere.
@@ -19,7 +19,7 @@ Fill in the following.
 Enable custom process step: [x]
 Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus
 Working directory: %{buildDir}
-Command arguments: Bitcoin-Qt.app -add-qt-tr de,ru -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist 
+Command arguments: Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2
 
 After that you can start the deployment process through the menu with
 Build -> Deploy Project "bitcoin-qt"

contrib/miniupnpc/Portfile

-# -*- 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
-
-name                miniupnpc
-epoch               2
-version             1.6
-revision            2
-categories          net
-platforms           darwin
-license             BSD
-maintainers         singingwolfboy openmaintainer
-description         Lightweight client for UPnP protocol
-long_description    \
-    ${description}
-    
-homepage            http://miniupnp.free.fr/
-master_sites        http://miniupnp.free.fr/files/download.php?file=${distname}${extract.suffix}&dummy=
-checksums           md5     88055f2d4a061cfd4cfe25a9eae22f67 \
-                    sha1    ef8f2edb17f2e7c5b8dc67ee80a65c199d823e0a \
-                    rmd160  d86b75b331a3fb5525c71708548f311977c0598f
-
-use_configure       no
-
-variant universal {}
-if {[variant_isset universal]} {
-    set archflags ${configure.universal_cflags}
-} else {
-    set archflags ${configure.cc_archflags}
-}
-
-build.args-append   CC="${configure.cc} ${archflags}"
-
-post-patch {
-    reinplace "s|-Wl,-install_name,|-Wl,-install_name,${prefix}/lib/|" ${worksrcpath}/Makefile
-}
-
-destroot.destdir    PREFIX=${prefix} INSTALLPREFIX=${destroot}${prefix}
-
-livecheck.type      regex
-livecheck.url       http://miniupnp.free.fr/files/
-livecheck.regex     ${name}-(\\d+(\\.\\d{1,4})+)${extract.suffix}

doc/build-osx.txt

@@ -36,12 +36,7 @@ git clone git@github.com:bitcoin/bitcoin.git bitcoin
 
 3.  Install dependencies from MacPorts
 
-sudo port install boost db48 openssl
-
-Install the right version of miniupnpc:
-pushd bitcoin/contrib/minipupnpc; sudo port install; popd
-(this will be unnecessary soon, you will just port install miniupnpc
-along with the rest of the dependencies).
+sudo port install boost db48 openssl miniupnpc
 
 Optionally install qrencode (and set USE_QRCODE=1):
 sudo port install qrencode

doc/readme-qt.rst

@@ -92,7 +92,7 @@ Mac OS X
 ::
 
 	sudo port selfupdate
-	sudo port install boost db48
+	sudo port install boost db48 miniupnpc
 
 - Open the .pro file in Qt Creator and build as normal (cmd-B)
 
@@ -127,14 +127,6 @@ Set USE_UPNP to a different value to control this:
 | USE_UPNP=1 | build with UPnP support turned on by default at runtime.                 |
 +------------+--------------------------------------------------------------------------+
 
-Mac OS X users: miniupnpc is currently outdated on MacPorts. An updated Portfile is provided in contrib/miniupnpc within this project.
-You can execute the following commands in a terminal to install it:
-
-::
-
-	cd <location of bitcoin-qt>/contrib/miniupnpc
-	sudo port install
-
 Notification support for recent (k)ubuntu versions
 ---------------------------------------------------
 

doc/release-process.txt

@@ -67,14 +67,15 @@
    rm -rf bitcoin-${VERSION}-win32
 
 * perform Mac build
-  See this blog post for how Gavin set up his build environment and
-  patched macdeployqt to build the OSX release:
+  See this blog post for how Gavin set up his build environment to build the OSX
+  release; note that a patched version of macdeployqt is not needed anymore, as
+  the required functionality and fixes are implemented directly in macdeployqtplus:
     http://gavintech.blogspot.com/2011/11/deploying-bitcoin-qt-on-osx.html
   qmake USE_SSL=1 USE_UPNP=1 bitcoin-qt.pro
   make
   export QTDIR=/opt/local/share/qt4  # needed to find translations/qt_*.qm files
   T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale)
-  contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist  
+  contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist
 
  Build output expected:
   Bitcoin-Qt.dmg