From mat@aragorn.in.absolight.net  Tue Nov 19 14:57:57 2013
Return-Path: <mat@aragorn.in.absolight.net>
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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <mat@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] databases/postgresql-plruby: Work on postgresql > 8.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         184087
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql-plruby: Work on postgresql > 8.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    knu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 19 15:00:00 UTC 2013
>Closed-Date:    Mon Dec 02 13:41:30 UTC 2013
>Last-Modified:  Mon Dec  2 13:50:00 UTC 2013
>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-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
--- postgresql-plruby-0.5.4_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->knu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Nov 19 15:00:14 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184087 
State-Changed-From-To: open->closed 
State-Changed-By: mat 
State-Changed-When: Mon Dec 2 13:41:29 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184087 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184087: commit references a PR
Date: Mon,  2 Dec 2013 13:41:32 +0000 (UTC)

 Author: mat
 Date: Mon Dec  2 13:41:23 2013
 New Revision: 335486
 URL: http://svnweb.freebsd.org/changeset/ports/335486
 
 Log:
   Make the port work on postgresql > 8.4.
   
   maintainer timeout.
   
   PR:		ports/184087
   Submitted by:	mat
 
 Added:
   head/databases/postgresql-plruby/files/patch-src__plruby.h   (contents, props changed)
 Deleted:
   head/databases/postgresql-plruby/files/patch-bitand-bitor
 Modified:
   head/databases/postgresql-plruby/Makefile
   head/databases/postgresql-plruby/distinfo   (contents, props changed)
 
 Modified: head/databases/postgresql-plruby/Makefile
 ==============================================================================
 --- head/databases/postgresql-plruby/Makefile	Mon Dec  2 13:34:41 2013	(r335485)
 +++ head/databases/postgresql-plruby/Makefile	Mon Dec  2 13:41:23 2013	(r335486)
 @@ -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 @@ DOCS=		Changes plruby.html plruby.rd
  
  PKGMESSAGE=	${WRKDIR}/createlang.sql
  
 -NO_STAGE=	yes
 -pre-patch:
 +post-fetch:
  	cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch
  
  post-build:
 @@ -53,18 +51,17 @@ 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} ${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>
 
 Modified: head/databases/postgresql-plruby/distinfo
 ==============================================================================
 --- head/databases/postgresql-plruby/distinfo	Mon Dec  2 13:34:41 2013	(r335485)
 +++ head/databases/postgresql-plruby/distinfo	Mon Dec  2 13:41:23 2013	(r335486)
 @@ -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
 
 Added: head/databases/postgresql-plruby/files/patch-src__plruby.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/postgresql-plruby/files/patch-src__plruby.h	Mon Dec  2 13:41:23 2013	(r335486)
 @@ -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>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
