ports/155171: [maintainer update] ocaml-cryptokit improvements

[Jaap Boender]

>Number:         155171
>Category:       ports
>Synopsis:       [maintainer update] ocaml-cryptokit improvements
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 01 21:20:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jaap Boender
>Release:        8.2-STABLE
>Organization:
>Environment:
FreeBSD joffre.kerguelen.org 8.2-STABLE FreeBSD 8.2-STABLE #2: Fri Feb 25 13:50:05 CET 2011     root at joffre.kerguelen.org:/usr/obj/usr/src/sys/JOFFRE  amd64
>Description:
This patch, submitted by Michael Le Barbier Grunewald <michael.le.barbier at hcm.uni-bonn.de>, solves two problems with the ocaml-cryptokit port:

- installing of libraries in ${OCAML_SITELIBDIR)/stublibs, which is not searched;
- creation of an install directory before the privilege switch.
>How-To-Repeat:
n/a
>Fix:
patch included.

Patch attached with submission follows:

diff --git a/ocaml-cryptokit/Makefile b/ocaml-cryptokit/Makefile
index 4134727..7a37a6a 100644
--- a/ocaml-cryptokit/Makefile
+++ b/ocaml-cryptokit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cryptokit
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
@@ -43,8 +43,6 @@ pre-install:
 	@${REINPLACE_CMD} -E -e \
 		's|cp |${INSTALL_DATA} |' \
 		${WRKSRC}/Makefile
-# create installation dir
-	@${MKDIR} ${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/stublibs
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/ocaml-cryptokit/files/patch-Makefile b/ocaml-cryptokit/files/patch-Makefile
new file mode 100644
index 0000000..c7268e6
--- /dev/null
+++ b/ocaml-cryptokit/files/patch-Makefile
@@ -0,0 +1,14 @@
+--- 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
diff --git a/ocaml-cryptokit/pkg-plist b/ocaml-cryptokit/pkg-plist
index 6771c91..3ed9b01 100644
--- a/ocaml-cryptokit/pkg-plist
+++ b/ocaml-cryptokit/pkg-plist
@@ -6,7 +6,6 @@
 %%OCAML_SITELIBDIR%%/cryptokit/cryptokit.cmxa
 %%OCAML_SITELIBDIR%%/cryptokit/cryptokit.mli
 %%OCAML_SITELIBDIR%%/cryptokit/libcryptokit.a
-%%OCAML_SITELIBDIR%%/cryptokit/stublibs/dllcryptokit.so
- at dirrmtry %%OCAML_SITELIBDIR%%/cryptokit/stublibs
+%%OCAML_SITELIBDIR%%/cryptokit/dllcryptokit.so
 @dirrmtry %%OCAML_SITELIBDIR%%/cryptokit
 @dirrmtry %%OCAML_SITELIBDIR%%

>Release-Note:
>Audit-Trail:
>Unformatted: