Date: Mon, 19 Sep 2011 17:51:45 +0800 (CST) From: Jui-Nan Lin <jnlin@csie.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rabbitmq@geoffgarside.co.uk Subject: ports/160824: [PATCH] net/rabbitmq-c-devel: Upgrade to changeset cbeb2f3c3e6d Message-ID: <20110919095145.1ECF88A00D@Florence.tamama.org> Resent-Message-ID: <201109191010.p8JAAAHD016698@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160824 >Category: ports >Synopsis: [PATCH] net/rabbitmq-c-devel: Upgrade to changeset cbeb2f3c3e6d >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Sep 19 10:10:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jui-Nan Lin >Release: FreeBSD 8.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD Florence.tamama.org 8.2-RELEASE FreeBSD 8.2-RELEASE #12: Fri Feb 25 09:26:52 CST 2011 >Description: [DESCRIBE CHANGES] Removed file(s): - files/patch-configure.ac - files/patch-tools_common.c Port maintainer (rabbitmq@geoffgarside.co.uk) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- rabbitmq-c-devel-0.0.1_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/rabbitmq-c-devel/Makefile /home/users/jnlin/ports/rabbitmq-c-devel/Makefile --- /usr/ports/net/rabbitmq-c-devel/Makefile 2011-09-19 17:24:58.814438279 +0800 +++ /home/users/jnlin/ports/rabbitmq-c-devel/Makefile 2011-09-19 17:44:04.406227097 +0800 @@ -7,14 +7,14 @@ PORTNAME= rabbitmq-c PORTVERSION= 0.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://hg.rabbitmq.com/rabbitmq-c/archive/:c \ http://hg.rabbitmq.com/rabbitmq-codegen/archive/:codegen PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-17b9fb0d63d3 -DISTFILES= 17b9fb0d63d3.tar.bz2:c \ - fc46914f99b7.tar.bz2:codegen +DISTNAME= ${PORTNAME}-cbeb2f3c3e6d +DISTFILES= cbeb2f3c3e6d.tar.bz2:c \ + df43f2bfcf0e.tar.bz2:codegen DIST_SUBDIR= rabbitmq MAINTAINER= rabbitmq@geoffgarside.co.uk @@ -64,7 +64,7 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|rabbitmq-codegen|rabbitmq-codegen-fc46914f99b7|g' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|rabbitmq-codegen|rabbitmq-codegen-df43f2bfcf0e|g' ${WRKSRC}/configure.ac pre-configure: @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE}) diff -ruN --exclude=CVS /usr/ports/net/rabbitmq-c-devel/distinfo /home/users/jnlin/ports/rabbitmq-c-devel/distinfo --- /usr/ports/net/rabbitmq-c-devel/distinfo 2011-09-19 17:25:05.778838764 +0800 +++ /home/users/jnlin/ports/rabbitmq-c-devel/distinfo 2011-09-19 17:44:22.510940315 +0800 @@ -1,4 +1,4 @@ -SHA256 (rabbitmq/17b9fb0d63d3.tar.bz2) = 833147be1a7b92d493debad970620e640a6d3bc65351b2cb829f9ccf2fc047dd -SIZE (rabbitmq/17b9fb0d63d3.tar.bz2) = 47586 -SHA256 (rabbitmq/fc46914f99b7.tar.bz2) = 8182a38d4cee90b6985a051c053a4cb6ae0124323b45850f5c8ba888e63b25e7 -SIZE (rabbitmq/fc46914f99b7.tar.bz2) = 14068 +SHA256 (rabbitmq/cbeb2f3c3e6d.tar.bz2) = de42ec3dfb9a68c8817e2b1065a87b7d03f22f5b8e20baf8324408a3224cb528 +SIZE (rabbitmq/cbeb2f3c3e6d.tar.bz2) = 62299 +SHA256 (rabbitmq/df43f2bfcf0e.tar.bz2) = 96f85c564ddf69c564e62392c61d6f193fca0956fea6baf34ed6e6ef4257e229 +SIZE (rabbitmq/df43f2bfcf0e.tar.bz2) = 17368 diff -ruN --exclude=CVS /usr/ports/net/rabbitmq-c-devel/files/patch-configure.ac /home/users/jnlin/ports/rabbitmq-c-devel/files/patch-configure.ac --- /usr/ports/net/rabbitmq-c-devel/files/patch-configure.ac 2010-06-10 02:21:20.000000000 +0800 +++ /home/users/jnlin/ports/rabbitmq-c-devel/files/patch-configure.ac 1970-01-01 08:00:00.000000000 +0800 @@ -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 diff -ruN --exclude=CVS /usr/ports/net/rabbitmq-c-devel/files/patch-tools_common.c /home/users/jnlin/ports/rabbitmq-c-devel/files/patch-tools_common.c --- /usr/ports/net/rabbitmq-c-devel/files/patch-tools_common.c 2010-06-10 02:21:20.000000000 +0800 +++ /home/users/jnlin/ports/rabbitmq-c-devel/files/patch-tools_common.c 1970-01-01 08:00:00.000000000 +0800 @@ -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 <unistd.h> - #include <fcntl.h> - #include <errno.h> -+#ifdef HAVE_SPAWN_H - #include <spawn.h> -+#endif - #include <sys/wait.h> - - #include <popt.h> -@@ -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) - { diff -ruN --exclude=CVS /usr/ports/net/rabbitmq-c-devel/pkg-plist /home/users/jnlin/ports/rabbitmq-c-devel/pkg-plist --- /usr/ports/net/rabbitmq-c-devel/pkg-plist 2010-06-10 02:21:20.000000000 +0800 +++ /home/users/jnlin/ports/rabbitmq-c-devel/pkg-plist 2011-09-19 17:49:33.197741713 +0800 @@ -1,14 +1,8 @@ %%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 lib/librabbitmq.a --- rabbitmq-c-devel-0.0.1_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110919095145.1ECF88A00D>