Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Mar 2012 18:57:09 +0100 (BST)
From:      Chris Rees <crees@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/166447: Update port: databases/ludia to 1.5.2 and fix with later pgsql
Message-ID:  <201203271757.q2RHv9ru030735@pegasus.bayofrum.net>
Resent-Message-ID: <201203271800.q2RI0N09072901@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 27 18:00:21 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203271757.q2RHv9ru030735>