Fix installation, and include dir has changed

from /usr/local/include/ufsparse to /usr/local/include/suitesparse

PR:		103463 (partially)

4 files changed, 162 insertions, 160 deletions

diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index 9690b504d4e6..1f465b0a817f 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -42,25 +42,25 @@ post-patch:
 			  -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 				 ${WRKSRC}/UFconfig/UFconfig.mk
 do-install:
-	${MKDIR} ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/UFconfig/UFconfig.h                       ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/UMFPACK/Include/*.h                       ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/AMD/Include/*.h			     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/BTF/Include/*.h			     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CCOLAMD/*.h   	                     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CHOLMOD/Include/*.h                 	     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/COLAMD/*.h    	                     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CXSparse/Source/*.h 	                     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/KLU/Include/*.h                           ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CAMD/Include/*.h		             ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/UMFPACK/Lib/libumfpack.a                  ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/AMD/Lib/libamd.a                          ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CCOLAMD/libccolamd.a                      ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CHOLMOD/Lib/libcholmod.a                  ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/COLAMD/libcolamd.a                        ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/KLU/Lib/libklu.a                          ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/BTF/Lib/libbtf.a                          ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CAMD/Lib/libcamd.a                        ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CXSparse/Source/libcxsparse.a             ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/UFconfig/UFconfig.h                       ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/UMFPACK/Include/*.h                       ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/AMD/Include/*.h			     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/BTF/Include/*.h			     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CCOLAMD/*.h   	                     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CHOLMOD/Include/*.h                 	     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/COLAMD/*.h    	                     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CXSparse/Source/*.h 	                     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/KLU/Include/*.h                           ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CAMD/Include/*.h		             ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/UMFPACK/Lib/libumfpack.a                  ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/AMD/Lib/libamd.a                          ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CCOLAMD/libccolamd.a                      ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CHOLMOD/Lib/libcholmod.a                  ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/COLAMD/libcolamd.a                        ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/KLU/Lib/libklu.a                          ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/BTF/Lib/libbtf.a                          ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CAMD/Lib/libcamd.a                        ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CXSparse/Source/libcxsparse.a             ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/math/suitesparse/pkg-plist b/math/suitesparse/pkg-plist
index acafd9adbcc2..945820b08627 100644
--- a/math/suitesparse/pkg-plist
+++ b/math/suitesparse/pkg-plist
@@ -1,67 +1,68 @@
-include/ufsparse/UFconfig.h
-include/ufsparse/amd.h
-include/ufsparse/amd_internal.h
-include/ufsparse/btf.h
-include/ufsparse/btf_internal.h
-include/ufsparse/camd.h
-include/ufsparse/camd_internal.h
-include/ufsparse/ccolamd.h
-include/ufsparse/cholmod.h
-include/ufsparse/cholmod_blas.h
-include/ufsparse/cholmod_check.h
-include/ufsparse/cholmod_cholesky.h
-include/ufsparse/cholmod_complexity.h
-include/ufsparse/cholmod_config.h
-include/ufsparse/cholmod_core.h
-include/ufsparse/cholmod_internal.h
-include/ufsparse/cholmod_matrixops.h
-include/ufsparse/cholmod_modify.h
-include/ufsparse/cholmod_partition.h
-include/ufsparse/cholmod_supernodal.h
-include/ufsparse/cholmod_template.h
-include/ufsparse/colamd.h
-include/ufsparse/cs.h
-include/ufsparse/klu.h
-include/ufsparse/klu_internal.h
-include/ufsparse/klu_version.h
-include/ufsparse/umfpack.h
-include/ufsparse/umfpack_col_to_triplet.h
-include/ufsparse/umfpack_defaults.h
-include/ufsparse/umfpack_free_numeric.h
-include/ufsparse/umfpack_free_symbolic.h
-include/ufsparse/umfpack_get_determinant.h
-include/ufsparse/umfpack_get_lunz.h
-include/ufsparse/umfpack_get_numeric.h
-include/ufsparse/umfpack_get_symbolic.h
-include/ufsparse/umfpack_global.h
-include/ufsparse/umfpack_load_numeric.h
-include/ufsparse/umfpack_load_symbolic.h
-include/ufsparse/umfpack_numeric.h
-include/ufsparse/umfpack_qsymbolic.h
-include/ufsparse/umfpack_report_control.h
-include/ufsparse/umfpack_report_info.h
-include/ufsparse/umfpack_report_matrix.h
-include/ufsparse/umfpack_report_numeric.h
-include/ufsparse/umfpack_report_perm.h
-include/ufsparse/umfpack_report_status.h
-include/ufsparse/umfpack_report_symbolic.h
-include/ufsparse/umfpack_report_triplet.h
-include/ufsparse/umfpack_report_vector.h
-include/ufsparse/umfpack_save_numeric.h
-include/ufsparse/umfpack_save_symbolic.h
-include/ufsparse/umfpack_scale.h
-include/ufsparse/umfpack_solve.h
-include/ufsparse/umfpack_symbolic.h
-include/ufsparse/umfpack_tictoc.h
-include/ufsparse/umfpack_timer.h
-include/ufsparse/umfpack_transpose.h
-include/ufsparse/umfpack_triplet_to_col.h
-include/ufsparse/umfpack_wsolve.h
-@dirrm include/ufsparse
+include/suitesparse/UFconfig.h
+include/suitesparse/amd.h
+include/suitesparse/amd_internal.h
+include/suitesparse/btf.h
+include/suitesparse/btf_internal.h
+include/suitesparse/camd.h
+include/suitesparse/camd_internal.h
+include/suitesparse/ccolamd.h
+include/suitesparse/cholmod.h
+include/suitesparse/cholmod_blas.h
+include/suitesparse/cholmod_check.h
+include/suitesparse/cholmod_cholesky.h
+include/suitesparse/cholmod_complexity.h
+include/suitesparse/cholmod_config.h
+include/suitesparse/cholmod_core.h
+include/suitesparse/cholmod_internal.h
+include/suitesparse/cholmod_matrixops.h
+include/suitesparse/cholmod_modify.h
+include/suitesparse/cholmod_partition.h
+include/suitesparse/cholmod_supernodal.h
+include/suitesparse/cholmod_template.h
+include/suitesparse/colamd.h
+include/suitesparse/cs.h
+include/suitesparse/klu.h
+include/suitesparse/klu_internal.h
+include/suitesparse/klu_version.h
+include/suitesparse/umfpack.h
+include/suitesparse/umfpack_col_to_triplet.h
+include/suitesparse/umfpack_defaults.h
+include/suitesparse/umfpack_free_numeric.h
+include/suitesparse/umfpack_free_symbolic.h
+include/suitesparse/umfpack_get_determinant.h
+include/suitesparse/umfpack_get_lunz.h
+include/suitesparse/umfpack_get_numeric.h
+include/suitesparse/umfpack_get_symbolic.h
+include/suitesparse/umfpack_global.h
+include/suitesparse/umfpack_load_numeric.h
+include/suitesparse/umfpack_load_symbolic.h
+include/suitesparse/umfpack_numeric.h
+include/suitesparse/umfpack_qsymbolic.h
+include/suitesparse/umfpack_report_control.h
+include/suitesparse/umfpack_report_info.h
+include/suitesparse/umfpack_report_matrix.h
+include/suitesparse/umfpack_report_numeric.h
+include/suitesparse/umfpack_report_perm.h
+include/suitesparse/umfpack_report_status.h
+include/suitesparse/umfpack_report_symbolic.h
+include/suitesparse/umfpack_report_triplet.h
+include/suitesparse/umfpack_report_vector.h
+include/suitesparse/umfpack_save_numeric.h
+include/suitesparse/umfpack_save_symbolic.h
+include/suitesparse/umfpack_scale.h
+include/suitesparse/umfpack_solve.h
+include/suitesparse/umfpack_symbolic.h
+include/suitesparse/umfpack_tictoc.h
+include/suitesparse/umfpack_timer.h
+include/suitesparse/umfpack_transpose.h
+include/suitesparse/umfpack_triplet_to_col.h
+include/suitesparse/umfpack_wsolve.h
+@dirrm include/suitesparse
 lib/libamd.a
 lib/libbtf.a
 lib/libcamd.a
 lib/libccolamd.a
+lib/libcolamd.a
 lib/libcholmod.a
 lib/libklu.a
 lib/libumfpack.a
diff --git a/math/ufsparse/Makefile b/math/ufsparse/Makefile
index 9690b504d4e6..1f465b0a817f 100644
--- a/math/ufsparse/Makefile
+++ b/math/ufsparse/Makefile
@@ -42,25 +42,25 @@ post-patch:
 			  -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 				 ${WRKSRC}/UFconfig/UFconfig.mk
 do-install:
-	${MKDIR} ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/UFconfig/UFconfig.h                       ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/UMFPACK/Include/*.h                       ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/AMD/Include/*.h			     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/BTF/Include/*.h			     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CCOLAMD/*.h   	                     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CHOLMOD/Include/*.h                 	     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/COLAMD/*.h    	                     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CXSparse/Source/*.h 	                     ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/KLU/Include/*.h                           ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CAMD/Include/*.h		             ${PREFIX}/include/ufsparse
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/UMFPACK/Lib/libumfpack.a                  ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/AMD/Lib/libamd.a                          ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CCOLAMD/libccolamd.a                      ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CHOLMOD/Lib/libcholmod.a                  ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/COLAMD/libcolamd.a                        ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/KLU/Lib/libklu.a                          ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/BTF/Lib/libbtf.a                          ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CAMD/Lib/libcamd.a                        ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/UFsparse/CXSparse/Source/libcxsparse.a             ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/UFconfig/UFconfig.h                       ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/UMFPACK/Include/*.h                       ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/AMD/Include/*.h			     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/BTF/Include/*.h			     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CCOLAMD/*.h   	                     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CHOLMOD/Include/*.h                 	     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/COLAMD/*.h    	                     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CXSparse/Source/*.h 	                     ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/KLU/Include/*.h                           ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/CAMD/Include/*.h		             ${PREFIX}/include/suitesparse
+	${INSTALL_DATA} ${WRKSRC}/UMFPACK/Lib/libumfpack.a                  ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/AMD/Lib/libamd.a                          ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CCOLAMD/libccolamd.a                      ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CHOLMOD/Lib/libcholmod.a                  ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/COLAMD/libcolamd.a                        ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/KLU/Lib/libklu.a                          ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/BTF/Lib/libbtf.a                          ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CAMD/Lib/libcamd.a                        ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/CXSparse/Source/libcxsparse.a             ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/math/ufsparse/pkg-plist b/math/ufsparse/pkg-plist
index acafd9adbcc2..945820b08627 100644
--- a/math/ufsparse/pkg-plist
+++ b/math/ufsparse/pkg-plist
@@ -1,67 +1,68 @@
-include/ufsparse/UFconfig.h
-include/ufsparse/amd.h
-include/ufsparse/amd_internal.h
-include/ufsparse/btf.h
-include/ufsparse/btf_internal.h
-include/ufsparse/camd.h
-include/ufsparse/camd_internal.h
-include/ufsparse/ccolamd.h
-include/ufsparse/cholmod.h
-include/ufsparse/cholmod_blas.h
-include/ufsparse/cholmod_check.h
-include/ufsparse/cholmod_cholesky.h
-include/ufsparse/cholmod_complexity.h
-include/ufsparse/cholmod_config.h
-include/ufsparse/cholmod_core.h
-include/ufsparse/cholmod_internal.h
-include/ufsparse/cholmod_matrixops.h
-include/ufsparse/cholmod_modify.h
-include/ufsparse/cholmod_partition.h
-include/ufsparse/cholmod_supernodal.h
-include/ufsparse/cholmod_template.h
-include/ufsparse/colamd.h
-include/ufsparse/cs.h
-include/ufsparse/klu.h
-include/ufsparse/klu_internal.h
-include/ufsparse/klu_version.h
-include/ufsparse/umfpack.h
-include/ufsparse/umfpack_col_to_triplet.h
-include/ufsparse/umfpack_defaults.h
-include/ufsparse/umfpack_free_numeric.h
-include/ufsparse/umfpack_free_symbolic.h
-include/ufsparse/umfpack_get_determinant.h
-include/ufsparse/umfpack_get_lunz.h
-include/ufsparse/umfpack_get_numeric.h
-include/ufsparse/umfpack_get_symbolic.h
-include/ufsparse/umfpack_global.h
-include/ufsparse/umfpack_load_numeric.h
-include/ufsparse/umfpack_load_symbolic.h
-include/ufsparse/umfpack_numeric.h
-include/ufsparse/umfpack_qsymbolic.h
-include/ufsparse/umfpack_report_control.h
-include/ufsparse/umfpack_report_info.h
-include/ufsparse/umfpack_report_matrix.h
-include/ufsparse/umfpack_report_numeric.h
-include/ufsparse/umfpack_report_perm.h
-include/ufsparse/umfpack_report_status.h
-include/ufsparse/umfpack_report_symbolic.h
-include/ufsparse/umfpack_report_triplet.h
-include/ufsparse/umfpack_report_vector.h
-include/ufsparse/umfpack_save_numeric.h
-include/ufsparse/umfpack_save_symbolic.h
-include/ufsparse/umfpack_scale.h
-include/ufsparse/umfpack_solve.h
-include/ufsparse/umfpack_symbolic.h
-include/ufsparse/umfpack_tictoc.h
-include/ufsparse/umfpack_timer.h
-include/ufsparse/umfpack_transpose.h
-include/ufsparse/umfpack_triplet_to_col.h
-include/ufsparse/umfpack_wsolve.h
-@dirrm include/ufsparse
+include/suitesparse/UFconfig.h
+include/suitesparse/amd.h
+include/suitesparse/amd_internal.h
+include/suitesparse/btf.h
+include/suitesparse/btf_internal.h
+include/suitesparse/camd.h
+include/suitesparse/camd_internal.h
+include/suitesparse/ccolamd.h
+include/suitesparse/cholmod.h
+include/suitesparse/cholmod_blas.h
+include/suitesparse/cholmod_check.h
+include/suitesparse/cholmod_cholesky.h
+include/suitesparse/cholmod_complexity.h
+include/suitesparse/cholmod_config.h
+include/suitesparse/cholmod_core.h
+include/suitesparse/cholmod_internal.h
+include/suitesparse/cholmod_matrixops.h
+include/suitesparse/cholmod_modify.h
+include/suitesparse/cholmod_partition.h
+include/suitesparse/cholmod_supernodal.h
+include/suitesparse/cholmod_template.h
+include/suitesparse/colamd.h
+include/suitesparse/cs.h
+include/suitesparse/klu.h
+include/suitesparse/klu_internal.h
+include/suitesparse/klu_version.h
+include/suitesparse/umfpack.h
+include/suitesparse/umfpack_col_to_triplet.h
+include/suitesparse/umfpack_defaults.h
+include/suitesparse/umfpack_free_numeric.h
+include/suitesparse/umfpack_free_symbolic.h
+include/suitesparse/umfpack_get_determinant.h
+include/suitesparse/umfpack_get_lunz.h
+include/suitesparse/umfpack_get_numeric.h
+include/suitesparse/umfpack_get_symbolic.h
+include/suitesparse/umfpack_global.h
+include/suitesparse/umfpack_load_numeric.h
+include/suitesparse/umfpack_load_symbolic.h
+include/suitesparse/umfpack_numeric.h
+include/suitesparse/umfpack_qsymbolic.h
+include/suitesparse/umfpack_report_control.h
+include/suitesparse/umfpack_report_info.h
+include/suitesparse/umfpack_report_matrix.h
+include/suitesparse/umfpack_report_numeric.h
+include/suitesparse/umfpack_report_perm.h
+include/suitesparse/umfpack_report_status.h
+include/suitesparse/umfpack_report_symbolic.h
+include/suitesparse/umfpack_report_triplet.h
+include/suitesparse/umfpack_report_vector.h
+include/suitesparse/umfpack_save_numeric.h
+include/suitesparse/umfpack_save_symbolic.h
+include/suitesparse/umfpack_scale.h
+include/suitesparse/umfpack_solve.h
+include/suitesparse/umfpack_symbolic.h
+include/suitesparse/umfpack_tictoc.h
+include/suitesparse/umfpack_timer.h
+include/suitesparse/umfpack_transpose.h
+include/suitesparse/umfpack_triplet_to_col.h
+include/suitesparse/umfpack_wsolve.h
+@dirrm include/suitesparse
 lib/libamd.a
 lib/libbtf.a
 lib/libcamd.a
 lib/libccolamd.a
+lib/libcolamd.a
 lib/libcholmod.a
 lib/libklu.a
 lib/libumfpack.a