Attachment 138194 Details for Bug 184087 – postgresql-plruby-0.5.4_2.patch

[patch] postgresql-plruby-0.5.4_2.patch

postgresql-plruby-0.5.4_2.patch (text/plain), 4.89 KB, created by Mathieu Arnold on 2013-11-19 15:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2013-11-19 15:00:00 UTC

Size: 4.89 KB

patch

obsolete

>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-fetch:
> 	cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch
> 
> post-build:
>@@ -53,18 +51,17 @@
> .include <bsd.port.pre.mk>
> 
> post-install:
>+	@${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
>+	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
> .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 \
>-		's,^${PREFIX}/?,,' >> ${TMPPLIST}
>-	@${FIND} -ds ${RUBY_MODDOCDIR} -type d -print | ${SED} -E -e \
>-		's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
>-	@${ECHO_CMD} "@unexec rmdir %D/share/doc/ruby19/ 2>/dev/null || true" \
>+	@${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
>+	cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs/doc ${STAGEDIR}${RUBY_MODDOCDIR}/ README.markdown && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/
>+	${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type f -print | ${SED} -E -e \
>+		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
>+	${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type d -print | ${SED} -E -e \
>+		's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
>+	${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: 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
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 184087: 138194