From nobody@FreeBSD.org  Tue Feb 12 13:23:34 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 1F974E3C
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Feb 2013 13:23:34 +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 EC906EC5
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Feb 2013 13:23:33 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r1CDNXXU053560
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 12 Feb 2013 13:23:33 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r1CDNX5i053559;
	Tue, 12 Feb 2013 13:23:33 GMT
	(envelope-from nobody)
Message-Id: <201302121323.r1CDNX5i053559@red.freebsd.org>
Date: Tue, 12 Feb 2013 13:23:33 GMT
From: Jaap Boender <jaapb@kerguelen.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] databases/ocaml-sqlite3 to 2.0.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         176067
>Category:       ports
>Synopsis:       [maintainer update] databases/ocaml-sqlite3 to 2.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 12 13:30:00 UTC 2013
>Closed-Date:    Thu Mar 27 01:16:54 UTC 2014
>Last-Modified:  Thu Mar 27 01:20:01 UTC 2014
>Originator:     Jaap Boender
>Release:        9.1-RELEASE
>Organization:
>Environment:
FreeBSD purcell.mdx.ac.uk 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10 UTC 2012     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
This is an update of databases/ocaml-sqlite3 to 2.0.4. Changes include a new build system and a change in distribution method, as well as bugfixes and some small extensions. It also fixes a build failure on my system.



>How-To-Repeat:
n/a
>Fix:
svn diff of port directory included.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 311755)
+++ Makefile	(working copy)
@@ -6,47 +6,30 @@
 #
 
 PORTNAME=	sqlite3
-PORTVERSION=	1.6.1
+PORTVERSION=	2.0.4
 CATEGORIES=	databases
-MASTER_SITES=	http://hg.ocaml.info/release/${PKGNAMEPREFIX}${PORTNAME}/archive/
+MASTER_SITES=	http://cdn.bitbucket.org/mmottl/sqlite3-ocaml/downloads/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	release-${PORTVERSION}
+DISTNAME=	${PORTNAME}-ocaml-${PORTVERSION}
 
 MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	OCaml bindings to sqlite3 library
 
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-release-${PORTVERSION}
-
-USE_AUTOTOOLS=		autoconf
-USE_GMAKE=		yes
 USE_SQLITE=		yes
 USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAMLFIND_PLIST=	yes
 MAKE_JOBS_UNSAFE=	yes
+CONFIGURE_ARGS=		--disable-docs # doesn't install anything anyway
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	CC="${CC}"\
-		CFLAGS="${CFLAGS}"\
-		CPPFLAGS="-UHAVE_ALLOCA_H -I${PREFIX}/include"\
-		LDFLAGS="-L${PREFIX}/lib"\
-		LIBS="${PTHREAD_LIBS}"
+do-configure:
+	@cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS}
 
-USE_BZIP2=	yes
+do-build:
+	@cd ${WRKSRC} && ocaml setup.ml -build
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-PORTDOCS=	style.css *.html
+do-install:
+	@cd ${WRKSRC} && ocaml setup.ml -install
 
