Date: Sat, 2 Aug 2014 18:06:40 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363832 - in head/lang/nml: . files Message-ID: <201408021806.s72I6eZW096417@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Aug 2 18:06:40 2014 New Revision: 363832 URL: http://svnweb.freebsd.org/changeset/ports/363832 QAT: https://qat.redports.org/buildarchive/r363832/ Log: Stage, and fix build without gcc. Added: head/lang/nml/files/ head/lang/nml/files/patch-ocaml__byterun__sys.c (contents, props changed) Modified: head/lang/nml/Makefile Modified: head/lang/nml/Makefile ============================================================================== --- head/lang/nml/Makefile Sat Aug 2 17:53:03 2014 (r363831) +++ head/lang/nml/Makefile Sat Aug 2 18:06:40 2014 (r363832) @@ -14,27 +14,37 @@ COMMENT= Dialect/harmony of Standard ML WRKSRC= ${WRKDIR}/${PORTNAME}-0.92 ONLY_FOR_ARCHS= i386 +MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+= \ - -prefix ${PREFIX} +CONFIGURE_ARGS+=--prefix ${PREFIX} USES= gmake ALL_TARGET= all opt opt.opt INSTALL_TARGET= install installopt -NO_STAGE= yes -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DOCS + +post-patch: + @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ + ${REINPLACE_CMD} -e 's|gcc|${CC}|' + @${REINPLACE_CMD} -e '/freebsd/s/3-9/0-9/; \ + /aspp=/s|gcc|${CC}|; /mksharedlib=/s|gcc|${CC}|' \ + ${WRKSRC}/configure + +do-install: + ${DO_MAKE_BUILD} -C ${WRKSRC} PREFIX="${STAGEDIR}${PREFIX}" ${INSTALL_TARGET} + @${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' ${STAGEDIR}${PREFIX}/lib/nml/ld.conf post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Changes ${WRKSRC}/LICENSE ${WRKSRC}/README ${DOCSDIR} - ${MKDIR} ${DATADIR}/contrib/emacs - ${MKDIR} ${DATADIR}/contrib/vim - ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/* ${DATADIR}/contrib/emacs - ${INSTALL_DATA} ${WRKSRC}/contrib/vim/* ${DATADIR}/contrib/vim -.endif - @${STRIP_CMD} ${PREFIX}/bin/ncamlrun + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Changes ${WRKSRC}/LICENSE ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/contrib/emacs + @${MKDIR} ${STAGEDIR}${DATADIR}/contrib/vim + ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/* ${STAGEDIR}${DATADIR}/contrib/emacs + ${INSTALL_DATA} ${WRKSRC}/contrib/vim/* ${STAGEDIR}${DATADIR}/contrib/vim +.for i in ncamlrun nmlc nlex nmakegen nyacc nmlo + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$i +.endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/lang/nml/files/patch-ocaml__byterun__sys.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/nml/files/patch-ocaml__byterun__sys.c Sat Aug 2 18:06:40 2014 (r363832) @@ -0,0 +1,13 @@ +--- ./ocaml/byterun/sys.c.orig 2014-08-02 13:18:24.000000000 -0400 ++++ ./ocaml/byterun/sys.c 2014-08-02 13:18:48.000000000 -0400 +@@ -71,8 +71,8 @@ + + #else + +-extern int sys_nerr; +-extern char * sys_errlist []; ++extern const int sys_nerr; ++extern const char * const sys_errlist []; + + char * error_message(void) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408021806.s72I6eZW096417>