Attachment 27840 Details for Bug 47074 – file.diff

[patch] file.diff

file.diff (text/plain), 2.73 KB, created by tkato on 2003-01-14 20:10:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-01-14 20:10:09 UTC

Size: 2.73 KB

patch

obsolete

>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)

Actions: View | Diff

Attachments on bug 47074: 27840