-PLIST_FILES=	bin/sqlite3top
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@( cd ${WRKSRC}/doc;\
-	   for f in `${FIND} . -type f -print`; do\
-		${INSTALL_DATA} $${f} ${DOCSDIR};\
-	   done )
-.endif
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 311755)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (release-1.6.1.tar.bz2) = 9d5ed422de61497436475329c3a9956870cfb8d0a272f764a9e57faff7ebea9f
-SIZE (release-1.6.1.tar.bz2) = 54462
+SHA256 (sqlite3-ocaml-2.0.4.tar.gz) = 51ccb4c7a240eb40652c59e1770cfe1827dfa1eb926c969d19ff414aef4e80a1
+SIZE (sqlite3-ocaml-2.0.4.tar.gz) = 60665


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Feb 14 08:16:50 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176067 
Responsible-Changed-From-To: miwi->bf 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Mar 28 06:19:20 UTC 2013 
Responsible-Changed-Why:  
pass over to bf, he is dealing with the big ocaml update. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176067 
Responsible-Changed-From-To: bf->marino 
Responsible-Changed-By: marino 
Responsible-Changed-When: Wed Mar 26 18:14:25 UTC 2014 
Responsible-Changed-Why:  
Hi Jaap! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176067 
State-Changed-From-To: open->closed 
State-Changed-By: marino 
State-Changed-When: Thu Mar 27 01:16:53 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176067: commit references a PR
Date: Thu, 27 Mar 2014 01:14:33 +0000 (UTC)

 Author: marino
 Date: Thu Mar 27 01:14:25 2014
 New Revision: 349313
 URL: http://svnweb.freebsd.org/changeset/ports/349313
 QAT: https://qat.redports.org/buildarchive/r349313/
 
 Log:
   databases/ocaml-sqlite3: Upgrade from 1.6.1 -> 2.0.4 and stage
   
   The referenced PR was implemented, and then augmented with stage
   support from pkgsrc.  The unique license was also documented.
   
   PR:		ports/176067
   Submitted by:	maintainer (Jaap Boender)
   Stage support:	Taken from pkgsrc
 
 Added:
   head/databases/ocaml-sqlite3/files/patch-lib_sqlite3_stubs.c   (contents, props changed)
 Deleted:
   head/databases/ocaml-sqlite3/files/patch-configure.ac
 Modified:
   head/databases/ocaml-sqlite3/Makefile
   head/databases/ocaml-sqlite3/distinfo
 
 Modified: head/databases/ocaml-sqlite3/Makefile
 ==============================================================================
 --- head/databases/ocaml-sqlite3/Makefile	Thu Mar 27 01:03:59 2014	(r349312)
 +++ head/databases/ocaml-sqlite3/Makefile	Thu Mar 27 01:14:25 2014	(r349313)
 @@ -2,48 +2,42 @@
  # $FreeBSD$
  
  PORTNAME=	sqlite3
 -PORTVERSION=	1.6.1
 +PORTVERSION=	2.0.4
  CATEGORIES=	databases
 -MASTER_SITES=	http://hg.ocaml.info/release/${PKGNAMEPREFIX}${PORTNAME}/archive/
 +MASTER_SITES=	http://cdn.bitbucket.org/mmottl/sqlite3-ocaml/downloads/
  PKGNAMEPREFIX=	ocaml-
 -DISTNAME=	release-${PORTVERSION}
 +DISTNAME=	${PORTNAME}-ocaml-${PORTVERSION}
  
  MAINTAINER=	jaapb@kerguelen.org
  COMMENT=	OCaml bindings to sqlite3 library
  
 -WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-release-${PORTVERSION}
 +LICENSE=	OCSQLT3
 +LICENSE_NAME=	OCaml-SQLite3 unique permissive license
 +LICENSE_FILE=	${WRKSRC}/COPYING.txt
 +LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
  
 -USE_AUTOTOOLS=		autoconf
 -USE_GMAKE=		yes
 +USES=			gmake pkgconfig
  USE_SQLITE=		yes
  USE_OCAML=		yes
  USE_OCAML_FINDLIB=	yes
  USE_OCAML_LDCONFIG=	yes
  USE_OCAMLFIND_PLIST=	yes
 +HAS_CONFIGURE=		yes
  MAKE_JOBS_UNSAFE=	yes
 +CONFIGURE_ARGS=		--destdir "${STAGEDIR}" \
 +			--prefix "${PREFIX}"
  
 -GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	CC="${CC}"\
 -		CFLAGS="${CFLAGS}"\
 -		CPPFLAGS="-UHAVE_ALLOCA_H -I${PREFIX}/include"\
 -		LDFLAGS="-L${PREFIX}/lib"\
 -		LIBS="${PTHREAD_LIBS}"
 -
 -USE_BZIP2=	yes
 -
 -DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 -PORTDOCS=	style.css *.html
 -
 -PLIST_FILES=	bin/sqlite3top
 -
 -NO_STAGE=	yes
 -post-install:
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -	@( cd ${WRKSRC}/doc;\
 -	   for f in `${FIND} . -type f -print`; do\
 -		${INSTALL_DATA} $${f} ${DOCSDIR};\
 -	   done )
 -.endif
 +post-patch:
 +	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /var/null" :: findlib_name,' \
 +		${WRKSRC}/setup.ml
 +
 +do-configure:
 +	(cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS})
 +
 +do-build:
 +	(cd ${WRKSRC} && ocaml setup.ml -build)
 +
 +do-install:
 +	(cd ${WRKSRC} && ocaml setup.ml -install)
  
  .include <bsd.port.mk>
 
 Modified: head/databases/ocaml-sqlite3/distinfo
 ==============================================================================
 --- head/databases/ocaml-sqlite3/distinfo	Thu Mar 27 01:03:59 2014	(r349312)
 +++ head/databases/ocaml-sqlite3/distinfo	Thu Mar 27 01:14:25 2014	(r349313)
 @@ -1,2 +1,2 @@
 -SHA256 (release-1.6.1.tar.bz2) = 9d5ed422de61497436475329c3a9956870cfb8d0a272f764a9e57faff7ebea9f
 -SIZE (release-1.6.1.tar.bz2) = 54462
 +SHA256 (sqlite3-ocaml-2.0.4.tar.gz) = 51ccb4c7a240eb40652c59e1770cfe1827dfa1eb926c969d19ff414aef4e80a1
 +SIZE (sqlite3-ocaml-2.0.4.tar.gz) = 60665
 
 Added: head/databases/ocaml-sqlite3/files/patch-lib_sqlite3_stubs.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/ocaml-sqlite3/files/patch-lib_sqlite3_stubs.c	Thu Mar 27 01:14:25 2014	(r349313)
 @@ -0,0 +1,14 @@
 +$NetBSD: patch-lib_sqlite3_stubs.c,v 1.1 2012/09/16 11:34:46 jaapb Exp $
 +
 +Correct system-dependent defines
 +--- lib/sqlite3_stubs.c.orig	2012-07-20 15:39:49.000000000 +0000
 ++++ lib/sqlite3_stubs.c
 +@@ -40,7 +40,7 @@
 + 
 + #if __GNUC__ >= 3
 + # define inline inline __attribute__ ((always_inline))
 +-# if !defined(__FreeBSD__) && !__APPLE__
 ++# if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly) && !__APPLE__
 + # define __unused __attribute__ ((unused))
 + # endif
 + #else
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
