From crees@pegasus.bayofrum.net  Tue Mar 27 17:59:41 2012
Return-Path: <crees@pegasus.bayofrum.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 470691065673
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Mar 2012 17:59:41 +0000 (UTC)
	(envelope-from crees@pegasus.bayofrum.net)
Received: from mk-outboundfilter-1.mail.uk.tiscali.com (mk-outboundfilter-1.mail.uk.tiscali.com [212.74.114.37])
	by mx1.freebsd.org (Postfix) with ESMTP id C455A8FC1A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Mar 2012 17:59:39 +0000 (UTC)
Received: from unknown (HELO pegasus.bayofrum.net) ([2.102.107.151])
  by smtp.pipex.tiscali.co.uk with ESMTP; 27 Mar 2012 18:58:30 +0100
Received: from pegasus.bayofrum.net (localhost [127.0.0.1])
	by pegasus.bayofrum.net (8.14.5/8.14.5) with ESMTP id q2RHv9Y2030736
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Mar 2012 18:57:09 +0100 (BST)
	(envelope-from crees@pegasus.bayofrum.net)
Received: (from crees@localhost)
	by pegasus.bayofrum.net (8.14.5/8.14.5/Submit) id q2RHv9ru030735;
	Tue, 27 Mar 2012 18:57:09 +0100 (BST)
	(envelope-from crees)
Message-Id: <201203271757.q2RHv9ru030735@pegasus.bayofrum.net>
Date: Tue, 27 Mar 2012 18:57:09 +0100 (BST)
From: Chris Rees <crees@freebsd.org>
Reply-To: Chris Rees <crees@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: databases/ludia to 1.5.2 and fix with later pgsql
X-Send-Pr-Version: 3.113
X-GNATS-Notify: pgsql@FreeBSD.org

>Number:         166447
>Category:       ports
>Synopsis:       Update port: databases/ludia to 1.5.2 and fix with later pgsql
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 27 18:00:21 UTC 2012
>Closed-Date:    Sun Apr 15 14:41:34 UTC 2012
>Last-Modified:  Sun Apr 15 14:43:45 UTC 2012
>Originator:     Chris Rees
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sat Jan 28 15:45:27 GMT 2012 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64


	
>Description:
	Postgresql82 is about to leave the tree, this is the last port that depends on it, so this is blocking its removal :)
>How-To-Repeat:
	
>Fix:

- Update to 1.5.2

- Use USE_PGSQL for server dependency

- Fix build with postgresql-8.3 [1] and change dependency

Obtained from:	[1] http://decide.cocolog-nifty.com/blog/2009/03/postgresql-836-.html

--- patch.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/ludia/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	31 Dec 2010 19:31:52 -0000	1.7
+++ Makefile	27 Mar 2012 17:52:15 -0000
@@ -6,26 +6,21 @@
 #
 
 PORTNAME=	ludia
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	ludia/32461
+MASTER_SITES=	SFJP
+MASTER_SITE_SUBDIR=	ludia/38430
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	PostgreSQL extension for full-text search indexing
 
-PGSQL_PORT=	${PORTSDIR}/databases/postgresql82-server
-RUN_DEPENDS=	${LOCALBASE}/bin/postmaster:${PGSQL_PORT} \
-		senna-cfg:${PORTSDIR}/textproc/senna
-BUILD_DEPENDS=	${LOCALBASE}/bin/postmaster:${PGSQL_PORT} \
-		senna-cfg:${PORTSDIR}/textproc/senna
+BUILD_DEPENDS=	senna-cfg:${PORTSDIR}/textproc/senna
+RUN_DEPENDS=	senna-cfg:${PORTSDIR}/textproc/senna
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PGSQL=	82
-WANT_PGSQL_VER=	82
-
-.include <bsd.port.pre.mk>
+USE_PGSQL=	server
+WANT_PGSQL_VER=	83-
 
 # let configure find postgres stuff in non-standard places
 CONFIGURE_ARGS+=--with-pgconfigdir=${LOCALBASE}/bin \
@@ -36,4 +31,4 @@
   --with-pgpkglibdir=${LOCALBASE}/lib/postgresql \
   --with-pgsharedir=${LOCALBASE}/share/postgresql
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/ludia/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	31 Dec 2010 19:31:52 -0000	1.3
+++ distinfo	27 Mar 2012 17:52:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (ludia-1.5.1.tar.gz) = 392543d96e727d09e240ba38effbb2a21498eafa0ec8f95a3a10baba00e3ff32
-SIZE (ludia-1.5.1.tar.gz) = 421128
+SHA256 (ludia-1.5.2.tar.gz) = 392b5f7137445668ab0114d58347043a4f3214f5760fb9cfc0379062a8ec4efe
+SIZE (ludia-1.5.2.tar.gz) = 422117
Index: files/patch-pgsenna2.c
===================================================================
RCS file: files/patch-pgsenna2.c
diff -N files/patch-pgsenna2.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-pgsenna2.c	27 Mar 2012 17:52:15 -0000
@@ -0,0 +1,17 @@
+Fix from
+
+http://decide.cocolog-nifty.com/blog/2009/03/postgresql-836-.html
+
+to make it work with postgresql83
+
+--- pgsenna2.c.orig	2012-03-27 18:32:05.393559930 +0100
++++ pgsenna2.c	2012-03-27 18:32:34.261558703 +0100
+@@ -610,7 +610,7 @@
+   bs.index = index_info_open(index, 1, flags);
+   bs.oid_type = oid_type;
+   reltuples = IndexBuildHeapScan(heap, index, indexInfo,
+-                                 buildCallback, (void *) &bs);
++                                 buildCallback, (void *) &bs, false);
+ #if defined(POSTGRES82) || defined(POSTGRES83)
+   result = (IndexBuildResult *) PGS2_PALLOC(sizeof(IndexBuildResult));
+   result->heap_tuples = reltuples;
--- patch.txt ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kuriyama 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 27 18:03:04 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166447 
Responsible-Changed-From-To: kuriyama->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sun Apr 15 14:39:43 UTC 2012 
Responsible-Changed-Why:  
Timeout. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166447 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Sun Apr 15 14:41:33 UTC 2012 
State-Changed-Why:  
Committed. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/166477: commit references a PR
Date: Sun, 15 Apr 2012 14:06:45 +0000 (UTC)

 ***Misfiled commit to kern/166477, migrated to ports/166447***

 crees       2012-04-15 14:06:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/ludia      Makefile distinfo 
   Added files:
     databases/ludia/files patch-pgsenna2.c 
   Log:
   - Update to 1.5.2
   
   - Use USE_PGSQL for server dependency
   
   - Fix build with postgresql-8.3 and change dependency
   
   Obtained from:  http://decide.cocolog-nifty.com/blog/2009/03/postgresql-836-.html
   
   PR:             ports/166477
   Submitted by:   crees
   
   Revision  Changes    Path
   1.8       +8 -13     ports/databases/ludia/Makefile
   1.4       +2 -2      ports/databases/ludia/distinfo
   1.1       +17 -0     ports/databases/ludia/files/patch-pgsenna2.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"

>Unformatted:
