Index: Portfile
===================================================================
--- Portfile	(revision 46235)
+++ Portfile	(working copy)
@@ -4,6 +4,7 @@
 
 name    mapm
 version    4.9.5
+revision   1
 categories    math science
 platforms	darwin
 maintainers	jmpp@opendarwin.org
@@ -21,19 +22,23 @@
              rmd160 f4e39962410ea4f9a0d85a3e07b7421e9795d6cb
 
 use_configure    no
+use_parallel_build  yes
 
 worksrcdir   ${name}_${version}
-build.cmd    make -f makefile.osx
+build.args   -f makefile.osx \
+             CC=${configure.cc}
 
 destroot {
-    copy ${worksrcpath}/m_apm.h ${destroot}${prefix}/include
-    copy ${worksrcpath}/libmapm.a ${destroot}${prefix}/lib
-    xinstall -d -m 755 ${destroot}${prefix}/share/${name}
-    copy ${worksrcpath}/DOCS ${destroot}${prefix}/share/${name}/
-    copy ${worksrcpath}/MULTI_THREAD ${destroot}${prefix}/share/${name}/
-    copy ${worksrcpath}/PI_DEMO ${destroot}${prefix}/share/${name}/
-    copy ${worksrcpath}/README ${destroot}${prefix}/share/${name}
-    foreach prog  {calc primenum validate} {
-        copy ${worksrcpath}/$prog ${destroot}${prefix}/bin
+    xinstall -m 755 -W ${worksrcpath} \
+        calc primenum validate \
+        ${destroot}${prefix}/bin
+    xinstall -m 644 -W ${worksrcpath} m_apm.h ${destroot}${prefix}/include
+    xinstall -m 644 -W ${worksrcpath} libmapm.a ${destroot}${prefix}/lib
+    xinstall -d -m 755 \
+        ${destroot}${prefix}/share/doc \
+        ${destroot}${prefix}/share/${name}
+    foreach item {DOCS MULTI_THREAD PI_DEMO README} {
+        copy ${worksrcpath}/${item} ${destroot}${prefix}/share/${name}
     }
+    ln -s ../${name}/DOCS ${destroot}${prefix}/share/doc/${name}
 }
