Date: Tue, 19 Nov 2013 15:57:49 +0100 (CET) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/184087: [PATCH] databases/postgresql-plruby: Work on postgresql > 8.4 Message-ID: <20131119145750.0EB8814269C@aragorn.in.absolight.net> Resent-Message-ID: <201311191500.rAJF01aI031474@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <knu@idaemons.org>
# $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 <bsd.port.pre.mk>
+.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 <bsd.port.post.mk>
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 <ruby.h>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131119145750.0EB8814269C>