Attachment #218816 for bug #250408




# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated

PORTNAME=	ocaml
PORTVERSION=	4.11.1
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \

HAS_CONFIGURE=	yes
ALL_TARGET=	world.opt
STRIP=
SSP_UNSAFE=	yes
MAKE_JOBS_UNSAFE=	yes
LDFLAGS_armv7=	-Wl,-znotext
LDFLAGS_i386=	-Wl,-znotext

CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" \
		--disable-force-safe-string \
		CC="${CC}" \
		ASPP="${CC} -c" \
		PARTIALLD="${LD} -r"

OPTIONS_DEFINE=	X11 THREADS DOCS EXAMPLES
OPTIONS_DEFAULT=X11 THREADS

.if ${PORT_OPTIONS:MDOCS}
DISTFILES:=	${DISTNAME}${EXTRACT_SUFX} \
		${DOCSDISTNAME}-refman-html.tar.gz:docs \
		${DOCSDISTNAME}-refman.ps.gz:docs \
		${DOCSDISTNAME}-refman.pdf:docs
EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX} \
		${DOCSDISTNAME}-refman-html.tar.gz
PLIST_SUB+=	DOC=""
PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.pdf
.else
PLIST_SUB+=	DOC="@comment "
.endif

.if ${ARCH} == armv6 || ${ARCH} == armv7
CONFIGURE_ARGS+=	AS="${AS} ${ASFLAGS} -meabi=5"
.else
CONFIGURE_ARGS+=	AS="${AS} ${ASFLAGS}"
.endif

.if ${PORT_OPTIONS:MTHREADS}

USES+=		xorg
USE_XORG=	x11
CONFLICTS+=	ocaml-nox11-[0-9]*
CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib
.else
PLIST_SUB+=	X11="@comment "
SFX=		-nox11

	fi;
.endif

post-patch:
	@${REINPLACE_CMD} \
		-e '\|MKLIB=|s|ar rc|${AR} rc|' \
		-e '\|RANLIB|s|ranlib|${RANLIB}|' \
		-e '\|bytecclinkopts=|s|""|"${LDFLAGS}"|' \
		-e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|" \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \
		${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \
		${WRKSRC}/asmrun/Makefile \
		${WRKSRC}/otherlibs/systhreads/Makefile \
		${WRKSRC}/testsuite/makefiles/Makefile.common \
		${WRKSRC}/testsuite/tests/asmcomp/Makefile

post-configure:
	@${REINPLACE_CMD} -E \
		-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
		${WRKSRC}/config/Makefile
# INSTALL* safeness (which preserves the correct permissions despite
# user's umask(1)
	@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \

.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
.endif
# Spacetime profiling is only available for native code on 64-bit targets

Return to bug 250408

Lines 3-9 Link Here

(-)Makefile (-30 / +8 lines)
3	# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated	3	# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
4		4
5	PORTNAME= ocaml	5	PORTNAME= ocaml
6	PORTVERSION= 4.05.0	6	PORTVERSION= 4.11.1
7	PORTREVISION= 1	7	PORTREVISION= 1
8	CATEGORIES= lang	8	CATEGORIES= lang
9	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \	9	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
Lines 33-47 Link Here
33	HAS_CONFIGURE= yes	33	HAS_CONFIGURE= yes
34	ALL_TARGET= world.opt	34	ALL_TARGET= world.opt
35	STRIP=	35	STRIP=
36	SSP_UNSAFE= yes
37	MAKE_JOBS_UNSAFE= yes
38	LDFLAGS_armv7= -Wl,-znotext	36	LDFLAGS_armv7= -Wl,-znotext
39	LDFLAGS_i386= -Wl,-znotext	37	LDFLAGS_i386= -Wl,-znotext
40		38
41	CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \	39	CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \
42	-cc "${CC}" \	40	--disable-force-safe-string \
43	-aspp "${CC} -c" \	41	CC="${CC}" \
44	-partialld "${LD} -r"	42	ASPP="${CC} -c" \
		43	PARTIALLD="${LD} -r"
