Attachment #254216 for bug #282068

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




PORTNAME=	camlidl
PORTVERSION=	1.12
PORTREVISION=	3
CATEGORIES=	lang
MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
PKGNAMEPREFIX=	ocaml-
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
		${PORTNAME}-${PORTVERSION}.doc.html.tar.gz
EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}

MAINTAINER=	kennedy.greg@gmail.com
COMMENT=	Stub code generator for using C/C++ libraries from OCaml

LICENSE_COMB=	dual
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		gmake
USE_OCAML=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	xavierleroy
GH_TAGNAME=	${PORTNAME}${DISTVERSION:S/.//}

MAKE_JOBS_UNSAFE=	yes

DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}

OPTIONS_DEFINE=		DOCS
DOCS_BUILD_DEPENDS=	hevea>=0:textproc/hevea
.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD
CFLAGS+=	-Wno-error=int-conversion
.endif

post-extract:
	@${REINPLACE_CMD} -e "s,^\(OCAMLLIB=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml,g" \
		-e "s,^\(BINDIR=\).*,\1${STAGEDIR}${PREFIX}/bin,g" \
		-e "s,^CFLAGS=.*,#\&,g" \
		-e "s,^\(CPP=\).*,\1/usr/bin/cpp,g" \
		${WRKSRC}/config/Makefile.unix

	@${REINPLACE_CMD} -e \
		"/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_SCRIPT},g" \
		-e 's,$$(OCAMLC),& -warn-error -a,' \
		${WRKSRC}/compiler/Makefile

	@${REINPLACE_CMD} -e \
		"/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_DATA},g" \
		${WRKSRC}/lib/Makefile ${WRKSRC}/runtime/Makefile.unix

post-patch:
	@${LN} -sf ${WRKSRC}/config/Makefile.unix ${WRKSRC}/config/Makefile

do-build-DOCS-on:
	cd ${WRKSRC}/doc && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} \
		tools/transf tools/texquote2 ../docs/index.html
	${RM} ${WRKSRC}/docs/main.haux ${WRKSRC}/docs/main.htoc

pre-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/caml \
		${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/stublibs

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/htmlman
		| ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -

do-test:
	@${ECHO_CMD} "Testing IDL library"
	cd ${WRKSRC}/tests && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} all
		${WRKSRC}/tests/Makefile
	cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} all

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)b/lang/ocaml-camlidl/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1089725420	1	TIMESTAMP = 1728850004
2	SHA256 (camlidl-1.05.tar.gz) = 857ed5bd3b2f99c62813070e1a5b4b6375e837c6815f4ad956baeb6f8c660311	2	SHA256 (xavierleroy-camlidl-1.12-camlidl112_GH0.tar.gz) = d6ab22a363f22798d303df3b0e54ba274f2c3d7ab7a3023fee1c73d8a21970aa
3	SIZE (camlidl-1.05.tar.gz) = 100640	3	SIZE (xavierleroy-camlidl-1.12-camlidl112_GH0.tar.gz) = 182507
4	SHA256 (camlidl-1.05.doc.html.tar.gz) = 00ac7822ec73cb3cb5cb23b5d34879436366d979887eb3a312e1adcae8c1c32c
5	SIZE (camlidl-1.05.doc.html.tar.gz) = 45945

Added Link Here

