Attachment #113599 for bug #155171

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

Lines 7-13 Link Here

(-)b/ocaml-cryptokit/Makefile (-3 / +1 lines)
7		7
8	PORTNAME= cryptokit	8	PORTNAME= cryptokit
9	PORTVERSION= 1.3	9	PORTVERSION= 1.3
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/	12	MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/
13	PKGNAMEPREFIX= ocaml-	13	PKGNAMEPREFIX= ocaml-
Lines 43-50 pre-install: Link Here
43	@${REINPLACE_CMD} -E -e \	43	@${REINPLACE_CMD} -E -e \
44	's\|cp \|${INSTALL_DATA} \|' \	44	's\|cp \|${INSTALL_DATA} \|' \
45	${WRKSRC}/Makefile	45	${WRKSRC}/Makefile
46	# create installation dir
47	@${MKDIR} ${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/stublibs
48		46
49	post-install:	47	post-install:
50	.ifndef(NOPORTDOCS)	48	.ifndef(NOPORTDOCS)




--- Makefile.orig	2005-04-20 15:19:54.000000000 +0200
+++ Makefile	2011-02-20 21:54:49.000000000 +0100
@@ -74,9 +74,10 @@
 	rm -f speedtest
 
 install:
+	install -d $(INSTALLDIR)
 	cp cryptokit.cmi cryptokit.cma cryptokit.mli $(INSTALLDIR)
 	cp libcryptokit.a $(INSTALLDIR)
-	if test -f dllcryptokit.so; then cp dllcryptokit.so $(INSTALLDIR)/stublibs; fi
+	if test -f dllcryptokit.so; then cp dllcryptokit.so $(INSTALLDIR); fi
 	if test -f cryptokit.cmxa; then cp cryptokit.cmxa cryptokit.cmx cryptokit.a $(INSTALLDIR); fi
 
 doc: FORCE

Lines 6-12 Link Here

(-)b/ocaml-cryptokit/pkg-plist (-2 / +1 lines)
6	%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.cmxa	6	%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.cmxa
7	%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.mli	7	%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.mli
8	%%OCAML_SITELIBDIR%%/cryptokit/libcryptokit.a	8	%%OCAML_SITELIBDIR%%/cryptokit/libcryptokit.a
9	%%OCAML_SITELIBDIR%%/cryptokit/stublibs/dllcryptokit.so	9	%%OCAML_SITELIBDIR%%/cryptokit/dllcryptokit.so
10	@dirrmtry %%OCAML_SITELIBDIR%%/cryptokit/stublibs
11	@dirrmtry %%OCAML_SITELIBDIR%%/cryptokit	10	@dirrmtry %%OCAML_SITELIBDIR%%/cryptokit
12	@dirrmtry %%OCAML_SITELIBDIR%%	11	@dirrmtry %%OCAML_SITELIBDIR%%

Return to bug 155171

Added Link Here

(-)b/ocaml-cryptokit/files/patch-Makefile (+14 lines)
1	--- Makefile.orig 2005-04-20 15:19:54.000000000 +0200
2	+++ Makefile 2011-02-20 21:54:49.000000000 +0100
3	@@ -74,9 +74,10 @@
4	rm -f speedtest
5
6	install:
7	+ install -d $(INSTALLDIR)
8	cp cryptokit.cmi cryptokit.cma cryptokit.mli $(INSTALLDIR)
9	cp libcryptokit.a $(INSTALLDIR)
10	- if test -f dllcryptokit.so; then cp dllcryptokit.so $(INSTALLDIR)/stublibs; fi
11	+ if test -f dllcryptokit.so; then cp dllcryptokit.so $(INSTALLDIR); fi
12	if test -f cryptokit.cmxa; then cp cryptokit.cmxa cryptokit.cmx cryptokit.a $(INSTALLDIR); fi
13
14	doc: FORCE