Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Apr 2023 12:18:47 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e152be548b05 - main - math/spooles: Fix build on HEAD
Message-ID:  <202304271218.33RCIltO064664@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e152be548b05fbf7c16c271e6dfcec2eeffbcb25

commit e152be548b05fbf7c16c271e6dfcec2eeffbcb25
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-04-26 17:44:37 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-04-27 12:18:13 +0000

    math/spooles: Fix build on HEAD
    
    - Pet portclippy
    - Refactor OPTIONSNG
    - Adopt port
---
 math/spooles/Makefile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index 950526e7cd1f..ab06eebca7fa 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}
 DIST_SUBDIR=	spooles
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	SParse Object Oriented Linear Equations Solver
 WWW=		https://www.netlib.org/linalg/spooles/spooles.2.2.html
 
@@ -22,24 +22,24 @@ LIB_DEPENDS=	libmpich.so:net/mpich
 
 USES=		gmake tar:tgz
 
-OPTIONS_DEFINE=	DOCS
-
 .if defined(WITH_MPI)
-PLIST_SUB+=	MPI=""
-PLIST_SUB+=	MT="@comment "
 CONFLICTS=	spooles-2*
+PLIST_SUB=	MPI="" MT="@comment "
 .else
-PLIST_SUB+=	MT=""
-PLIST_SUB+=	MPI="@comment "
 CONFLICTS=	spooles-mpich-2*
+PLIST_SUB=	MPI="@comment " MT=""
 .endif
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} AllInOne.ps.gz Eigen.ps.gz \
+DOCS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} AllInOne.ps.gz Eigen.ps.gz \
 		Install.ps.gz LinSol.ps.gz Ordering.ps.gz \
 		PP99.ps.gz ReferenceManual.ps.gz
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 .if ${ARCH} == "sparc64"
@@ -102,7 +102,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/spooles/${i}
 	${INSTALL_DATA} ${WRKSRC}/${i}/*.h ${STAGEDIR}${PREFIX}/include/spooles/${i}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/AllInOne.ps.gz	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Eigen.ps.gz		${STAGEDIR}${DOCSDIR}
@@ -111,6 +112,5 @@ do-install:
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Ordering.ps.gz	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/PP99.ps.gz		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ReferenceManual.ps.gz	${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271218.33RCIltO064664>