aboutsummaryrefslogtreecommitdiff
path: root/lang/nml
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-08-02 18:06:40 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-08-02 18:06:40 +0000
commit59f0859d16f14985bbababf1137d78732586a80b (patch)
tree69751c1d5dc4aa1bec1b68ea1c08e53478aead1c /lang/nml
parentbe34731ed74f1060074616aa09ec2d58f7fc242e (diff)
downloadports-59f0859d16f14985bbababf1137d78732586a80b.tar.gz
ports-59f0859d16f14985bbababf1137d78732586a80b.zip
Stage, and fix build without gcc.
Notes
Notes: svn path=/head/; revision=363832
Diffstat (limited to 'lang/nml')
-rw-r--r--lang/nml/Makefile40
-rw-r--r--lang/nml/files/patch-ocaml__byterun__sys.c13
2 files changed, 38 insertions, 15 deletions
diff --git a/lang/nml/Makefile b/lang/nml/Makefile
index ff67301e2a4d..dabac5cf9e2b 100644
--- a/lang/nml/Makefile
+++ b/lang/nml/Makefile
@@ -14,27 +14,37 @@ COMMENT= Dialect/harmony of Standard ML of New Jersey and Objective Caml
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
-
-.include <bsd.port.post.mk>
+ @${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.mk>
diff --git a/lang/nml/files/patch-ocaml__byterun__sys.c b/lang/nml/files/patch-ocaml__byterun__sys.c
new file mode 100644
index 000000000000..01b315091350
--- /dev/null
+++ b/lang/nml/files/patch-ocaml__byterun__sys.c
@@ -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)
+ {