45		44
46	OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES	45	OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES
47	OPTIONS_DEFAULT=X11 THREADS	46	OPTIONS_DEFAULT=X11 THREADS
Lines 58-77 Link Here
58	.if ${PORT_OPTIONS:MDOCS}	57	.if ${PORT_OPTIONS:MDOCS}
59	DISTFILES:= ${DISTNAME}${EXTRACT_SUFX} \	58	DISTFILES:= ${DISTNAME}${EXTRACT_SUFX} \
60	${DOCSDISTNAME}-refman-html.tar.gz:docs \	59	${DOCSDISTNAME}-refman-html.tar.gz:docs \
61	${DOCSDISTNAME}-refman.ps.gz:docs \
62	${DOCSDISTNAME}-refman.pdf:docs	60	${DOCSDISTNAME}-refman.pdf:docs
63	EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} \	61	EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} \
64	${DOCSDISTNAME}-refman-html.tar.gz	62	${DOCSDISTNAME}-refman-html.tar.gz
65	PLIST_SUB+= DOC=""	63	PLIST_SUB+= DOC=""
66	PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf	64	PORTDOCS= htmlman ${DOCSDISTNAME}-refman.pdf
67	.else	65	.else
68	PLIST_SUB+= DOC="@comment "	66	PLIST_SUB+= DOC="@comment "
69	.endif	67	.endif
70		68
71	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7	69	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
72	CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS} -meabi=5"	70	CONFIGURE_ARGS+= AS="${AS} ${ASFLAGS} -meabi=5"
73	.else	71	.else
74	CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS}"	72	CONFIGURE_ARGS+= AS="${AS} ${ASFLAGS}"
75	.endif	73	.endif
76		74
77	.if ${PORT_OPTIONS:MTHREADS}	75	.if ${PORT_OPTIONS:MTHREADS}
Lines 88-94 Link Here
88	USES+= xorg	86	USES+= xorg
89	USE_XORG= x11	87	USE_XORG= x11
90	CONFLICTS+= ocaml-nox11-[0-9]*	88	CONFLICTS+= ocaml-nox11-[0-9]*
91	CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib
92	.else	89	.else
93	PLIST_SUB+= X11="@comment "	90	PLIST_SUB+= X11="@comment "
94	SFX= -nox11	91	SFX= -nox11
Lines 119-142 Link Here
119	fi;	116	fi;
120	.endif	117	.endif
121		118
122	post-patch:
123	@${REINPLACE_CMD} \
124	-e '\\|MKLIB=\|s\|ar rc\|${AR} rc\|' \
125	-e '\\|RANLIB\|s\|ranlib\|${RANLIB}\|' \
126	-e '\\|bytecclinkopts=\|s\|""\|"${LDFLAGS}"\|' \
127	-e "\\|nativecclinkopts=\|s\|''\|\"${LDFLAGS:C/-Wl,//}\"\|" \
128	${WRKSRC}/configure
129	@${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \
130	${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \
131	${WRKSRC}/asmrun/Makefile \
132	${WRKSRC}/otherlibs/systhreads/Makefile \
133	${WRKSRC}/testsuite/makefiles/Makefile.common \
134	${WRKSRC}/testsuite/tests/asmcomp/Makefile
135
136	post-configure:
137	@${REINPLACE_CMD} -E \
138	-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
139	${WRKSRC}/config/Makefile
140	# INSTALL* safeness (which preserves the correct permissions despite	119	# INSTALL* safeness (which preserves the correct permissions despite
141	# user's umask(1)	120	# user's umask(1)
142	@${FIND} ${WRKDIR} -type f -name Makefile -print0 \| \	121	@${FIND} ${WRKDIR} -type f -name Makefile -print0 \| \
Lines 156-162 Link Here
156	.if ${PORT_OPTIONS:MDOCS}	135	.if ${PORT_OPTIONS:MDOCS}
157	${MKDIR} ${STAGEDIR}${DOCSDIR}	136	${MKDIR} ${STAGEDIR}${DOCSDIR}
158	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})	137	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})
159	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
160	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}	138	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
161	.endif	139	.endif
162	# Spacetime profiling is only available for native code on 64-bit targets	140	# Spacetime profiling is only available for native code on 64-bit targets