net/rabbitmq-c-devel: 0.0.1 -> 0.5.1

https://github.com/alanxz/rabbitmq-c/blob/master/ChangeLog.md

PR:		186690
Submitted by:	landsidel.allen@gmail.com
Approved by:	portmgr blanket (staging)

5 files changed, 32 insertions, 44 deletions

diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index 54abe0830160..f3168360e60d 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -2,41 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq-c
-PORTVERSION=	0.0.1
-PORTREVISION=	2
+PORTVERSION=	0.5.1
 CATEGORIES=	net
-MASTER_SITES=	http://hg.rabbitmq.com/rabbitmq-c/archive/:c \
-		http://hg.rabbitmq.com/rabbitmq-codegen/archive/:codegen
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-cbeb2f3c3e6d
-DISTFILES=	cbeb2f3c3e6d.tar.bz2:c \
-		df43f2bfcf0e.tar.bz2:codegen
-DIST_SUBDIR=	rabbitmq
 
 MAINTAINER=	rabbitmq@geoffgarside.co.uk
 COMMENT=	RabbitMQ C AMQP client library
 
-LICENSE=		GPLv2 MPL
-LICENSE_COMB=		dual
+LICENSE=	GPLv2 MPL
+LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson
 
 CONFLICTS=	rabbitmq-c-[0-9]*
 
-USES=		gmake tar:bzip2
-USE_PYTHON=	yes
+USES=		cmake tar:bzip2 libtool python
+USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal autoconf automake autoheader libtool
-AUTOMAKE_ARGS=	-i --add-missing
-ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
+GH_ACCOUNT=	alanxz
+GH_COMMIT=	e554ca7
+GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONS_DEFINE=	64BIT POPT
 64BIT_DESC=	Produce 64-bit library
 POPT_DESC=	Popt support in tools
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:M64BIT}
@@ -49,12 +40,9 @@ CONFIGURE_ARGS+=	--enable-64-bit
 LIB_DEPENDS+=	libpopt.so:${PORTSDIR}/devel/popt
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-PLIST_SUB+=		POPT=''
-CONFIGURE_ARGS+=	--with-popt
+PLIST_SUB+=	POPT=""
 .else
-PLIST_SUB+=		POPT='@comment '
-CONFIGURE_ARGS+=	--without-popt
+PLIST_SUB+=	POPT="@comment "
 .endif
 
 post-patch:
@@ -63,7 +51,8 @@ post-patch:
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE})
 
-post-install:
-	${STRIP_CMD} ${PREFIX}/lib/librabbitmq.so.0
+post-stage:
+	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/librabbitmq.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/librabbitmq.pc
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
 
 .include <bsd.port.mk>
diff --git a/net/rabbitmq-c-devel/distinfo b/net/rabbitmq-c-devel/distinfo
index 506bb92ad9ca..2b12e42c8b42 100644
--- a/net/rabbitmq-c-devel/distinfo
+++ b/net/rabbitmq-c-devel/distinfo
@@ -1,4 +1,2 @@
-SHA256 (rabbitmq/cbeb2f3c3e6d.tar.bz2) = dcb7a8dd92b9323f4e343c2a0f0553da6a1cfa3a20d935df3e3d15c595d34669
-SIZE (rabbitmq/cbeb2f3c3e6d.tar.bz2) = 62277
-SHA256 (rabbitmq/df43f2bfcf0e.tar.bz2) = 535285def95c97ca6d697c4070a15042af35688cef1049c77c6ed64b78e972af
-SIZE (rabbitmq/df43f2bfcf0e.tar.bz2) = 17370
+SHA256 (rabbitmq-c-0.5.1.tar.bz2) = 23480c6fd9cc409d4974d850453b980b9038f9bed5c9bd68a85f160b66017544
+SIZE (rabbitmq-c-0.5.1.tar.bz2) = 142062
diff --git a/net/rabbitmq-c-devel/files/patch-configure.ac b/net/rabbitmq-c-devel/files/patch-configure.ac
index 02554fcb99fe..439e0c56ee9b 100644
--- a/net/rabbitmq-c-devel/files/patch-configure.ac
+++ b/net/rabbitmq-c-devel/files/patch-configure.ac
@@ -1,10 +1,11 @@
---- configure.ac.orig	2011-09-06 09:43:42.000000000 +0100
-+++ configure.ac	2011-11-17 15:12:38.567082237 +0000
-@@ -14,6 +14,7 @@
- 
- dnl Header-file checks
- AC_HEADER_STDC
+--- configure.ac.orig  2014-02-12 13:50:04.000000000 +0000
++++ configure.ac       2014-02-12 13:51:38.000000000 +0000
+@@ -39,6 +39,7 @@
+ # Environment setup
+ AC_CANONICAL_HOST
+ AC_C_INLINE
 +AC_CHECK_HEADERS([spawn.h])
  
- if test "x$GCC" = "xyes"; then
-   dnl Only use -Wall if we have gcc
+ # Set compiler flags
+ AX_TRY_CFLAGS([-Wall], [AX_CFLAGS([-Wall])])
+
diff --git a/net/rabbitmq-c-devel/pkg-descr b/net/rabbitmq-c-devel/pkg-descr
index f16c7751ac7b..b1a392c816ad 100644
--- a/net/rabbitmq-c-devel/pkg-descr
+++ b/net/rabbitmq-c-devel/pkg-descr
@@ -2,8 +2,6 @@ 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-9-1 protocol version, for 0-8 use net/rabbitmq-c.
 
- - <http://www.rabbitmq.com/>
- - <http://www.amqp.org/>
- - <http://hg.rabbitmq.com/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/
diff --git a/net/rabbitmq-c-devel/pkg-plist b/net/rabbitmq-c-devel/pkg-plist
index 7759f5118f56..048e3f5385f0 100644
--- a/net/rabbitmq-c-devel/pkg-plist
+++ b/net/rabbitmq-c-devel/pkg-plist
@@ -5,7 +5,9 @@
 %%POPT%%bin/amqp-publish
 include/amqp.h
 include/amqp_framing.h
-lib/librabbitmq.a
-lib/librabbitmq.la
+include/amqp_ssl_socket.h
+include/amqp_tcp_socket.h
 lib/librabbitmq.so
-lib/librabbitmq.so.0
+lib/librabbitmq.so.1
+lib/librabbitmq.so.1.2.1
+libdata/pkgconfig/librabbitmq.pc