Attachment #138194 for bug #184087

View | Details | Raw Unified | Return to bug 184087
Collapse All | Expand All




# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
# $FreeBSD$

PORTNAME=	postgresql-plruby
PORTVERSION=	0.5.4
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}


PKGMESSAGE=	${WRKDIR}/createlang.sql

post-fetch:
pre-patch:
	cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch

post-build:

.include <bsd.port.pre.mk>

post-install:
	@${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
.if !defined(NOPORTDOCS)
	@${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" \
		's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec rmdir %D/share/doc/ruby19/ 2>/dev/null || true" \
		>> ${TMPPLIST}
.endif
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)distinfo (-4 / +2 lines)
1	SHA256 (ruby/plruby-0.5.4.tar.bz2) = 8ba24ea19d9e365dc8b32f28e7c287e0dfe993fc865d4ba392acf96947f03bc2	1	SHA256 (ruby/postgresql-plruby-0.5.4.tar.bz2) = 0d28a2450690f836ae9a810c476a29b1175fb51444e7a2a34c46016b04d6c86f
2	SIZE (ruby/plruby-0.5.4.tar.bz2) = 96126	2	SIZE (ruby/postgresql-plruby-0.5.4.tar.bz2) = 125753
3	SHA256 (ruby/df2c4d39cdda35e1cb842106b22aaa10df2760e6.diff) = 90a081b4dfd45a4793a1b97a1aef8554acf83afbefae674581703df0c43d0e2a
4	SIZE (ruby/df2c4d39cdda35e1cb842106b22aaa10df2760e6.diff) = 261




--- 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




--- ./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>

Return to bug 184087

Lines 1-28 Link Here

(-)Makefile (-22 / +19 lines)
1	# Created by: Akinori MUSHA aka knu <knu@idaemons.org>	1	# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= plruby	4	PORTNAME= postgresql-plruby
5	PORTVERSION= 0.5.4	5	PORTVERSION= 0.5.4
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= databases ruby	7	CATEGORIES= databases ruby
8	MASTER_SITES= RF/${PORTNAME} \
9	ftp://ftp.iDaemons.org/pub/distfiles/
10	PKGNAMEPREFIX= postgresql-
11	DIST_SUBDIR= ruby	8	DIST_SUBDIR= ruby
12		9
13	PATCHFILES= df2c4d39cdda35e1cb842106b22aaa10df2760e6.diff
14	PATCH_SITES= http://github.com/knu/postgresql-plruby/commit/
15	PATCH_DIST_STRIP= -p1
16
17	MAINTAINER= knu@FreeBSD.org	10	MAINTAINER= knu@FreeBSD.org
18	COMMENT= PL/Ruby procedural language for the PostgreSQL database system	11	COMMENT= PL/Ruby procedural language for the PostgreSQL database system
19		12
		13	USE_GITHUB= yes
		14	GH_ACCOUNT= CraigCottingham
		15	GH_TAGNAME= ${GH_COMMIT}
		16	GH_COMMIT= f8d9ced
		17
		18	USES= uidfix
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	USE_PGSQL= server	20	USE_PGSQL= server
22	WANT_PGSQL_VER= 84-
23	USE_RUBY= yes	21	USE_RUBY= yes
24	USE_RUBY_EXTCONF= yes	22	USE_RUBY_EXTCONF= yes
25	USE_RUBY_RDOC= yes	23	USE_RUBY_RDOC= yes
		24	NEED_ROOT= yes
26		25
27	POSTGRESQL_PORT?= databases/postgresql${PGSQL_VER}-server	26	POSTGRESQL_PORT?= databases/postgresql${PGSQL_VER}-server
28	PGSQL_PORTDIR?= ${PORTSDIR}/${POSTGRESQL_PORT}	27	PGSQL_PORTDIR?= ${PORTSDIR}/${POSTGRESQL_PORT}
Lines 39-46 Link Here
39		38
40	PKGMESSAGE= ${WRKDIR}/createlang.sql	39	PKGMESSAGE= ${WRKDIR}/createlang.sql
41		40
42	NO_STAGE= yes	41	post-fetch:
43	pre-patch:
44	cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch	42	cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch
45		43
46	post-build:	44	post-build:
Lines 53-70 Link Here
53	.include <bsd.port.pre.mk>	51	.include <bsd.port.pre.mk>
54		52
55	post-install:	53	post-install:
		54	@${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
		55	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
56	.if !defined(NOPORTDOCS)	56	.if !defined(NOPORTDOCS)
57	${MKDIR} ${RUBY_MODEXAMPLESDIR}/	57	@${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
58	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${RUBY_MODEXAMPLESDIR}/	58	cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs/doc ${STAGEDIR}${RUBY_MODDOCDIR}/ README.markdown && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/
59	${MKDIR} ${RUBY_MODDOCDIR}	59	${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type f -print \| ${SED} -E -e \
60	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs/doc ${RUBY_MODDOCDIR}/ README.en && ${INSTALL_DATA} ${DOCS} ${RUBY_MODDOCDIR}/)	60	's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
61	@${FIND} -ds ${RUBY_MODDOCDIR} -type f -print \| ${SED} -E -e \	61	${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type d -print \| ${SED} -E -e \
62	's,^${PREFIX}/?,,' >> ${TMPPLIST}	62	's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
63	@${FIND} -ds ${RUBY_MODDOCDIR} -type d -print \| ${SED} -E -e \	63	${ECHO_CMD} "@unexec rmdir %D/share/doc/ruby19/ 2>/dev/null \|\| true" \
64	's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
65	@${ECHO_CMD} "@unexec rmdir %D/share/doc/ruby19/ 2>/dev/null \|\| true" \
66	>> ${TMPPLIST}	64	>> ${TMPPLIST}
67	.endif	65	.endif
68	@${CAT} ${PKGMESSAGE}
69		66
70	.include <bsd.port.post.mk>	67	.include <bsd.port.post.mk>

Lines 1-16 Link Here

(-)files/patch-bitand-bitor (-16 lines)
1	--- src/conversions/bitstring/plruby_bitstring.c.orig 2011-09-12 10:59:01.000000000 +0200
2	+++ src/conversions/bitstring/plruby_bitstring.c 2011-09-12 11:01:31.000000000 +0200
3	@@ -195,8 +195,13 @@
4	}
5
6	BIT_OPERATOR(pl_bit_add, bitcat);
7	+#if PG_PL_VERSION >= 91
8	+BIT_OPERATOR(pl_bit_and, bit_and);
9	+BIT_OPERATOR(pl_bit_or, bit_or);
10	+#else
11	BIT_OPERATOR(pl_bit_and, bitand);
12	BIT_OPERATOR(pl_bit_or, bitor);
13	+#endif
14	BIT_OPERATOR(pl_bit_xor, bitxor);
15
16	static VALUE

Line 0 Link Here

(-)files/patch-src__plruby.h (+21 lines)
	1	--- ./src/plruby.h.orig 2012-12-23 14:51:17.000000000 +0100
	2	+++ ./src/plruby.h 2013-11-19 15:29:16.000000000 +0100
	3	@@ -7,6 +7,7 @@
	4	#include "executor/executor.h"
	5	#include "commands/trigger.h"
	6	#include "utils/elog.h"
	7	+#include "utils/rel.h"
	8	#include "utils/builtins.h"
	9	#include "fmgr.h"
	10	#include "access/heapam.h"
	11	@@ -35,6 +36,10 @@
	12	#include "utils/memutils.h"
	13	#endif
	14
	15	+#if PG_PL_VERSION >= 93
	16	+#include "access/htup_details.h"
	17	+#endif
	18	+
	19	#include "package.h"
	20
	21	#include <ruby.h>