Import of pkgsrc-2015Q3

net/rabbitmq/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2015/06/09 12:41:08 fhajny Exp $
+$NetBSD: distinfo,v 1.22 2015/08/26 01:17:11 fhajny Exp $
 
-SHA1 (rabbitmq-server-3.5.3.tar.gz) = 8ef8d9a92c9bc452dd1992c30c9ee7b68808c704
-RMD160 (rabbitmq-server-3.5.3.tar.gz) = 49ceedfcb010d4138f07628844934494b485bdb7
-Size (rabbitmq-server-3.5.3.tar.gz) = 3727143 bytes
-SHA1 (patch-aa) = 16a822321caacb0e4588791ec4dc1e909d0be4de
+SHA1 (rabbitmq-server-3.5.4.tar.gz) = 896f22cf200b03a6be1d6fa54a49841dbc6c395a
+RMD160 (rabbitmq-server-3.5.4.tar.gz) = 4e1cf0ca1889673c56872a6dfaf9e688899d1eda
+Size (rabbitmq-server-3.5.4.tar.gz) = 3730770 bytes
+SHA1 (patch-aa) = 615aa7cb9775655ca5b3aaa392d51fbf1ab7083e
 SHA1 (patch-plugins-src_do-package.mk) = c1f4a6422a9cb7bac4e1d6bdb671a87a16f73764

net/rabbitmq/patches/patch-aa

@@ -1,28 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2012/03/22 11:58:58 fhajny Exp $
+$NetBSD: patch-aa,v 1.7 2015/08/26 01:17:11 fhajny Exp $
 
 Support for Python 2.7, drop dependency on gsed.
---- Makefile.orig	2011-12-16 12:24:15.000000000 +0000
+--- Makefile.orig	2015-07-21 19:37:21.000000000 +0000
 +++ Makefile
 @@ -1,3 +1,4 @@
 +SHELL=$(MAKE_SHELL)
  TMPDIR ?= /tmp
  
  RABBITMQ_NODENAME ?= rabbit
-@@ -26,6 +27,9 @@ QC_TRIALS ?= 100
- ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes)
- PYTHON=python
- else
-+ifeq ($(shell python2.7 -c 'import simplejson' 2>/dev/null && echo yes),yes)
-+PYTHON=python2.7
-+else
- ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes)
- PYTHON=python2.6
- else
-@@ -37,6 +41,7 @@ PYTHON=python
- endif
- endif
- endif
-+endif
- 
- BASIC_PLT=basic.plt
- RABBIT_PLT=rabbit.plt

net/rabbitmq/version.mk

@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.20 2015/06/09 12:41:08 fhajny Exp $
+# $NetBSD: version.mk,v 1.21 2015/08/26 01:17:11 fhajny Exp $
 #
 
-RMQ_VERSION=	3.5.3
+RMQ_VERSION=	3.5.4