Attachment #118274 for bug #160492





PORTNAME=	ocaml
PORTVERSION=	3.12.1
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \

USE_BZIP2=	yes
REINPLACE_ARGS=	-i ""
HAS_CONFIGURE=	yes
USE_LDCONFIG=	yes
ALL_TARGET=	world.opt
STRIP=
MAKE_JOBS_UNSAFE=	yes

CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" -cc "${CC}" -as "${AS}" \
		-aspp "${CC} -c" -partialld "${LD} -r"
OPTIONS=	X11	"Build with X11 support" on \
		TK	"Build LablTk library (requires X11 support)" on \
		THREADS	"Build with Posix threads support" on \


.if !defined(WITHOUT_THREADS)
PLIST_SUB+=	THREADS=""
DEPENDS_ARGS+=	WITH_THREADS=yes
CONFIGURE_ARGS+=-with-pthread
THR_CPP=	${PTHREAD_CFLAGS}
THR_LD=		${PTHREAD_LIBS}
.else


.if defined(WITHOUT_TK)
PLIST_SUB+=	TK="@comment "
.if !defined(WITHOUT_X11)
SFX=		-notk
CONFLICTS+=	ocaml-[0-9]* ocaml-nox11-[0-9]*
.endif
CONFIGURE_ARGS+=-no-tk
.else
USE_TK=		84+
INVALID_TK_VER =	86
.if defined(WITH_THREADS)
USE_TK_THREADS =	yes
.endif
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
PLIST_SUB+=	TK=""
CONFLICTS+=	ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
CONFIGURE_ARGS+=	-tkdefs \
			"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
			-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||}${_TCL_THREADS_SUFFIX} \
			-ltcl${TCL_VER:S|.||}${_TCL_THREADS_SUFFIX} ${THR_LD}"
.endif

.if ${ARCH} == sparc64

	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
.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,//}\"|" \
		-e '\|mksharedlib=|s|$$bytecc|& $$bytecclinkopts|' \
		-e 's|-lbfd -ldl|-lbfd $$dllib|' \
		${WRKSRC}/configure
# don't hardcode gcc for depend target
	@${REINPLACE_CMD} -e 's|gcc|$$(CC)|' \
		${WRKSRC}/*/Makefile \
		${WRKSRC}/*/*/Makefile
.if defined(WITH_TK)
	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|' \
		${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl
.endif

post-configure:
# CFLAGS safeness
	@${REINPLACE_CMD} -E \
		-e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
		-e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
		-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
		-e 's|gcc|${CC}|g'	\
		${WRKSRC}/config/Makefile

# INSTALL* safeness (which preserves the correct permissions despite

		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
		-e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'

