From khera@kcilink.com  Mon Jun 15 20:36:37 2009
Return-Path: <khera@kcilink.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39F6F106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Jun 2009 20:36:37 +0000 (UTC)
	(envelope-from khera@kcilink.com)
Received: from yertle.kcilink.com (thingy.kcilink.com [74.92.149.59])
	by mx1.freebsd.org (Postfix) with ESMTP id 122968FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Jun 2009 20:36:36 +0000 (UTC)
	(envelope-from khera@kcilink.com)
Received: by yertle.kcilink.com (Postfix, from userid 1002)
	id 138428A150; Mon, 15 Jun 2009 16:36:36 -0400 (EDT)
Message-Id: <20090615203636.138428A150@yertle.kcilink.com>
Date: Mon, 15 Jun 2009 16:36:36 -0400 (EDT)
From: Vivek Khera <vivek@khera.org>
Reply-To: Vivek Khera <vivek@khera.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: upgrade textproc/sphinxsearch-devel to RC2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         135604
>Category:       ports
>Synopsis:       upgrade textproc/sphinxsearch-devel to RC2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    danger
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 15 20:40:05 UTC 2009
>Closed-Date:    Sun Jun 28 18:04:58 UTC 2009
>Last-Modified:  Sun Jun 28 18:10:04 UTC 2009
>Originator:     Vivek Khera
>Release:        FreeBSD 7.2-RELEASE-p1 amd64
>Organization:
>Environment:
System: FreeBSD yertle.int.kcilink.com 7.2-RELEASE-p1 FreeBSD 7.2-RELEASE-p1 #2: Fri Jun 12 01:10:20 EDT 2009 steve@yertle.int.kcilink.com:/u/yertle1/obj/u/yertle1/sources/usr7/src/sys/KCI64SMP amd64


	
>Description:
	

update textproc/sphinxsearch-devel to latest RC2 release

I included the patch from http://sphinxsearch.com/bugs/view.php?id=326 to
allow it to compile on FreeBSD 7.

>How-To-Repeat:
	
>Fix:

	


diff -Nru sphinxsearch-devel.old/Makefile sphinxsearch-devel/Makefile
--- sphinxsearch-devel.old/Makefile	2009-03-18 00:18:20.000000000 -0400
+++ sphinxsearch-devel/Makefile	2009-06-15 15:35:13.000000000 -0400
@@ -9,11 +9,11 @@
 
 PORTNAME=	sphinxsearch
 PORTEPOCH=	1
-DISTVERSION=	0.9.9-rc1
+DISTVERSION=	0.9.9-rc2
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://www.sphinxsearch.com/downloads/
 PKGNAMESUFFIX?=	-devel
-DISTNAME=	sphinx-0.9.9-rc1
+DISTNAME=	sphinx-0.9.9-rc2
 
 PATCH_DIST_STRIP=-p1
 
diff -Nru sphinxsearch-devel.old/distinfo sphinxsearch-devel/distinfo
--- sphinxsearch-devel.old/distinfo	2009-01-27 15:51:18.000000000 -0500
+++ sphinxsearch-devel/distinfo	2009-06-15 15:35:22.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (sphinx-0.9.9-rc1.tar.gz) = d1506c8f85c045bb682393de0aed30e8
-SHA256 (sphinx-0.9.9-rc1.tar.gz) = 05783cfd11e843035263d4a4f08d3dc66863b61ef1db9b930b2892b667f0e848
-SIZE (sphinx-0.9.9-rc1.tar.gz) = 1093436
+MD5 (sphinx-0.9.9-rc2.tar.gz) = 1ca266613bfdb0e6952d9ca1af93f7cc
+SHA256 (sphinx-0.9.9-rc2.tar.gz) = b367291e8556c0fa07ecaf96917759dbff6e7e3487d44f703589bb7765f160e1
+SIZE (sphinx-0.9.9-rc2.tar.gz) = 1205937
diff -Nru sphinxsearch-devel.old/files/patch-clocktime sphinxsearch-devel/files/patch-clocktime
--- sphinxsearch-devel.old/files/patch-clocktime	1969-12-31 19:00:00.000000000 -0500
+++ sphinxsearch-devel/files/patch-clocktime	2009-06-15 16:31:27.000000000 -0400
@@ -0,0 +1,17 @@
+See http://sphinxsearch.com/bugs/view.php?id=326
+
+Index: src/searchd.cpp
+3882c3882,3890
+< 	if ( clock_gettime ( CLOCK_PROCESS_CPUTIME_ID, &tp ) )
+---
+> #if defined(CLOCK_PROCESS_CPUTIME_ID) && defined(__linux__)
+> #   define CLOCK CLOCK_PROCESS_CPUTIME_ID
+> #elif defined(CLOCK_PROF) && defined(__FreeBSD__)
+> #   define CLOCK CLOCK_PROF
+> #else
+> #   define CLOCK CLOCK_REALTIME
+> #endif
+> 	//if ( clock_gettime ( CLOCK_PROCESS_CPUTIME_ID, &tp ) )
+> 	if ( clock_gettime ( CLOCK, &tp ) )
+3883a3892
+> #undef CLOCK
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->danger 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 15 20:40:20 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135604 
State-Changed-From-To: open->closed 
State-Changed-By: danger 
State-Changed-When: Sun Jun 28 18:04:29 UTC 2009 
State-Changed-Why:  
I have comitted a slightly modifiedy diff, thanks for 
submission though! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135604: commit references a PR
Date: Sun, 28 Jun 2009 18:05:29 +0000 (UTC)

 danger      2009-06-28 18:04:12 UTC
 
   FreeBSD ports repository (doc committer)
 
   Modified files:
     textproc/sphinxsearch-devel Makefile distinfo 
   Added files:
     textproc/sphinxsearch-devel/files patch-src_searchd.cpp 
   Log:
   - update to 0.9.9-rc2
   
   PR:             ports/135604
   Submitted by:   Vivek Khera <vivek@khera.org>
   Approved by:    miwi
   
   Revision  Changes    Path
   1.7       +2 -2      ports/textproc/sphinxsearch-devel/Makefile
   1.4       +3 -3      ports/textproc/sphinxsearch-devel/distinfo
   1.1       +25 -0     ports/textproc/sphinxsearch-devel/files/patch-src_searchd.cpp (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:
