Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -16295,3 +16295,4 @@ devel/gearmand-devel||2021-04-20|Unmaintained, abandoned, has not built for over half a year textproc/bsdsort||2021-04-21|Old version of sort(1) www/py-django-mezzanine||2021-04-23|Depends on expired www/py-django111, not compatible with newer versions of Django +devel/rabbitmq-c-devel|devel/rabbitmq-c-|2021-04-23|Expired, use devel/rabbitmq-c which has regular versioned updates Index: dns/zone2json/Makefile =================================================================== --- dns/zone2json/Makefile +++ dns/zone2json/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= zone2json -DISTVERSION= 0.0.2 +DISTVERSION= 0.0.3 CATEGORIES= dns MAINTAINER= dch@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libldns.a:dns/ldns \ - ${LOCALBASE}/lib/librabbitmq.a:net/rabbitmq-c-devel \ + ${LOCALBASE}/lib/librabbitmq.a:net/rabbitmq-c \ ${LOCALBASE}/bin/zig:lang/zig-devel USES= ssl Index: net-mgmt/pmacct/Makefile =================================================================== --- net-mgmt/pmacct/Makefile +++ net-mgmt/pmacct/Makefile @@ -2,6 +2,7 @@ PORTNAME= pmacct DISTVERSION= 1.7.5 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.pmacct.net/ @@ -48,7 +49,7 @@ PLABEL_CONFIGURE_ENABLE= plabel DEBUG_CONFIGURE_ENABLE= debug -RABBITMQ_VARS= LIB_DEPENDS+=librabbitmq.so:net/rabbitmq-c-devel +RABBITMQ_VARS= LIB_DEPENDS+=librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= rabbitmq REDIS_VARS= LIB_DEPENDS+=libhiredis.so:databases/hiredis Index: net/Makefile =================================================================== --- net/Makefile +++ net/Makefile @@ -1147,7 +1147,6 @@ SUBDIR += rabbiteer SUBDIR += rabbitmq SUBDIR += rabbitmq-c - SUBDIR += rabbitmq-c-devel SUBDIR += radcli SUBDIR += raddump SUBDIR += radiator Index: net/ceph14/Makefile =================================================================== --- net/ceph14/Makefile +++ net/ceph14/Makefile @@ -3,7 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 14.2.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net PKGNAMESUFFIX= 14 Index: net/pecl-amqp/Makefile =================================================================== --- net/pecl-amqp/Makefile +++ net/pecl-amqp/Makefile @@ -2,6 +2,7 @@ PORTNAME= amqp PORTVERSION= 1.9.4 +PORTREVISION= 1 CATEGORIES= net pear MAINTAINER= jnlin@freebsd.cs.nctu.edu.tw @@ -10,7 +11,7 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c-devel +LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c USES= php:pecl IGNORE_WITH_PHP= 74 80 Index: net/rabbitmq-c-devel/Makefile =================================================================== --- net/rabbitmq-c-devel/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Created by: Geoff Garside - -PORTNAME= rabbitmq-c -PORTVERSION= 0.10.0 -DISTVERSIONPREFIX= v -CATEGORIES= net -PKGNAMESUFFIX= -devel - -MAINTAINER= dch@FreeBSD.org -COMMENT= RabbitMQ C AMQP client library - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE-MIT - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} - -CONFLICTS= rabbitmq-c-[0-9]* - -USES= cmake pathfix python ssl -USE_GITHUB= yes -USE_LDCONFIG= yes -GH_ACCOUNT= alanxz - -OPTIONS_DEFINE= POPT -OPTIONS_SUB= yes -POPT_DESC= Popt support in tools -POPT_LIB_DEPENDS= libpopt.so:devel/popt - -.include Index: net/rabbitmq-c-devel/distinfo =================================================================== --- net/rabbitmq-c-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1607644490 -SHA256 (alanxz-rabbitmq-c-v0.10.0_GH0.tar.gz) = 6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0 -SIZE (alanxz-rabbitmq-c-v0.10.0_GH0.tar.gz) = 145361 Index: net/rabbitmq-c-devel/files/patch-librabbitmq_amqp__tcp__socket.c =================================================================== --- net/rabbitmq-c-devel/files/patch-librabbitmq_amqp__tcp__socket.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 - Index: net/rabbitmq-c-devel/pkg-descr =================================================================== --- net/rabbitmq-c-devel/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -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. - -WWW: https://github.com/alanxz/rabbitmq-c -WWW: http://www.rabbitmq.com/ -WWW: http://www.amqp.org/ Index: net/rabbitmq-c-devel/pkg-plist =================================================================== --- net/rabbitmq-c-devel/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -%%POPT%%bin/amqp-consume -%%POPT%%bin/amqp-declare-queue -%%POPT%%bin/amqp-delete-queue -%%POPT%%bin/amqp-get -%%POPT%%bin/amqp-publish -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.4 -lib/librabbitmq.so.4.4.0 -libdata/pkgconfig/librabbitmq.pc Index: net/rabbitmq-c/Makefile =================================================================== --- net/rabbitmq-c/Makefile +++ net/rabbitmq-c/Makefile @@ -1,7 +1,7 @@ # Created by: Geoff Garside PORTNAME= rabbitmq-c -PORTVERSION= 0.8.0 +PORTVERSION= 0.11.0 DISTVERSIONPREFIX= v CATEGORIES= net @@ -13,8 +13,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} -CONFLICTS= rabbitmq-c-devel-[0-9]* - USES= cmake pathfix python tar:bzip2 USE_GITHUB= yes USE_LDCONFIG= yes Index: net/rabbitmq-c/distinfo =================================================================== --- net/rabbitmq-c/distinfo +++ net/rabbitmq-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510178940 -SHA256 (alanxz-rabbitmq-c-v0.8.0_GH0.tar.gz) = d8ed9dcb49903d83d79d7b227da35ef68c60e5e0b08d0fc1fb4e4dc577b8802b -SIZE (alanxz-rabbitmq-c-v0.8.0_GH0.tar.gz) = 149150 +TIMESTAMP = 1619172823 +SHA256 (alanxz-rabbitmq-c-v0.10.0_GH0.tar.gz) = 6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0 +SIZE (alanxz-rabbitmq-c-v0.10.0_GH0.tar.gz) = 145361