check test: install
	@cd ${WRKSRC}/testsuite; ${RM} -f _log; for d in tests/* ; do \
	${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} one DIR=$${d} \
	2>&1 | tee -a _log || ${TRUE} ; done ; \
	${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} report

post-install:
	@${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep
.if !defined(WITHOUT_TK)

		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
	@${ECHO_CMD} "@dirrm lib/ocaml/compiler-lib" >> ${TMPPLIST}
.endif
	@${ECHO_CMD} "@unexec rmdir "%D/lib/ocaml" 2>/dev/null || true" >> ${TMPPLIST}

.include <bsd.port.post.mk>

Lines 1003-1005 Link Here

(-)pkg-plist (+1 lines)
1003	@dirrm lib/ocaml/camlp4	1003	@dirrm lib/ocaml/camlp4
1004	@dirrm lib/ocaml/caml	1004	@dirrm lib/ocaml/caml
1005	@comment lib/ocaml will be added by Makefile	1005	@comment lib/ocaml will be added by Makefile
		1006	@dirrmtry lib/ocaml

Return to bug 160492

Lines 7-12 Link Here

(-)Makefile (-7 / +35 lines)
7		7
8	PORTNAME= ocaml	8	PORTNAME= ocaml
9	PORTVERSION= 3.12.1	9	PORTVERSION= 3.12.1
		10	PORTREVISION= 1
10	CATEGORIES= lang	11	CATEGORIES= lang
11	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \	12	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \
12	ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \	13	ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
Lines 21-32 Link Here
21	USE_BZIP2= yes	22	USE_BZIP2= yes
22	REINPLACE_ARGS= -i ""	23	REINPLACE_ARGS= -i ""
23	HAS_CONFIGURE= yes	24	HAS_CONFIGURE= yes
24	USE_LDCONFIG= yes
25	ALL_TARGET= world.opt	25	ALL_TARGET= world.opt
26	STRIP=	26	STRIP=
27	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes
28		28
29	CONFIGURE_ARGS= -prefix ${PREFIX}	29	CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" -cc "${CC}" -as "${AS}" \
		30	-aspp "${CC} -c" -partialld "${LD} -r"
30	OPTIONS= X11 "Build with X11 support" on \	31	OPTIONS= X11 "Build with X11 support" on \
31	TK "Build LablTk library (requires X11 support)" on \	32	TK "Build LablTk library (requires X11 support)" on \
32	THREADS "Build with Posix threads support" on \	33	THREADS "Build with Posix threads support" on \
Lines 52-59 Link Here
52		53
53	.if !defined(WITHOUT_THREADS)	54	.if !defined(WITHOUT_THREADS)
54	PLIST_SUB+= THREADS=""	55	PLIST_SUB+= THREADS=""
55	DEPENDS_ARGS+= WITH_THREADS=yes
56	CONFIGURE_ARGS+=-with-pthread
57	THR_CPP= ${PTHREAD_CFLAGS}	56	THR_CPP= ${PTHREAD_CFLAGS}
58	THR_LD= ${PTHREAD_LIBS}	57	THR_LD= ${PTHREAD_LIBS}
59	.else	58	.else
Lines 77-93 Link Here
77		76
78	.if defined(WITHOUT_TK)	77	.if defined(WITHOUT_TK)
79	PLIST_SUB+= TK="@comment "	78	PLIST_SUB+= TK="@comment "
		79	.if !defined(WITHOUT_X11)
80	SFX= -notk	80	SFX= -notk
81	CONFLICTS+= ocaml-[0-9]* ocaml-nox11-[0-9]*	81	CONFLICTS+= ocaml-[0-9]* ocaml-nox11-[0-9]*
		82	.endif
82	CONFIGURE_ARGS+=-no-tk	83	CONFIGURE_ARGS+=-no-tk
83	.else	84	.else
84	USE_TK= 84+	85	USE_TK= 84+
		86	INVALID_TK_VER = 86
		87	.if defined(WITH_THREADS)
		88	USE_TK_THREADS = yes
		89	.endif
85	.include "${PORTSDIR}/Mk/bsd.tcl.mk"	90	.include "${PORTSDIR}/Mk/bsd.tcl.mk"
86	PLIST_SUB+= TK=""	91	PLIST_SUB+= TK=""
87	CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]*	92	CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
88	CONFIGURE_ARGS+= -tkdefs \	93	CONFIGURE_ARGS+= -tkdefs \
89	"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \	94	"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
90	-tklibs "-L${LOCALBASE}/lib ${THR_LD}"	95	-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S\|.\|\|}${_TCL_THREADS_SUFFIX} \
		96	-ltcl${TCL_VER:S\|.\|\|}${_TCL_THREADS_SUFFIX} ${THR_LD}"
91	.endif	97	.endif
92		98
93	.if ${ARCH} == sparc64	99	.if ${ARCH} == sparc64
Lines 99-111 Link Here
99	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S	105	${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
100	.endif	106	.endif
101		107
		108	post-patch:
		109	@${REINPLACE_CMD} \
		110	-e '\\|MKLIB=\|s\|ar rc\|${AR} rc\|' \
		111	-e '\\|RANLIB\|s\|ranlib\|${RANLIB}\|' \
		112	-e '\\|bytecclinkopts=\|s\|""\|"${LDFLAGS}"\|' \
		113	-e "\\|nativecclinkopts=\|s\|''\|\"${LDFLAGS:C/-Wl,//}\"\|" \
		114	-e '\\|mksharedlib=\|s\|$$bytecc\|& $$bytecclinkopts\|' \
		115	-e 's\|-lbfd -ldl\|-lbfd $$dllib\|' \
		116	${WRKSRC}/configure
		117	# don't hardcode gcc for depend target
		118	@${REINPLACE_CMD} -e 's\|gcc\|$$(CC)\|' \
		119	${WRKSRC}/*/Makefile \
		120	${WRKSRC}///Makefile
		121	.if defined(WITH_TK)
		122	@${REINPLACE_CMD} -e 's\|/usr/bin/wish\|${WISH}\|' \
		123	${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl
		124	.endif
		125
102	post-configure:	126	post-configure:
103	# CFLAGS safeness	127	# CFLAGS safeness
104	@${REINPLACE_CMD} -E \	128	@${REINPLACE_CMD} -E \
105	-e 's\|(BYTECCCOMPOPTS[ \t]=.)\|\1 ${CFLAGS} ${THR_CPP}\|' \	129	-e 's\|(BYTECCCOMPOPTS[ \t]=.)\|\1 ${CFLAGS} ${THR_CPP}\|' \
106	-e 's\|(NATIVECCCOMPOPTS[ \t]=.)\|\1 ${CFLAGS} ${THR_CPP}\|' \	130	-e 's\|(NATIVECCCOMPOPTS[ \t]=.)\|\1 ${CFLAGS} ${THR_CPP}\|' \
107	-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \	131	-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
108	-e 's\|gcc\|${CC}\|g' \
109	${WRKSRC}/config/Makefile	132	${WRKSRC}/config/Makefile
110		133
111	# INSTALL* safeness (which preserves the correct permissions despite	134	# INSTALL* safeness (which preserves the correct permissions despite
Lines 118-123 Link Here
118	-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \	141	-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
119	-e 's,(${PATTERN}+.*(MANDIR\|MANODIR\|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'	142	-e 's,(${PATTERN}+.*(MANDIR\|MANODIR\|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
120		143
		144	check test: install
		145	@cd ${WRKSRC}/testsuite; ${RM} -f _log; for d in tests/* ; do \
		146	${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} one DIR=$${d} \
		147	2>&1 \| tee -a _log \|\| ${TRUE} ; done ; \
		148	${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} report
		149
121	post-install:	150	post-install:
122	@${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep	151	@${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep
123	.if !defined(WITHOUT_TK)	152	.if !defined(WITHOUT_TK)
Lines 163-168 Link Here
163	${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}	192	${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
164	@${ECHO_CMD} "@dirrm lib/ocaml/compiler-lib" >> ${TMPPLIST}	193	@${ECHO_CMD} "@dirrm lib/ocaml/compiler-lib" >> ${TMPPLIST}
165	.endif	194	.endif
166	@${ECHO_CMD} "@unexec rmdir "%D/lib/ocaml" 2>/dev/null \|\| true" >> ${TMPPLIST}
167		195
168	.include <bsd.port.post.mk>	196	.include <bsd.port.post.mk>