(-)b/lang/ocaml-camlidl/files/patch-compiler_Makefile (+11 lines)
1	--- compiler/Makefile.orig 2024-10-13 20:49:37 UTC
2	+++ compiler/Makefile
3	@@ -82,7 +82,7 @@ install:
4
5	# Install
6	install:
7	- cp $(PROG) $(BINDIR)
8	+ $(BSD_INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(BINDIR)
9
10	# Clean up
11	clean::

Added Link Here

(-)b/lang/ocaml-camlidl/files/patch-doc_Makefile (+8 lines)
1	--- doc/Makefile.orig 2024-10-13 21:03:28 UTC
2	+++ doc/Makefile
3	@@ -16,4 +16,4 @@ $(TRANSF) $(TEXQUOTE):
4	$(TRANSF) < manual.etex \| $(TEXQUOTE) > manual.tex
5
6	$(TRANSF) $(TEXQUOTE):
7	- make -C tools
8	+ $(MAKE) -C tools




--- lib/Makefile.orig	2024-10-13 20:49:49 UTC
+++ lib/Makefile
@@ -40,10 +40,10 @@ installbyt:
 	$(OCAMLOPT) -a -o $(NATIVELIB) -cclib -lcamlidl $(NATIVEOBJS)
 
 installbyt:
-	cp -p $(INTERFACES) $(BYTELIB) $(OCAMLLIB)
+	$(BSD_INSTALL_DATA) -p $(INTERFACES) $(BYTELIB) $(DESTDIR)$(OCAMLLIB)
 
 installopt:
-	cp -p $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(OCAMLLIB)
+	$(BSD_INSTALL_DATA) $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(DESTDIR)$(OCAMLLIB)
 
 .SUFFIXES: .mli .ml .cmi .cmo .cmx
 




--- runtime/Makefile.unix.orig	2024-10-13 21:00:18 UTC
+++ runtime/Makefile.unix
@@ -26,10 +26,10 @@ install:
 #	$(RANLIB) $@
 
 install:
-	cp camlidlruntime.h $(OCAMLLIB)/caml/camlidlruntime.h
-	cp libcamlidl.a $(OCAMLLIB)/libcamlidl.a
-	cp dllcamlidl.so $(OCAMLLIB)/stublibs/dllcamlidl.so
-	cd $(OCAMLLIB); $(RANLIB) libcamlidl.a
+	$(BSD_INSTALL_DATA) camlidlruntime.h $(DESTDIR)$(OCAMLLIB)/caml/camlidlruntime.h
+	$(BSD_INSTALL_DATA) libcamlidl.a $(DESTDIR)$(OCAMLLIB)/libcamlidl.a
+	$(BSD_INSTALL_LIB) dllcamlidl.so $(DESTDIR)$(OCAMLLIB)/stublibs/dllcamlidl.so
+	cd $(DESTDIR)$(OCAMLLIB); $(RANLIB) libcamlidl.a
 
 clean:
 	rm -f *.a *.o *.so




lib/ocaml/com.cmi
lib/ocaml/com.cmxa
lib/ocaml/libcamlidl.a
lib/ocaml/stublibs/dllcamlidl.so
%%PORTDOCS%%%%DOCSDIR%%/htmlman/contents_motif.svg
%%PORTDOCS%%%%DOCSDIR%%/htmlman/index.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/main.css
%%PORTDOCS%%%%DOCSDIR%%/htmlman/main.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/main001.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/main002.html

%%PORTDOCS%%%%DOCSDIR%%/htmlman/main004.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/main005.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/main006.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/next_motif.svg
%%PORTDOCS%%%%DOCSDIR%%/htmlman/previous_motif.svg
%%PORTDOCS%%%%DOCSDIR%%/htmlman/previous_motif.gif
- 

Return to bug 282068

Lines 1-12 Link Here

(-)b/lang/ocaml-camlidl/Makefile (-38 / +20 lines)
1	PORTNAME= camlidl	1	PORTNAME= camlidl
2	PORTVERSION= 1.05	2	PORTVERSION= 1.12
3	PORTREVISION= 3
4	CATEGORIES= lang	3	CATEGORIES= lang
5	MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/
6	PKGNAMEPREFIX= ocaml-	4	PKGNAMEPREFIX= ocaml-
7	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
8	${PORTNAME}-${PORTVERSION}.doc.html.tar.gz
9	EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
10		5
11	MAINTAINER= kennedy.greg@gmail.com	6	MAINTAINER= kennedy.greg@gmail.com
12	COMMENT= Stub code generator for using C/C++ libraries from OCaml	7	COMMENT= Stub code generator for using C/C++ libraries from OCaml
Lines 16-65 LICENSE= LGPL20 LGPL21 Link Here
16	LICENSE_COMB= dual	11	LICENSE_COMB= dual
17	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
18		13
		14	USES= gmake
19	USE_OCAML= yes	15	USE_OCAML= yes
		16	USE_GITHUB= yes
		17	GH_ACCOUNT= xavierleroy
		18	GH_TAGNAME= ${PORTNAME}${DISTVERSION:S/.//}
20		19
21	MAKE_JOBS_UNSAFE= yes	20	MAKE_JOBS_UNSAFE= yes
22		21
23	DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}	22	DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}
24		23
25	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= DOCS
26		25	DOCS_BUILD_DEPENDS= hevea>=0:textproc/hevea
27	.include <bsd.port.pre.mk>
28
29	.if ${OPSYS} == FreeBSD
30	CFLAGS+= -Wno-error=int-conversion
31	.endif
32
33	post-extract:
34	@${REINPLACE_CMD} -e "s,^\(OCAMLLIB=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml,g" \
35	-e "s,^\(BINDIR=\).*,\1${STAGEDIR}${PREFIX}/bin,g" \
36	-e "s,^CFLAGS=.*,#\&,g" \
37	-e "s,^\(CPP=\).*,\1/usr/bin/cpp,g" \
38	${WRKSRC}/config/Makefile.unix
39
40	@${REINPLACE_CMD} -e \
41	"/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_SCRIPT},g" \
42	-e 's,$$(OCAMLC),& -warn-error -a,' \
43	${WRKSRC}/compiler/Makefile
44
45	@${REINPLACE_CMD} -e \
46	"/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_DATA},g" \
47	${WRKSRC}/lib/Makefile ${WRKSRC}/runtime/Makefile.unix
48		26
		27	post-patch:
49	@${LN} -sf ${WRKSRC}/config/Makefile.unix ${WRKSRC}/config/Makefile	28	@${LN} -sf ${WRKSRC}/config/Makefile.unix ${WRKSRC}/config/Makefile
50		29
		30	do-build-DOCS-on:
		31	cd ${WRKSRC}/doc && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} \
		32	tools/transf tools/texquote2 ../docs/index.html
		33	${RM} ${WRKSRC}/docs/main.haux ${WRKSRC}/docs/main.htoc
		34
