2 files changed, 60 insertions, 12 deletions

diff --git a/math/umfpack/Makefile b/math/umfpack/Makefile
index cad5049c1627..3cc1e56a1ad7 100644
--- a/math/umfpack/Makefile
+++ b/math/umfpack/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	UMFPACKv${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unsymmetric-pattern MultiFrontal Package
 
-BROKEN=		Does not install
-
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcblas.a:${PORTSDIR}/math/atlas
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/UMFPACK
@@ -33,8 +31,15 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Doc/*.pdf ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${GZIP_CMD} ${DOCSDIR}/README
-	${INSTALL_DATA} ${WRKSRC}/*.pdf  ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Doc/*.pdf  ${DOCSDIR}
 	${CP} -R ${WRKDIR}/${DISTNAME}/Papers ${DOCSDIR}
+	@${FIND} ${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+	@${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+	@${MKDIR} ${EXAMPLESDIR}
+	@${TAR} --exclude tmp -C ${WRKSRC}/Demo -cf - . | \
+		${TAR} -C ${EXAMPLESDIR} -xf -
+	@${FIND} ${EXAMPLESDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+	@${FIND} ${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/umfpack/pkg-plist b/math/umfpack/pkg-plist
index e8ff5b1c0983..f2d027325a62 100644
--- a/math/umfpack/pkg-plist
+++ b/math/umfpack/pkg-plist
@@ -1,15 +1,58 @@
 lib/libamd.a
 lib/libumfpack.a
-%%PORTDOCS%%%%DOCSDIR%%/AMD_userguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/AMD_UserGuide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/README.gz
 %%PORTDOCS%%%%DOCSDIR%%/QuickStart.pdf
 %%PORTDOCS%%%%DOCSDIR%%/UserGuide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Papers/amadalgo.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Papers/amadalgo.ps
-%%PORTDOCS%%%%DOCSDIR%%/Papers/amf4.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Papers/amf4.ps
-%%PORTDOCS%%%%DOCSDIR%%/Papers/amf4algo.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Papers/amf4algo.ps
-%%PORTDOCS%%%%DOCSDIR%%/README.gz
+%%PORTDOCS%%%%DOCSDIR%%/Papers/amdalgo.pdf
+%%PORTDOCS%%%%DOCSDIR%%/Papers/amdalgo.ps 
+%%PORTDOCS%%%%DOCSDIR%%/Papers/umf4.pdf   
+%%PORTDOCS%%%%DOCSDIR%%/Papers/umf4.ps	   
+%%PORTDOCS%%%%DOCSDIR%%/Papers/umf4algo.pdf
+%%PORTDOCS%%%%DOCSDIR%%/Papers/umf4algo.ps
 %%PORTDOCS%%@dirrm share/doc/umfpack/Papers
 %%PORTDOCS%%@dirrm share/doc/umfpack
-
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_simple.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_di_demo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_di_demo.sed
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_dl_demo.sed
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_xx_demo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zi_demo.sed
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zl_demo.sed
+%%PORTDOCS%%%%EXAMPLESDIR%%/readhb.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_dl_demo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/readhb_nozeros.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/readhb_size.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4hb.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zi_demo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zl_demo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_dl_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4_f77zwrapper.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4hb64.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zl_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4_f77wrapper.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zi_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4hb.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4zhb.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4zhb.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/HB/west0067.rua
+%%PORTDOCS%%%%EXAMPLESDIR%%/HB/arc130.rua
+%%PORTDOCS%%%%EXAMPLESDIR%%/HB/fs_183_6.rua
+%%PORTDOCS%%%%EXAMPLESDIR%%/HB/can_24.psa
+%%PORTDOCS%%%%EXAMPLESDIR%%/umf4.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_di_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_di_demo
+%%PORTDOCS%%%%EXAMPLESDIR%%/my_umfpack_di_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/symbolic.umf
+%%PORTDOCS%%%%EXAMPLESDIR%%/numeric.umf
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zi_demo
+%%PORTDOCS%%%%EXAMPLESDIR%%/my_umfpack_zi_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_dl_demo
+%%PORTDOCS%%%%EXAMPLESDIR%%/my_umfpack_dl_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_zl_demo
+%%PORTDOCS%%%%EXAMPLESDIR%%/my_umfpack_zl_demo.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/umfpack_simple
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/HB
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%