Index: head/net/rabbitmq-c/Makefile =================================================================== --- head/net/rabbitmq-c/Makefile (revision 454898) +++ head/net/rabbitmq-c/Makefile (revision 454899) @@ -1,58 +1,32 @@ # Created by: Geoff Garside # $FreeBSD$ PORTNAME= rabbitmq-c -PORTVERSION= 0.0.1 -PORTREVISION= 2 +PORTVERSION= 0.8.0 +DISTVERSIONPREFIX= v CATEGORIES= net -MASTER_SITES= http://hg.rabbitmq.com/rabbitmq-c/archive/:c \ - http://hg.rabbitmq.com/rabbitmq-codegen/archive/:codegen -DISTNAME= ${PORTNAME}-4e789c776a45 -DISTFILES= 4e789c776a45.tar.bz2:c \ - 821f5ee7b040.tar.bz2:codegen -DIST_SUBDIR= rabbitmq +PKGNAMESUFFIX= -devel -MAINTAINER= rabbitmq@geoffgarside.co.uk +MAINTAINER= freebsd@geoffgarside.co.uk COMMENT= RabbitMQ C AMQP client library -LICENSE= GPLv2 MPL11 -LICENSE_COMB= dual +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE-MIT -BUILD_DEPENDS= python:lang/python \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson -CONFLICTS= rabbitmq-c-devel-[0-9]* +CONFLICTS= rabbitmq-c-[0-9]* -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= autoreconf gmake libtool python tar:bzip2 +USES= cmake pathfix python tar:bzip2 +USE_GITHUB= yes USE_LDCONFIG= yes +GH_ACCOUNT= alanxz -OPTIONS_DEFINE= 64BIT POPT -64BIT_DESC= Produce 64-bit library +OPTIONS_DEFINE= POPT +OPTIONS_SUB= yes POPT_DESC= Popt support in tools - -.include - -.if ${PORT_OPTIONS:M64BIT} -ONLY_FOR_ARCHS= amd64 sparc64 powerpc -ONLY_FOR_ARCHS_REASON= 64BIT option is set -CONFIGURE_ARGS+= --enable-64-bit -.endif - -.if ${PORT_OPTIONS:MPOPT} -LIB_DEPENDS+= libpopt.so:devel/popt -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -PLIST_SUB+= POPT='' -CONFIGURE_ARGS+= --with-popt -.else -PLIST_SUB+= POPT='@comment ' -CONFIGURE_ARGS+= --without-popt -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|rabbitmq-codegen|rabbitmq-codegen-821f5ee7b040|g' ${WRKSRC}/configure.ac +POPT_LIB_DEPENDS= libpopt.so:devel/popt +POPT_CFLAGS= -I${LOCALBASE}/include +POPT_LDFLAGS= -L${LOCALBASE}/lib .include Index: head/net/rabbitmq-c/distinfo =================================================================== --- head/net/rabbitmq-c/distinfo (revision 454898) +++ head/net/rabbitmq-c/distinfo (revision 454899) @@ -1,4 +1,3 @@ -SHA256 (rabbitmq/4e789c776a45.tar.bz2) = 63a8ea4bebfbd57ab7caa3cb302e8d506ef16c19c7c9bb0b3995bc7af7b10e56 -SIZE (rabbitmq/4e789c776a45.tar.bz2) = 47462 -SHA256 (rabbitmq/821f5ee7b040.tar.bz2) = 6bfa3d30a4ccbc8ab930db695c8f4ecdc1282070e5bacc533acda79ba844500a -SIZE (rabbitmq/821f5ee7b040.tar.bz2) = 13248 +TIMESTAMP = 1510178940 +SHA256 (alanxz-rabbitmq-c-v0.8.0_GH0.tar.gz) = d8ed9dcb49903d83d79d7b227da35ef68c60e5e0b08d0fc1fb4e4dc577b8802b +SIZE (alanxz-rabbitmq-c-v0.8.0_GH0.tar.gz) = 149150 Index: head/net/rabbitmq-c/files/patch-configure.ac =================================================================== --- head/net/rabbitmq-c/files/patch-configure.ac (revision 454898) +++ head/net/rabbitmq-c/files/patch-configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- ./configure.ac.orig 2010-06-01 13:14:11.154116974 +0200 -+++ ./configure.ac 2010-06-01 13:14:11.263184468 +0200 -@@ -14,6 +14,8 @@ - dnl Header-file checks - AC_HEADER_STDC - -+AC_CHECK_HEADERS([spawn.h]) -+ - dnl Only use -Wall if we have gcc - if test "x$GCC" = "xyes"; then - if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then Property changes on: head/net/rabbitmq-c/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/rabbitmq-c/files/patch-tools_common.c =================================================================== --- head/net/rabbitmq-c/files/patch-tools_common.c (revision 454898) +++ head/net/rabbitmq-c/files/patch-tools_common.c (nonexistent) @@ -1,57 +0,0 @@ ---- ./tools/common.c.orig 2010-03-31 03:28:20.000000000 +0200 -+++ ./tools/common.c 2010-06-01 13:26:57.576932723 +0200 -@@ -58,7 +58,9 @@ - #include - #include - #include -+#ifdef HAVE_SPAWN_H - #include -+#endif - #include - - #include -@@ -327,6 +329,7 @@ - } - } - -+#ifdef HAVE_SPAWN_H - void pipeline(const char * const *argv, struct pipeline *pl) - { - posix_spawn_file_actions_t file_acts; -@@ -356,6 +359,36 @@ - - pl->infd = pipefds[1]; - } -+#else -+void pipeline(const char * const *argv, struct pipeline *pl) -+{ -+ int pipefds[2]; -+ if (pipe(pipefds)) -+ die_errno(errno, "pipe"); -+ -+ pl->pid = fork(); -+ -+ if (pl->pid == -1) -+ die_errno(errno, "fork: %s", argv[0]); -+ else -+ if (pl->pid == 0) { -+ if (dup2(pipefds[0], 0)) -+ die_errno(errno, "dup2()"); -+ if (close(pipefds[0])) -+ die_errno(errno, "close()"); -+ if (close(pipefds[1])) -+ die_errno(errno, "close()"); -+ execvp(argv[0], argv); -+ die_errno(errno, "execvp()"); -+ } -+ else { -+ if (close(pipefds[0])) -+ die_errno(errno, "close"); -+ } -+ -+ pl->infd = pipefds[1]; -+} -+#endif - - int finish_pipeline(struct pipeline *pl) - { Property changes on: head/net/rabbitmq-c/files/patch-tools_common.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/rabbitmq-c/files/patch-librabbitmq_amqp__tcp__socket.c =================================================================== --- head/net/rabbitmq-c/files/patch-librabbitmq_amqp__tcp__socket.c (nonexistent) +++ head/net/rabbitmq-c/files/patch-librabbitmq_amqp__tcp__socket.c (revision 454899) @@ -0,0 +1,12 @@ +--- librabbitmq/amqp_tcp_socket.c.orig 2015-06-17 07:41:33 UTC ++++ librabbitmq/amqp_tcp_socket.c +@@ -32,6 +32,9 @@ + #ifndef _WIN32 + # include + #endif ++#include ++#include ++#include + #include + #include + Property changes on: head/net/rabbitmq-c/files/patch-librabbitmq_amqp__tcp__socket.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/rabbitmq-c/pkg-descr =================================================================== --- head/net/rabbitmq-c/pkg-descr (revision 454898) +++ head/net/rabbitmq-c/pkg-descr (revision 454899) @@ -1,9 +1,7 @@ This is a C-language AMQP client library for use with AMQP servers speaking protocol versions 0-8 and 0-9-1. This port only speaks the -0-8 protocol version, for 0-9-1 use net/rabbitmq-c-devel. +0-9-1 protocol version, for 0-8 use net/rabbitmq-c. - - - - - - - -WWW: http://hg.rabbitmq.com/rabbitmq-c +WWW: https://github.com/alanxz/rabbitmq-c +WWW: http://www.rabbitmq.com/ +WWW: http://www.amqp.org/ Index: head/net/rabbitmq-c/pkg-plist =================================================================== --- head/net/rabbitmq-c/pkg-plist (revision 454898) +++ head/net/rabbitmq-c/pkg-plist (revision 454899) @@ -1,17 +1,14 @@ %%POPT%%bin/amqp-consume +%%POPT%%bin/amqp-declare-queue +%%POPT%%bin/amqp-delete-queue %%POPT%%bin/amqp-get %%POPT%%bin/amqp-publish -bin/amqp_bind -bin/amqp_consumer -bin/amqp_exchange_declare -bin/amqp_listen -bin/amqp_listenq -bin/amqp_producer -bin/amqp_sendstring -bin/amqp_unbind include/amqp.h include/amqp_framing.h +include/amqp_ssl_socket.h +include/amqp_tcp_socket.h lib/librabbitmq.a lib/librabbitmq.so -lib/librabbitmq.so.0 -lib/librabbitmq.so.0.0.0 +lib/librabbitmq.so.4 +lib/librabbitmq.so.4.2.0 +libdata/pkgconfig/librabbitmq.pc