From tkato@prontomail.com  Tue Jan 14 12:02:22 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A9E2937B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Jan 2003 12:02:22 -0800 (PST)
Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 256FD43F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Jan 2003 12:02:17 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost (localhost [127.0.0.1])
	by socigeog.hmt.toyama-u.ac.jp (Postfix) with SMTP id A9DCA2BD
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 15 Jan 2003 05:02:11 +0900 (JST)
Message-Id: <20030115050013.1fc48eb8.tkato@prontomail.com>
Date: Wed, 15 Jan 2003 05:00:13 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: databases/fastdb to 2.55

>Number:         47074
>Category:       ports
>Synopsis:       Update port: databases/fastdb to 2.55
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    arved
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 14 12:10:09 PST 2003
>Closed-Date:    Sat Jan 18 06:40:43 PST 2003
>Last-Modified:  Sat Jan 18 06:50:01 PST 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 2.55

New file:
files/patch-cliproto.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/databases/fastdb/Makefile databases/fastdb/Makefile
--- /usr/ports/databases/fastdb/Makefile	Mon Jan  6 15:55:21 2003
+++ databases/fastdb/Makefile	Tue Jan 14 19:02:58 2003
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	fastdb
-PORTVERSION=	2.54
+PORTVERSION=	2.55
 CATEGORIES=	databases
 MASTER_SITES=	http://www.garret.ru/~knizhnik/
 
diff -urN /usr/ports/databases/fastdb/distinfo databases/fastdb/distinfo
--- /usr/ports/databases/fastdb/distinfo	Mon Jan  6 15:55:21 2003
+++ databases/fastdb/distinfo	Tue Jan 14 18:52:58 2003
@@ -1 +1 @@
-MD5 (fastdb-2.54.tar.gz) = 16c554c204e6fcc1e5fc95db7cc8e0cd
+MD5 (fastdb-2.55.tar.gz) = c3507a6447f292f08480395ac95e896e
diff -urN /usr/ports/databases/fastdb/files/patch-cliproto.h databases/fastdb/files/patch-cliproto.h
--- /usr/ports/databases/fastdb/files/patch-cliproto.h	Thu Jan  1 09:00:00 1970
+++ databases/fastdb/files/patch-cliproto.h	Wed Dec 18 05:34:16 2002
@@ -0,0 +1,14 @@
+--- cliproto.h.orig	Thu Nov 21 20:43:08 2002
++++ cliproto.h	Wed Dec 18 05:27:43 2002
+@@ -70,10 +70,7 @@
+     cli_oid
+ };
+ 
+-#if defined(__FreeBSD__)
+-#include <sys/param.h>
+-#define USE_HTON_NTOH
+-#elif defined(__linux__)
++#if defined(__linux__) && defined(__FreeBSD__)
+ //
+ // At Linux inline assembly declarations of ntohl, htonl... are available
+ //
diff -urN /usr/ports/databases/fastdb/files/patch-makefile databases/fastdb/files/patch-makefile
--- /usr/ports/databases/fastdb/files/patch-makefile	Mon Jan  6 15:55:21 2003
+++ databases/fastdb/files/patch-makefile	Tue Jan 14 19:03:48 2003
@@ -1,5 +1,5 @@
---- makefile.orig	Fri Nov 22 00:41:30 2002
-+++ makefile	Sun Dec  1 07:54:01 2002
+--- makefile.orig	Tue Dec 10 00:22:22 2002
++++ makefile	Tue Jan 14 18:57:13 2003
 @@ -32,8 +32,8 @@
  SUFF=
  else
@@ -11,21 +11,22 @@
  else 
  TFLAGS=-D_REENTRANT -D_THREAD_SAFE
  THRLIBS=-lpthread
-@@ -65,7 +65,6 @@
+@@ -65,7 +65,7 @@
  
  WEB_EXAMPLES = cgistub bugdb clidb
  
 -CC = g++
++CC = ${CXX}
  
  # Possible FastDB compile time parameters (-Dxxx should be added to DEFS macro):
- # 1. USE_LOCALE_SETTING - use C locale for string comparison operations
-@@ -101,13 +100,13 @@
+ # 1. USE_LOCALE_SETTINGS - use C locale for string comparison operations
+@@ -101,13 +101,13 @@
  DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS
  
  #CFLAGS = $(TFLAGS) -c -Wall -O5 -g $(DEFS) 
 -CFLAGS = -c -Wall -O0 -g $(DEFS) $(TFLAGS)
-+CFLAGS += -c $(DEFS) $(TFLAGS)
- #CFLAGS = -c -Wall -O0 -DDEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
++CFLAGS = -c ${CXXFLAGS} $(DEFS) $(TFLAGS)
+ #CFLAGS = -c -Wall -O0 -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
 -SHFLAGS=-shared
 +SHFLAGS=-shared -Wl,-soname,$@
  
@@ -36,7 +37,7 @@
  
  AR = ar
  ARFLAGS = -cru
-@@ -326,14 +325,13 @@
+@@ -326,14 +326,13 @@
  
  install: subsql installlib
  	mkdir -p $(BINSPATH)
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->arved  
Responsible-Changed-By: arved 
Responsible-Changed-When: Thu Jan 16 15:23:12 PST 2003 
Responsible-Changed-Why:  
I'll look at this one 

http://www.freebsd.org/cgi/query-pr.cgi?pr=47074 
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Sat Jan 18 06:40:37 PST 2003 
State-Changed-Why:  
Committed, thanks 

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

From: KATO Tsuguru <tkato@prontomail.com>
To: Tilman Linneweh <arved@FreeBSD.org>
Cc:  
Subject: Re: ports/47074 Update port: databases/fastdb to 2.55
Date: Fri, 17 Jan 2003 22:41:35 +0900

 On Fri, 17 Jan 2003 00:21:27 +0100
 Tilman Linneweh <arved@FreeBSD.org> wrote:
 
 > > ++#if defined(__linux__) && defined(__FreeBSD__)
 > 
 > Are you sure, you didn't mean || ? 
 > It looks wrong somehow...
 
 Oops, It's apparently my mistake.... '||' is the right
 answer.
 
 In addition, 'files/patch-sync.cpp' should have to be
 removed from ports tree.
 
>Unformatted:
