Index: Portfile
===================================================================
--- Portfile	(revision 139867)
+++ Portfile	(working copy)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name                mkpwd
-version             0.8
+version             1.6
 categories          sysutils
 license             Permissive
 platforms           darwin
@@ -16,20 +16,19 @@
 homepage            http://www.o-schroeder.de/
 master_sites        ${homepage}/download/${name}/
 
-extract.suffix      .tgz
-set real_version    [strsed ${version} {s/\./\-/}]
-distname            ${name}-${real_version}
+extract.suffix      .tar.gz
+distname            ${name}-${version}
 
-checksums           rmd160  5bf94e92414366592573f8a92776ed2ae6b80395 \
-                    sha256  352315e531d82f6e975fe135f31505b4c356256c26da1f0303c4f01f70779a62
+checksums           rmd160 a438113a4fc823ae9e884c1d530fbe5689077432 \
+                    sha256 6db5032fa6e2bc3ebd499ebf2b94f8df5b3ce64760d84fda7101e951bfb5c88a
 
 depends_build-append    port:cctools
 
-worksrcdir          ${name}
+worksrcdir          ${name}-${version}
 
-patchfiles          patch-Makefile
+patchfiles          patch-configure.diff patch-Makefile.am.diff patch-Makefile.in.diff patch-mkpwd.c.diff \
+                    patch-mkpwd.1.diff
 
-use_configure       no
 
 variant universal {}
 
@@ -40,5 +39,5 @@
 
 livecheck.type      regex
 livecheck.url       ${master_sites}
-livecheck.regex     ${name}-(\[0-9.\]-\[0-9.\]+)\\${extract.suffix}
-livecheck.version   ${real_version}
+livecheck.regex     ${name}-(\[0-9.\].\[0-9.\]+)\\${extract.suffix}
+livecheck.version   ${version}