From 67e82329e9fbcb8ea040fbd94776e17539e42e5f Mon Sep 17 00:00:00 2001 From: fhajny Date: Mon, 13 Jan 2014 12:10:23 +0000 Subject: [PATCH] Fix build/PLIST for gmake<4. Bump PKGREVISION. --- net/rabbitmq/Makefile | 4 ++-- net/rabbitmq/distinfo | 3 ++- .../patches/patch-plugins-src_do-package.mk | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 net/rabbitmq/patches/patch-plugins-src_do-package.mk diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index ab744c448281..b37b2df595e7 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2014/01/08 21:05:46 dholland Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/13 12:10:23 fhajny Exp $ # PKGNAME= rabbitmq-${RMQ_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 DISTNAME= rabbitmq-server-${RMQ_VERSION} CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/ diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo index 226ae1624bb1..be082be066bc 100644 --- a/net/rabbitmq/distinfo +++ b/net/rabbitmq/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2014/01/02 19:07:19 fhajny Exp $ +$NetBSD: distinfo,v 1.14 2014/01/13 12:10:23 fhajny Exp $ SHA1 (rabbitmq-server-3.2.2.tar.gz) = c5de766fa9250a80080140269847416ed45fe053 RMD160 (rabbitmq-server-3.2.2.tar.gz) = 6b59eb2a03e6e64e2938c74d6ba9686879652a0c Size (rabbitmq-server-3.2.2.tar.gz) = 3583974 bytes SHA1 (patch-aa) = 16a822321caacb0e4588791ec4dc1e909d0be4de +SHA1 (patch-plugins-src_do-package.mk) = c1f4a6422a9cb7bac4e1d6bdb671a87a16f73764 diff --git a/net/rabbitmq/patches/patch-plugins-src_do-package.mk b/net/rabbitmq/patches/patch-plugins-src_do-package.mk new file mode 100644 index 000000000000..304a396add34 --- /dev/null +++ b/net/rabbitmq/patches/patch-plugins-src_do-package.mk @@ -0,0 +1,14 @@ +$NetBSD: patch-plugins-src_do-package.mk,v 1.1 2014/01/13 12:10:23 fhajny Exp $ + +Fix module versioning with gmake<4. +--- plugins-src/do-package.mk.orig 2013-12-10 16:18:44.000000000 +0000 ++++ plugins-src/do-package.mk +@@ -545,7 +545,7 @@ $(PACKAGE_DIR)/dist/.done: $(PACKAGE_DIR + # makefile. + $(PACKAGE_DIR)/dist/.done.$(VERSION): $(PACKAGE_DIR)/Makefile $(wildcard $(PACKAGE_DIR)/*.mk) $(wildcard $(PACKAGE_DIR)/src/*.erl) $(wildcard $(PACKAGE_DIR)/include/*.hrl) $(wildcard $(PACKAGE_DIR)/*.py) $(foreach DEP,$(NON_INTEGRATED_DEPS_$(PACKAGE_DIR)),$(call package_to_path,$(DEP))/dist/.done) + rm -rf $$(@D) +- $$(MAKE) -C $(PACKAGE_DIR) ++ $$(MAKE) -C $(PACKAGE_DIR) VERSION=$(VERSION) + mkdir -p $$(@D) + touch $$@ +