On 2013/10/05 18:10, Rafael Sadowski wrote:
> On Fri Oct 04, 2013 at 09:42:28PM +0200, Rafael Sadowski wrote:
> > Hey @ports,
> >
> > following diff update droplet to 2.0.
> >
> > cat pkg/DESCR
> > Scality Droplet is a high perfomance Cloud Storage client library providing
> > a set of high-level features. It is open source and released under the BSD
> > License. Multiple backends are supported: S3 (Simple Storage Service), CDMI
> > (Cloud Data Management Interface), SRWS (Scality Simple Rest Web Service).
> > On-the-fly encryption/decryption and buffered I/O are also supported.
> >
>
> new version after Brad Smith's improvements and Stuart Henderson's
> DISTFILES advice. Nice hint , thanks.
>
> @Brad, many thanks for your cleanup.
>
> cheers, Rafael
I've just spotted that devel/json-c is in both LIB_DEPENDS and BUILD_DEPENDS,
I think this should just be LIB_DEPENDS?
Also could do with spaces->tabs in the DISTFILES line.
Otherwise OK.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/droplet/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 Makefile
> --- Makefile 21 Mar 2013 08:45:14 -0000 1.4
> +++ Makefile 5 Oct 2013 13:57:07 -0000
> @@ -5,29 +5,33 @@ SHARED_ONLY= Yes
> CATEGORIES= devel
> COMMENT= high perfomance Cloud Storage client library
>
> -VERSION= 1.1
> -REVISION= 0
> +VERSION= 2.0
> DISTNAME= droplet-${VERSION}
> HOMEPAGE= https://github.com/scality/Droplet
>
> -SHARED_LIBS= droplet 0.0 #0.0
> +SHARED_LIBS= droplet 1.0 #0.0
>
> MAINTAINER= Rafael Sadowski <raf...@sizeofvoid.org>
>
> # BSD
> PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB= crypto json m pthread ssl xml2 z
> +WANTLIB= crypto json-c m pthread ssl xml2 z
>
> -MASTER_SITES= http://www.sizeofvoid.org/pub/OpenBSD/distfiles/
>
> -WRKDIST= ${WRKDIR}/scality-Droplet-e6692cc
> +DISTFILES= droplet-${VERSION}.tar.gz{v${VERSION}.tar.gz}
> +
> +MASTER_SITES= https://github.com/scality/Droplet/archive/
> +
> +WRKDIST= ${WRKDIR}/Droplet-2.0
> +
> MODULES= converters/libiconv
> +
> +# Depends on libtool macros
> BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
> ${MODGNU_AUTOMAKE_DEPENDS} \
> devel/json-c \
> devel/libtool
> -# XXX Depends on libtool macros
>
> LIB_DEPENDS= textproc/libxml \
> devel/json-c
> @@ -37,8 +41,8 @@ AUTOMAKE_VERSION= 1.11
> CONFIGURE_STYLE= gnu
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
> -post-patch:
> - cd ${WRKBUILD} && env AUTOCONF_VERSION=2.68 AUTOMAKE_VERSION=1.11 \
> - /bin/sh ./autogen.sh
> +pre-configure:
> + cd ${WRKBUILD} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/droplet/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 distinfo
> --- distinfo 23 Dec 2011 13:10:30 -0000 1.1.1.1
> +++ distinfo 5 Oct 2013 13:57:07 -0000
> @@ -1,5 +1,2 @@
> -MD5 (droplet-1.1.tar.gz) = MXOvFlCtwgzMWCNhJT4sjg==
> -RMD160 (droplet-1.1.tar.gz) = oyvhLeTSs4cHrnULg2xh0edYiCE=
> -SHA1 (droplet-1.1.tar.gz) = KPP5ojgYQ88M2xAkCcAH99zhJb0=
> -SHA256 (droplet-1.1.tar.gz) = Jd2ZGZaQlIIEzWfciWefzWwFxF2mF3ngErhSaGI2fy4=
> -SIZE (droplet-1.1.tar.gz) = 90046
> +SHA256 (droplet-2.0.tar.gz) = fNgQ6TbkkCiabLrsMqRdgK0gb5ofvYrSo7lHdSWXp7k=
> +SIZE (droplet-2.0.tar.gz) = 92005
> Index: patches/patch-libdroplet_include_droplet_utils_h
> ===================================================================
> RCS file:
> /cvs/ports/devel/droplet/patches/patch-libdroplet_include_droplet_utils_h,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 patch-libdroplet_include_droplet_utils_h
> --- patches/patch-libdroplet_include_droplet_utils_h 23 Dec 2011 13:10:30
> -0000 1.1.1.1
> +++ patches/patch-libdroplet_include_droplet_utils_h 5 Oct 2013 13:57:07
> -0000
> @@ -1,34 +1,31 @@
> $OpenBSD: patch-libdroplet_include_droplet_utils_h,v 1.1.1.1 2011/12/23
> 13:10:30 jasper Exp $
> ---- libdroplet/include/droplet/utils.h.orig Thu Dec 15 14:47:38 2011
> -+++ libdroplet/include/droplet/utils.h Thu Dec 15 14:48:42 2011
> -@@ -48,6 +48,17 @@
> - # define HAVE_CANONICALIZE_FILE_NAME
> - #endif
> -
> -+/* OpenBSD gcc */
> -+#if defined(__OpenBSD__)
> -+#include <sys/types.h>
> -+#include <sys/uio.h>
> -+#include <unistd.h>
> -+#if _BYTE_ORDER == _LITTLE_ENDIAN
> -+#define __BYTE_ORDER __LITTLE_ENDIAN
> -+#else
> -+#define __BYTE_ORDER __BIG_ENDIAN
> -+#endif
> -+#endif
> -
> - /*
> - * endianness
> -@@ -73,7 +84,7 @@
> +--- libdroplet/include/droplet/utils.h.orig Wed Jul 25 09:13:17 2012
> ++++ libdroplet/include/droplet/utils.h Fri Oct 4 23:46:31 2013
> +@@ -41,6 +41,10 @@
> + # include <sys/filio.h> //FIONBIO
> + # include <strings.h>
> + # include <alloca.h>
> ++#elif defined(__OpenBSD__)
> ++# include <sys/types.h>
> ++# include <sys/uio.h>
> ++# include <unistd.h>
> + #else
> + //linux
> + # define HAVE_DRAND48_R 1
> +@@ -73,6 +77,12 @@
> #define __BYTE_ORDER __BIG_ENDIAN__
> #endif
>
> --#else
> -+#elif !defined(__OpenBSD__)
> ++#elif defined(__OpenBSD__)
> ++# if _BYTE_ORDER == _LITTLE_ENDIAN
> ++# define __BYTE_ORDER __LITTLE_ENDIAN
> ++# else
> ++# define __BYTE_ORDER __BIG_ENDIAN
> ++# endif
> + #else
> // linux case
> # include <endian.h>
> - #endif
> -@@ -86,7 +97,7 @@
> +@@ -86,7 +96,7 @@
> #define le32toh OSSwapLittleToHostInt32
> #define htole32 OSSwapHostToLittleInt32
> #define bswap_32 OSSwapInt32
> Index: patches/patch-libdroplet_src_utils_c
> ===================================================================
> RCS file: /cvs/ports/devel/droplet/patches/patch-libdroplet_src_utils_c,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 patch-libdroplet_src_utils_c
> --- patches/patch-libdroplet_src_utils_c 23 Dec 2011 13:10:30 -0000
> 1.1.1.1
> +++ patches/patch-libdroplet_src_utils_c 5 Oct 2013 13:57:07 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-libdroplet_src_utils_c,v 1.1.1.1 2011/12/23 13:10:30 jasper
> Exp $
> ---- libdroplet/src/utils.c.orig Fri Dec 16 13:57:00 2011
> -+++ libdroplet/src/utils.c Fri Dec 16 13:58:47 2011
> +--- libdroplet/src/utils.c.orig Wed Jul 25 09:13:17 2012
> ++++ libdroplet/src/utils.c Fri Oct 4 23:29:14 2013
> @@ -72,6 +72,14 @@ gettid()
> {
> return syscall(SYS_gettid);
> @@ -16,21 +16,12 @@ $OpenBSD: patch-libdroplet_src_utils_c,v
>
> #else
> #include <syscall.h>
> -@@ -110,6 +118,17 @@ linux_gethostbyname_r(const char *name,
> +@@ -109,7 +117,7 @@ linux_gethostbyname_r(const char *name,
> +
> return 0;
>
> - #elif defined(__APPLE__) && defined(__MACH__) || defined(__ellcc__ )
> -+
> -+ struct hostent *resultp;
> -+
> -+ resultp = gethostbyname(name);
> -+ if (NULL == resultp)
> -+ return 1;
> -+
> -+ *result = resultp;
> -+
> -+ return 0;
> -+#elif defined(__OpenBSD__)
> +-#elif defined(__APPLE__) && defined(__MACH__) || defined(__ellcc__ )
> ++#elif defined(__APPLE__) && defined(__MACH__) || defined(__ellcc__ ) ||
> defined(__OpenBSD__)
>
> struct hostent *resultp;
>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/droplet/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 PLIST
> --- pkg/PLIST 23 Dec 2011 13:10:30 -0000 1.1.1.1
> +++ pkg/PLIST 5 Oct 2013 13:57:07 -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