51	pre-install:	35	pre-install:
52	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/caml	36	@${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/caml \
		37	${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/stublibs
53		38
54	post-install-DOCS-on:	39	post-install-DOCS-on:
55	@${MKDIR} ${STAGEDIR}${DOCSDIR}	40	@${MKDIR} ${STAGEDIR}${DOCSDIR}
56	${GZCAT} ${_DISTDIR}/${PORTNAME}-${PORTVERSION}.doc.html.tar.gz \	41	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/htmlman
57	\| ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
58		42
59	test:	43	do-test:
60	@${ECHO_CMD} "Testing IDL library"	44	@${ECHO_CMD} "Testing IDL library"
61	@${REINPLACE_CMD} -e "s,^\(CCPP=\).*,\1${CXX},g" \	45	cd ${WRKSRC}/tests && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} all
62	${WRKSRC}/tests/Makefile
63	cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} all
64		46
65	.include <bsd.port.post.mk>	47	.include <bsd.port.mk>

Added Link Here

(-)b/lang/ocaml-camlidl/files/patch-lib_Makefile (+15 lines)
1	--- lib/Makefile.orig 2024-10-13 20:49:49 UTC
2	+++ lib/Makefile
3	@@ -40,10 +40,10 @@ installbyt:
4	$(OCAMLOPT) -a -o $(NATIVELIB) -cclib -lcamlidl $(NATIVEOBJS)
5
6	installbyt:
7	- cp -p $(INTERFACES) $(BYTELIB) $(OCAMLLIB)
8	+ $(BSD_INSTALL_DATA) -p $(INTERFACES) $(BYTELIB) $(DESTDIR)$(OCAMLLIB)
9
10	installopt:
11	- cp -p $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(OCAMLLIB)
12	+ $(BSD_INSTALL_DATA) $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(DESTDIR)$(OCAMLLIB)
13
14	.SUFFIXES: .mli .ml .cmi .cmo .cmx
15

Added Link Here

(-)b/lang/ocaml-camlidl/files/patch-runtime_Makefile.unix (+17 lines)
1	--- runtime/Makefile.unix.orig 2024-10-13 21:00:18 UTC
2	+++ runtime/Makefile.unix
3	@@ -26,10 +26,10 @@ install:
4	# $(RANLIB) $@
5
6	install:
7	- cp camlidlruntime.h $(OCAMLLIB)/caml/camlidlruntime.h
8	- cp libcamlidl.a $(OCAMLLIB)/libcamlidl.a
9	- cp dllcamlidl.so $(OCAMLLIB)/stublibs/dllcamlidl.so
10	- cd $(OCAMLLIB); $(RANLIB) libcamlidl.a
11	+ $(BSD_INSTALL_DATA) camlidlruntime.h $(DESTDIR)$(OCAMLLIB)/caml/camlidlruntime.h
12	+ $(BSD_INSTALL_DATA) libcamlidl.a $(DESTDIR)$(OCAMLLIB)/libcamlidl.a
13	+ $(BSD_INSTALL_LIB) dllcamlidl.so $(DESTDIR)$(OCAMLLIB)/stublibs/dllcamlidl.so
14	+ cd $(DESTDIR)$(OCAMLLIB); $(RANLIB) libcamlidl.a
15
16	clean:
17	rm -f .a .o *.so

Lines 5-12 lib/ocaml/com.cma Link Here

(-)b/lang/ocaml-camlidl/pkg-plist (-5 / +5 lines)
5	lib/ocaml/com.cmi	5	lib/ocaml/com.cmi
6	lib/ocaml/com.cmxa	6	lib/ocaml/com.cmxa
7	lib/ocaml/libcamlidl.a	7	lib/ocaml/libcamlidl.a
8	%%PORTDOCS%%%%DOCSDIR%%/htmlman/contents_motif.gif	8	lib/ocaml/stublibs/dllcamlidl.so
		9	%%PORTDOCS%%%%DOCSDIR%%/htmlman/contents_motif.svg
9	%%PORTDOCS%%%%DOCSDIR%%/htmlman/index.html	10	%%PORTDOCS%%%%DOCSDIR%%/htmlman/index.html
		11	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main.css
10	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main.html	12	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main.html
11	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main001.html	13	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main001.html
12	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main002.html	14	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main002.html
Lines 14-19 lib/ocaml/libcamlidl.a Link Here
14	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main004.html	16	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main004.html
15	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main005.html	17	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main005.html
16	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main006.html	18	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main006.html
17	%%PORTDOCS%%%%DOCSDIR%%/htmlman/main007.html	19	%%PORTDOCS%%%%DOCSDIR%%/htmlman/next_motif.svg
18	%%PORTDOCS%%%%DOCSDIR%%/htmlman/next_motif.gif	20	%%PORTDOCS%%%%DOCSDIR%%/htmlman/previous_motif.svg
19	%%PORTDOCS%%%%DOCSDIR%%/htmlman/previous_motif.gif
20	-