View | Details | Raw Unified | Return to bug 189176
Collapse All | Expand All

(-)b/lang/ocaml/Makefile (-17 / +2 lines)
Lines 4-10 Link Here
4
# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
4
# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
5
PORTNAME=	ocaml
5
PORTNAME=	ocaml
6
PORTVERSION=	4.01.0
6
PORTVERSION=	4.01.0
7
PORTREVISION=	1
7
PORTREVISION=	2
8
CATEGORIES=	lang
8
CATEGORIES=	lang
9
MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
9
MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
10
		${MASTER_SITE_GENTOO}
10
		${MASTER_SITE_GENTOO}
Lines 37-48 CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \ Link Here
37
		-aspp "${CC} -c" \
37
		-aspp "${CC} -c" \
38
		-partialld "${LD} -r"
38
		-partialld "${LD} -r"
39
39
40
OPTIONS_DEFINE= X11 TK THREADS OPT_DEF DOCS
40
OPTIONS_DEFINE= X11 TK THREADS DOCS
41
OPTIONS_DEFAULT=X11 TK THREADS
41
OPTIONS_DEFAULT=X11 TK THREADS
42
OPT_DEF_DESC=	Use system-optimized binaries by default
43
TK_DESC=	LablTk library (requires X11 support)
42
TK_DESC=	LablTk library (requires X11 support)
44
CMP_LIB_DESC=	Install compiler libraries
43
CMP_LIB_DESC=	Install compiler libraries
45
OPT_DEF_DESC=	Use system-optimizes binaries by default
46
PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz \
44
PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz \
47
		${DOCSDISTNAME}-refman.pdf
45
		${DOCSDISTNAME}-refman.pdf
48
46
Lines 200-216 post-install: Link Here
200
# Fix permissions for ld.conf
198
# Fix permissions for ld.conf
201
	@${CHMOD} 644 ${STAGEDIR}${PREFIX}/lib/ocaml/ld.conf
199
	@${CHMOD} 644 ${STAGEDIR}${PREFIX}/lib/ocaml/ld.conf
202
200
203
# Do we want .opt version of tools to be the default ?
204
.if ${PORT_OPTIONS:MOPT_DEF}
205
. for module in ${MODOPT}
206
#	First, we save bytecode version
207
	${MV} ${STAGEDIR}${PREFIX}/bin/${module} ${STAGEDIR}${PREFIX}/bin/${module}.byte
208
209
#	Next make .opt version be the default one (via link)
210
	${LN} ${STAGEDIR}${PREFIX}/bin/${module}.opt ${STAGEDIR}${PREFIX}/bin/${module}
211
	@${ECHO_CMD} "bin/${module}.byte" >> ${TMPPLIST}
212
	@${ECHO_CMD} "@exec ${LN} %D/${module}.opt %D/${module}" >> ${TMPPLIST}
213
. endfor
214
.endif
215
216
.include <bsd.port.post.mk>
201
.include <bsd.port.post.mk>
(-)b/lang/ocaml/files/patch-camlp4-man_Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
--- camlp4/man/Makefile.orig	2010-11-04 21:04:51.000000000 +0800
1
--- camlp4/man/Makefile.orig	2012-07-17 11:31:12.000000000 -0400
2
+++ camlp4/man/Makefile	2010-11-04 21:05:14.000000000 +0800
2
+++ camlp4/man/Makefile	2013-11-21 03:16:26.000000000 -0500
3
@@ -3,7 +3,6 @@
3
@@ -14,7 +14,6 @@
4
 include ../config/Makefile.cnf
4
 include ../config/Makefile.cnf
5
 
5
 
6
 TARGET=camlp4.1
6
 TARGET=camlp4.1
Lines 8-14 Link Here
8
 
8
 
9
 include ../config/Makefile.base
9
 include ../config/Makefile.base
10
 
10
 
11
@@ -11,10 +10,6 @@
11
@@ -22,10 +21,6 @@
12
 	if test -n '$(MANDIR)'; then \
12
 	if test -n '$(MANDIR)'; then \
13
 	  $(MKDIR) $(MANDIR)/man1 ; \
13
 	  $(MKDIR) $(MANDIR)/man1 ; \
14
 	  cp $(TARGET) $(MANDIR)/man1/. ; \
14
 	  cp $(TARGET) $(MANDIR)/man1/. ; \

Return to bug 189176