From nobody@FreeBSD.org  Tue Jan 31 09:41:38 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B7291065670
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jan 2012 09:41:38 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 761168FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jan 2012 09:41:38 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0V9fbY0008680
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jan 2012 09:41:37 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q0V9fboh008679;
	Tue, 31 Jan 2012 09:41:37 GMT
	(envelope-from nobody)
Message-Id: <201201310941.q0V9fboh008679@red.freebsd.org>
Date: Tue, 31 Jan 2012 09:41:37 GMT
From: Jaap Boender <Jaap.Boender@pps.jussieu.fr>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] security/ocaml-cryptokit to version 1.5
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         164661
>Category:       ports
>Synopsis:       [maintainer update] security/ocaml-cryptokit to version 1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 31 09:50:11 UTC 2012
>Closed-Date:    Wed Feb 01 20:06:50 UTC 2012
>Last-Modified:  Wed Feb  1 20:10:08 UTC 2012
>Originator:     Jaap Boender
>Release:        9.0-STABLE
>Organization:
>Environment:
FreeBSD marion-dufresne.cs.unibo.it 9.0-STABLE FreeBSD 9.0-STABLE #1: Wed Jan 18 18:19:02 CET 2012     root@marion-dufresne.cs.unibo.it:/usr/obj/usr/src/sys/MARION-DUFRESNE  amd64
>Description:
This is an update of ocaml-cryptokit to its newest version, 1.5. Changes from 1.3 include:
- support for oasis and findlib
- added blowfish and MAC support
- bugfixes

I've also changed my (i.e. the maintainer's) e-mail address.
>How-To-Repeat:
n/a
>Fix:
patch included. Note: the files directory and pkg-plist are no longer necessary; files/META is now included in the distribution, the patch to the Makefile no longer applies and the plist is generated automatically by findlib.

Patch attached with submission follows:

diff -Naur ocaml-cryptokit/Makefile /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/Makefile
--- ocaml-cryptokit/Makefile	2011-04-06 00:23:32.000000000 +0200
+++ /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/Makefile	2012-01-30 15:34:51.983259085 +0100
@@ -6,56 +6,30 @@
 #
 
 PORTNAME=	cryptokit
-PORTVERSION=	1.3
-PORTREVISION=	4
+PORTVERSION=	1.5
 CATEGORIES=	security
-MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/639/
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	Jaap.Boender@pps.jussieu.fr
+MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	A variety of cryptographic primitives for Objective Caml
 
+HAS_CONFIGURE=	yes
+
 USE_OCAML=	yes
 USE_OCAML_LDCONFIG=	yes
+USE_OCAML_FINDLIB=	yes
+USE_OCAMLFIND_PLIST=	yes
 MAKE_JOBS_SAFE=	yes
 
-ALL_TARGET=	all allopt
-
 .ifndef(NOPORTDOCS)
 ALL_TARGET+=	doc
+CONFIGURE_ARGS+=	--docdir ${PREFIX}/share/doc/ocaml
 
 PORTDOCS=	*
 .endif
 
 DOC_FILES=	Changes LICENSE README
+DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 
-post-configure:
-# CFLAGS,PREFIX safeness
-	@${REINPLACE_CMD} -E -e \
-		's|^(INSTALLDIR).*$$|\1=${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}|; \
-		s|^CFLAGS=|CFLAGS\+=|; \
-		s|(^CFLAGS.*)-O|\1|' \
-		${WRKSRC}/Makefile
-
-pre-install:
-# in pre-install to make sure we're using the correct user:group
-# combo
-	@${REINPLACE_CMD} -E -e \
-		's|cp |${INSTALL_DATA} |' \
-		${WRKSRC}/Makefile
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/doc
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/doc
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-	@${INSTALL_DATA} ${FILESDIR}/META ${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}
-
-.include <bsd.port.pre.mk>
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Naur ocaml-cryptokit/distinfo /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/distinfo
--- ocaml-cryptokit/distinfo	2011-03-02 07:26:38.000000000 +0100
+++ /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/distinfo	2012-01-30 15:18:13.739259356 +0100
@@ -1,2 +1,2 @@
-SHA256 (cryptokit-1.3.tar.gz) = 9ef339ed4cb15f0c458d0093b90dd249d8d1dfb1b01a1fedc542e67f67a7194f
-SIZE (cryptokit-1.3.tar.gz) = 112689
+SHA256 (cryptokit-1.5.tar.gz) = e2483a463ea57eee99c1e9c5aed1c34885255e47f0d4d872bb2bb3a8975eb3e4
+SIZE (cryptokit-1.5.tar.gz) = 128907
diff -Naur ocaml-cryptokit/files/META /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/files/META
--- ocaml-cryptokit/files/META	2008-12-18 07:54:41.000000000 +0100
+++ /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/files/META	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-name="cryptokit"
-version="1.3"
-description="A variety of cryptographic primitives for Objective Caml"
-requires="unix,num"
-archive(byte)="cryptokit.cma"
-archive(native)="cryptokit.cmxa"
diff -Naur ocaml-cryptokit/files/patch-Makefile /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/files/patch-Makefile
--- ocaml-cryptokit/files/patch-Makefile	2011-03-02 07:26:38.000000000 +0100
+++ /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
---- Makefile.orig	2011-03-02 06:09:16.000000000 +0000
-+++ Makefile	2011-03-02 06:10:20.000000000 +0000
-@@ -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 -Naur ocaml-cryptokit/pkg-plist /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/pkg-plist
--- ocaml-cryptokit/pkg-plist	2011-03-02 07:26:38.000000000 +0100
+++ /home/boender/progs/ocaml-freebsd/security/ocaml-cryptokit/pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-%%OCAML_SITELIBDIR%%/cryptokit/META
-%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.a
-%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.cma
-%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.cmi
-%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.cmx
-%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.cmxa
-%%OCAML_SITELIBDIR%%/cryptokit/cryptokit.mli
-%%OCAML_SITELIBDIR%%/cryptokit/libcryptokit.a
-%%OCAML_SITELIBDIR%%/cryptokit/dllcryptokit.so
-@dirrmtry %%OCAML_SITELIBDIR%%/cryptokit
-@dirrmtry %%OCAML_SITELIBDIR%%


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Tue Jan 31 14:48:23 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164661 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Wed Feb 1 20:06:49 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164661 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164661: commit references a PR
Date: Wed,  1 Feb 2012 20:06:39 +0000 (UTC)

 jgh         2012-02-01 20:06:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/ocaml-cryptokit Makefile distinfo 
   Removed files:
     security/ocaml-cryptokit pkg-plist 
     security/ocaml-cryptokit/files META patch-Makefile 
   Log:
   - Update to 1.5
   - support for oasis and findlib
   - added blowfish and MAC support along with bugfixes
   - plist is removed in favor of generation via findlib
   - remove META from FILESDIR, as it is now distributed
   - maintainer address update
   
   PR:     ports/164661
   Submitted by: maintainer, Jaap.Boender at pps.jussieu.fr
   Approved by:    crees (mentor)
   
   Revision  Changes    Path
   1.14      +10 -36    ports/security/ocaml-cryptokit/Makefile
   1.7       +2 -2      ports/security/ocaml-cryptokit/distinfo
   1.2       +0 -6      ports/security/ocaml-cryptokit/files/META (dead)
   1.2       +0 -14     ports/security/ocaml-cryptokit/files/patch-Makefile (dead)
   1.7       +0 -11     ports/security/ocaml-cryptokit/pkg-plist (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
