Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Sep 2015 12:49:14 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396813 - head/math/asir2000
Message-ID:  <201509131249.t8DCnElf046667@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sun Sep 13 12:49:13 2015
New Revision: 396813
URL: https://svnweb.freebsd.org/changeset/ports/396813

Log:
  - Attempt to fix the build on Tier-2 systems by avoiding reallocarray()
    conflict (tested on PowerPC only; the build on sparc64 should be fine,
    but cannot be easily completed on flame due to missing X11 bits)
  - Tighten COMMENT and fix common style bugs in the Makefile while here

Modified:
  head/math/asir2000/Makefile

Modified: head/math/asir2000/Makefile
==============================================================================
--- head/math/asir2000/Makefile	Sun Sep 13 12:28:56 2015	(r396812)
+++ head/math/asir2000/Makefile	Sun Sep 13 12:49:13 2015	(r396813)
@@ -11,7 +11,7 @@ DISTFILES=	${ASIR_SRC} ${ASIR_DOC} ${GC_
 EXTRACT_ONLY=	${ASIR_SRC}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The system Risa/Asir is a general computer algebra system
+COMMENT=	General computer algebra system (Risa/Asir)
 
 LICENSE=	RALUL
 LICENSE_NAME=	Risa/Asir Limited Use License
@@ -42,18 +42,19 @@ OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 PORTDATA=	*
 
-BROKEN_ia64=	does not compile
-BROKEN_powerpc=	does not compile
-BROKEN_sparc64=	does not compile
-
 post-extract:
-	@( cd ${WRKSRC}; ${TAR} xfz ${DISTDIR}/${GC_SRC} )
+	@${TAR} xfz ${DISTDIR}/${GC_SRC} -C ${WRKSRC}
 	@${MKDIR} ${WRKDIR}/asirdoc
 	@${TAR} xfz ${DISTDIR}/${ASIR_DOC} -C ${WRKDIR}/asirdoc
 
 post-patch:
-	${REINPLACE_CMD} '-e s|$${DESTDIR}|${STAGEDIR}|g' \
+	@${REINPLACE_CMD} -e 's|$${DESTDIR}|${STAGEDIR}|' \
 		${WRKSRC}/lib/Makefile.am
+	@${REINPLACE_CMD} -e 's|reallocarray|_&|' \
+		${WRKSRC}/include/ca.h ${WRKSRC}/parse/eval.c \
+		${WRKSRC}/parse/glob.c ${WRKSRC}/parse/load.c \
+		${WRKSRC}/parse/pvar.c ${WRKSRC}/parse/struct.c \
+		${WRKSRC}/parse/util.c
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
@@ -68,10 +69,11 @@ post-install:
 	${LN} -fs ${PREFIX}/bin/asir ${STAGEDIR}${DATADIR}/ox_plot
 	${LN} -fs ${PREFIX}/bin/asir ${STAGEDIR}${DATADIR}/ox_launch
 	${LN} -fs ${DATADIR} ${STAGEDIR}${PREFIX}/lib/asir
-	${INSTALL_MAN} ${WRKDIR}/asirdoc/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/asirdoc/${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKDIR}/asirdoc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR}/asirdoc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>



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