From nobody@FreeBSD.org  Mon Apr  2 16:05:52 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 74B1416A409
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Apr 2007 16:05:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E7A713C457
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Apr 2007 16:05:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l32G5gA2079202
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 2 Apr 2007 16:05:42 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l32G0esd078534;
	Mon, 2 Apr 2007 16:00:40 GMT
	(envelope-from nobody)
Message-Id: <200704021600.l32G0esd078534@www.freebsd.org>
Date: Mon, 2 Apr 2007 16:00:40 GMT
From: Norbert Koch<nkoch@demig.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] cvstrac version -> 2.0.0
X-Send-Pr-Version: www-3.0

>Number:         111141
>Category:       ports
>Synopsis:       devel/cvstrac: [patch] cvstrac version -> 2.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 02 16:10:10 GMT 2007
>Closed-Date:    Mon Apr 02 16:49:22 GMT 2007
>Last-Modified:  Mon Apr 02 16:49:22 GMT 2007
>Originator:     Norbert Koch
>Release:        4.11
>Organization:
>Environment:
>Description:
I'd like to have cvstrac updated to 2.0.0.
It works for me with the additional patch (see below) in db.c.
But I'd suggest someone else should confirm that.
SHA256 is missing, as I run this under 4.11.
So this needs to be added.

Perhaps pkg-descr should mention that cvstrac's
database may have to be upgraded from sqlite2 to sqlite3
like e.g.:
  mv cvstrac.db cvstrac_2.db &&
  sqlite cvstrac_2.db .dump | sqlite3 cvstrac.db
>How-To-Repeat:

>Fix:
diff -Pur cvstrac/Makefile cvstrac20/Makefile
--- cvstrac/Makefile	Sun Jun  4 22:30:29 2006
+++ cvstrac20/Makefile	Mon Apr  2 17:20:54 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvstrac
-PORTVERSION=	1.2.1
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cvstrac.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -15,7 +15,7 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web-Based Bug And Patch-Set Tracking System For CVS
 
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=	sqlite.3:${PORTSDIR}/databases/sqlite3
 
 USE_GMAKE=	yes
 
diff -Pur cvstrac/distinfo cvstrac20/distinfo
--- cvstrac/distinfo	Sun Jun  4 22:30:29 2006
+++ cvstrac20/distinfo	Wed Dec 27 08:54:33 2006
@@ -1,3 +1,2 @@
-MD5 (cvstrac-1.2.1.tar.gz) = 8659529167f022a7e0df2c5a1ef30a34
-SHA256 (cvstrac-1.2.1.tar.gz) = 6b2b105b2f284632be648a5d96bc487f3b2f1fdff891b74a89a9f7a609b2ba0c
-SIZE (cvstrac-1.2.1.tar.gz) = 221447
+MD5 (cvstrac-2.0.0.tar.gz) = 434b7c19a2990e8a3d6b17e3e97f1668
+SIZE (cvstrac-2.0.0.tar.gz) = 283011

diff -Pur cvstrac/files/patch-Makefile cvstrac20/files/patch-Makefile
--- cvstrac/files/patch-Makefile	Wed Jan 12 17:21:50 2005
+++ cvstrac20/files/patch-Makefile	Wed Dec 27 10:25:54 2006
@@ -25,7 +25,7 @@
 +
 +#### Extra arguments for linking against SQLite
 +#
-+LIBSQLITE = -L$(LOCALBASE)/lib -lsqlite -lcrypt
++LIBSQLITE = -L$(LOCALBASE)/lib -lsqlite3 -lcrypt
 +
 +#### Installation directory
 +#

diff -Pur cvstrac/files/patch-db.c cvstrac20/files/patch-db.c
--- cvstrac/files/patch-db.c	Thu Jan  1 01:00:00 1970
+++ cvstrac20/files/patch-db.c	Wed Dec 27 11:16:00 2006
@@ -0,0 +1,11 @@
+--- db.c.org	Wed Dec 27 11:14:31 2006
++++ db.c	Wed Dec 27 11:15:09 2006
+@@ -107,6 +107,8 @@
+   extern int sqlite3StrICmp(const char*, const char*);
+   if( type==SQLITE_SELECT ){
+     return SQLITE_OK;
++  }else if( type==SQLITE_FUNCTION ){
++    return SQLITE_OK;
+   }else if( type==SQLITE_READ ){
+     if( sqlite3StrICmp(zArg1,"user")==0 ){
+       if( sqlite3StrICmp(zArg2,"passwd")==0 || sqlite3StrICmp(zArg2,"email")==0 ){
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: remko 
Responsible-Changed-When: Mon Apr 2 16:44:32 UTC 2007 
Responsible-Changed-Why:  
reassign to the PR team. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111141 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Mon Apr 2 16:49:20 UTC 2007 
State-Changed-Why:  
duplicated of 111139 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111141 
>Unformatted:
