On Wed Sep 30, 2015 at 07:54:52AM +0100, Stuart Henderson wrote:
> On 2015/09/30 09:47, Rafael Sadowski wrote:
> > -WANTLIB += crypto json-c lzma m pthread ssl xml2 z
> > +WANTLIB += crypto json-c lzma m pthread ssl xml2 z iconv
> ...
> > MODULES= converters/libiconv
>
> That WANTLIB entry should come from the libiconv module
>
> > BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
> > ${MODGNU_AUTOMAKE_DEPENDS} \
> > devel/libtool
> > -# XXX Depends on libtool macros
>
> Please leave that comment in (you can get ridvof the XXX from it
> if you like) so somebody looking at it later knows the libtool
> BUILD_DEPENDS isn't a mistake.
Thank you Stuart for your review and comments, there is a new diff
with your input.
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/droplet/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 23 Sep 2015 10:33:50 -0000 1.11
+++ Makefile 1 Oct 2015 05:58:26 -0000
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.11 2015/09/23 10:33:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2015/04/21 18:51:24 sthen Exp $
SHARED_ONLY= Yes
CATEGORIES= devel
COMMENT= high performance Cloud Storage client library
-VERSION= 1.1
-REVISION= 3
+VERSION= 2.0
DISTNAME= droplet-${VERSION}
-HOMEPAGE= https://github.com/scality/Droplet
+GH_ACCOUNT = scality
+GH_PROJECT = Droplet
+GH_COMMIT = 22e7e46214a26c36a2314ef0c23ee42c861ec6bd
-SHARED_LIBS= droplet 0.0 #0.0
+SHARED_LIBS= droplet 1.0 #0.0
MAINTAINER= Rafael Sadowski <raf...@sizeofvoid.org>
@@ -19,9 +20,6 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += crypto json-c lzma m pthread ssl xml2 z
-MASTER_SITES= http://www.sizeofvoid.org/pub/OpenBSD/distfiles/
-
-WRKDIST= ${WRKDIR}/scality-Droplet-e6692cc
MODULES= converters/libiconv
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
@@ -38,7 +36,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}
LDFLAGS="-L${LOCALBASE}/lib"
post-patch:
cd ${WRKBUILD} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- /bin/sh ./autogen.sh
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/droplet/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:13:10 -0000 1.2
+++ distinfo 1 Oct 2015 05:58:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (droplet-1.1.tar.gz) = Jd2ZGZaQlIIEzWfciWefzWwFxF2mF3ngErhSaGI2fy4=
-SIZE (droplet-1.1.tar.gz) = 90046
+SHA256 (droplet-2.0.tar.gz) = jX83xjzGj4y3h77oZoVsSXMF+n4BDi67mY7HIKCmRFg=
+SIZE (droplet-2.0.tar.gz) = 92128
Index: patches/patch-libdroplet_srest_replyparser_c
===================================================================
RCS file: patches/patch-libdroplet_srest_replyparser_c
diff -N patches/patch-libdroplet_srest_replyparser_c
--- patches/patch-libdroplet_srest_replyparser_c 22 Apr 2014 10:48:21
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libdroplet_srest_replyparser_c,v 1.1 2014/04/22 10:48:21 jca
Exp $
---- libdroplet/srest/replyparser.c.orig Mon Apr 21 18:20:17 2014
-+++ libdroplet/srest/replyparser.c Mon Apr 21 18:20:22 2014
-@@ -32,7 +32,7 @@
- * https://github.com/scality/Droplet
- */
- #include "dropletp.h"
--#include <json/json.h>
-+#include <json-c/json.h>
-
- //#define DPRINTF(fmt,...) fprintf(stderr, fmt, ##__VA_ARGS__)
- #define DPRINTF(fmt,...)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/droplet/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 23 Dec 2011 13:10:30 -0000 1.1.1.1
+++ pkg/PLIST 1 Oct 2015 05:58:26 -0000
@@ -25,16 +25,12 @@ include/droplet-1.0/droplet/s3/replypars
include/droplet-1.0/droplet/s3/reqbuilder.h
include/droplet-1.0/droplet/s3/s3.h
include/droplet-1.0/droplet/sbuf.h
-include/droplet-1.0/droplet/srest/
-include/droplet-1.0/droplet/srest/backend.h
-include/droplet-1.0/droplet/srest/replyparser.h
-include/droplet-1.0/droplet/srest/reqbuilder.h
-include/droplet-1.0/droplet/srest/srest.h
include/droplet-1.0/droplet/srws/
include/droplet-1.0/droplet/srws/backend.h
include/droplet-1.0/droplet/srws/replyparser.h
include/droplet-1.0/droplet/srws/reqbuilder.h
include/droplet-1.0/droplet/srws/srws.h
+include/droplet-1.0/droplet/sysmd.h
include/droplet-1.0/droplet/utils.h
include/droplet-1.0/droplet/vec.h
include/droplet-1.0/droplet/vfs.h
