From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 19 15:00:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E4375EF for ; Tue, 19 Nov 2013 15:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3B29325C0 for ; Tue, 19 Nov 2013 15:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rAJF01gT031475 for ; Tue, 19 Nov 2013 15:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAJF01aI031474; Tue, 19 Nov 2013 15:00:01 GMT (envelope-from gnats) Resent-Date: Tue, 19 Nov 2013 15:00:01 GMT Resent-Message-Id: <201311191500.rAJF01aI031474@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mathieu Arnold Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D490E532 for ; Tue, 19 Nov 2013 14:57:57 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 61100259B for ; Tue, 19 Nov 2013 14:57:55 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 81528BDC24 for ; Tue, 19 Nov 2013 15:57:51 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 57A92BDC30 for ; Tue, 19 Nov 2013 15:57:51 +0100 (CET) Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225]) by gw.in.absolight.net (Postfix) with ESMTP id 9EF9E60DA for ; Tue, 19 Nov 2013 15:57:50 +0100 (CET) Received: by aragorn.in.absolight.net (Postfix, from userid 1000) id 0EB8814269C; Tue, 19 Nov 2013 15:57:49 +0100 (CET) Message-Id: <20131119145750.0EB8814269C@aragorn.in.absolight.net> Date: Tue, 19 Nov 2013 15:57:49 +0100 (CET) From: Mathieu Arnold To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/184087: [PATCH] databases/postgresql-plruby: Work on postgresql > 8.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Nov 2013 15:00:01 -0000 >Number: 184087 >Category: ports >Synopsis: [PATCH] databases/postgresql-plruby: Work on postgresql > 8.4 >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: Tue Nov 19 15:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Mathieu Arnold >Release: FreeBSD 9.2-RELEASE i386 >Organization: Absolight >Environment: System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC >Description: Make the port work on postgresql > 8.4. Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- postgresql-plruby-0.5.4_2.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 334322) +++ Makefile (working copy) @@ -1,28 +1,27 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ -PORTNAME= plruby +PORTNAME= postgresql-plruby PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases ruby -MASTER_SITES= RF/${PORTNAME} \ - ftp://ftp.iDaemons.org/pub/distfiles/ -PKGNAMEPREFIX= postgresql- DIST_SUBDIR= ruby -PATCHFILES= df2c4d39cdda35e1cb842106b22aaa10df2760e6.diff -PATCH_SITES= http://github.com/knu/postgresql-plruby/commit/ -PATCH_DIST_STRIP= -p1 - MAINTAINER= knu@FreeBSD.org COMMENT= PL/Ruby procedural language for the PostgreSQL database system +USE_GITHUB= yes +GH_ACCOUNT= CraigCottingham +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= f8d9ced + +USES= uidfix USE_BZIP2= yes USE_PGSQL= server -WANT_PGSQL_VER= 84- USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_RUBY_RDOC= yes +NEED_ROOT= yes POSTGRESQL_PORT?= databases/postgresql${PGSQL_VER}-server PGSQL_PORTDIR?= ${PORTSDIR}/${POSTGRESQL_PORT} @@ -39,8 +38,7 @@ PKGMESSAGE= ${WRKDIR}/createlang.sql -NO_STAGE= yes -pre-patch: +post-patch: cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch post-build: @@ -52,19 +50,18 @@ .include +.if !defined(NOPORTDOCS) post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${RUBY_MODEXAMPLESDIR}/ - ${INSTALL_DATA} ${WRKDIR}/createlang.sql ${RUBY_MODEXAMPLESDIR}/ - ${MKDIR} ${RUBY_MODDOCDIR} - (cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs/doc ${RUBY_MODDOCDIR}/ README.en && ${INSTALL_DATA} ${DOCS} ${RUBY_MODDOCDIR}/) - @${FIND} -ds ${RUBY_MODDOCDIR} -type f -print | ${SED} -E -e \ + @${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ + ${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ + @${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR} + cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs/doc ${STAGEDIR}${RUBY_MODDOCDIR}/ README.en && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/ + ${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type f -print | ${SED} -E -e \ 's,^${PREFIX}/?,,' >> ${TMPPLIST} - @${FIND} -ds ${RUBY_MODDOCDIR} -type d -print | ${SED} -E -e \ + ${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type d -print | ${SED} -E -e \ 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/share/doc/ruby19/ 2>/dev/null || true" \ + ${ECHO_CMD} "@unexec rmdir %D/share/doc/ruby19/ 2>/dev/null || true" \ >> ${TMPPLIST} .endif - @${CAT} ${PKGMESSAGE} .include Index: distinfo =================================================================== --- distinfo (revision 334322) +++ distinfo (working copy) @@ -1,4 +1,2 @@ -SHA256 (ruby/plruby-0.5.4.tar.bz2) = 8ba24ea19d9e365dc8b32f28e7c287e0dfe993fc865d4ba392acf96947f03bc2 -SIZE (ruby/plruby-0.5.4.tar.bz2) = 96126 -SHA256 (ruby/df2c4d39cdda35e1cb842106b22aaa10df2760e6.diff) = 90a081b4dfd45a4793a1b97a1aef8554acf83afbefae674581703df0c43d0e2a -SIZE (ruby/df2c4d39cdda35e1cb842106b22aaa10df2760e6.diff) = 261 +SHA256 (ruby/postgresql-plruby-0.5.4.tar.bz2) = 0d28a2450690f836ae9a810c476a29b1175fb51444e7a2a34c46016b04d6c86f +SIZE (ruby/postgresql-plruby-0.5.4.tar.bz2) = 125753 Index: files/patch-bitand-bitor =================================================================== --- files/patch-bitand-bitor (revision 334322) +++ files/patch-bitand-bitor (working copy) @@ -1,16 +0,0 @@ ---- src/conversions/bitstring/plruby_bitstring.c.orig 2011-09-12 10:59:01.000000000 +0200 -+++ src/conversions/bitstring/plruby_bitstring.c 2011-09-12 11:01:31.000000000 +0200 -@@ -195,8 +195,13 @@ - } - - BIT_OPERATOR(pl_bit_add, bitcat); -+#if PG_PL_VERSION >= 91 -+BIT_OPERATOR(pl_bit_and, bit_and); -+BIT_OPERATOR(pl_bit_or, bit_or); -+#else - BIT_OPERATOR(pl_bit_and, bitand); - BIT_OPERATOR(pl_bit_or, bitor); -+#endif - BIT_OPERATOR(pl_bit_xor, bitxor); - - static VALUE Index: files/patch-src__plruby.h =================================================================== --- files/patch-src__plruby.h (revision 0) +++ files/patch-src__plruby.h (working copy) @@ -0,0 +1,21 @@ +--- ./src/plruby.h.orig 2012-12-23 14:51:17.000000000 +0100 ++++ ./src/plruby.h 2013-11-19 15:29:16.000000000 +0100 +@@ -7,6 +7,7 @@ + #include "executor/executor.h" + #include "commands/trigger.h" + #include "utils/elog.h" ++#include "utils/rel.h" + #include "utils/builtins.h" + #include "fmgr.h" + #include "access/heapam.h" +@@ -35,6 +36,10 @@ + #include "utils/memutils.h" + #endif + ++#if PG_PL_VERSION >= 93 ++#include "access/htup_details.h" ++#endif ++ + #include "package.h" + + #include Property changes on: files/patch-src__plruby.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property --- postgresql-plruby-0.5.4_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: