Attachment #27840 for bug #47074

View | Details | Raw Unified | Return to bug 47074
Collapse All | Expand All

Lines 7-13 Link Here

(-)databases/fastdb/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= fastdb	9	PORTNAME= fastdb
10	PORTVERSION= 2.54	10	PORTVERSION= 2.55
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= http://www.garret.ru/~knizhnik/	12	MASTER_SITES= http://www.garret.ru/~knizhnik/
13		13

Line 1 Link Here

(-)databases/fastdb/distinfo (-1 / +1 lines)
1	MD5 (fastdb-2.54.tar.gz) = 16c554c204e6fcc1e5fc95db7cc8e0cd	1	MD5 (fastdb-2.55.tar.gz) = c3507a6447f292f08480395ac95e896e




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




--- makefile.orig	Tue Dec 10 00:22:22 2002
+++ makefile	Tue Jan 14 18:57:13 2003
@@ -32,8 +32,8 @@
 SUFF=
 else

 else 
 TFLAGS=-D_REENTRANT -D_THREAD_SAFE
 THRLIBS=-lpthread
@@ -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_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 ${CXXFLAGS} $(DEFS) $(TFLAGS)
 #CFLAGS = -c -Wall -O0 -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
-SHFLAGS=-shared
+SHFLAGS=-shared -Wl,-soname,$@
 

 
 AR = ar
 ARFLAGS = -cru
@@ -326,14 +326,13 @@
 
 install: subsql installlib
 	mkdir -p $(BINSPATH)

Return to bug 47074

Line 0 Link Here

(-)databases/fastdb/files/patch-cliproto.h (+14 lines)
	1	--- cliproto.h.orig Thu Nov 21 20:43:08 2002
	2	+++ cliproto.h Wed Dec 18 05:27:43 2002
	3	@@ -70,10 +70,7 @@
	4	cli_oid
	5	};
	6
	7	-#if defined(__FreeBSD__)
	8	-#include <sys/param.h>
	9	-#define USE_HTON_NTOH
	10	-#elif defined(__linux__)
	11	+#if defined(__linux__) && defined(__FreeBSD__)
	12	//
	13	// At Linux inline assembly declarations of ntohl, htonl... are available
	14	//

Lines 1-5 Link Here

(-)databases/fastdb/files/patch-makefile (-8 / +9 lines)
1	--- makefile.orig Fri Nov 22 00:41:30 2002	1	--- makefile.orig Tue Dec 10 00:22:22 2002
2	+++ makefile Sun Dec 1 07:54:01 2002	2	+++ makefile Tue Jan 14 18:57:13 2003
3	@@ -32,8 +32,8 @@	3	@@ -32,8 +32,8 @@
4	SUFF=	4	SUFF=
5	else	5	else
Lines 11-31 Link Here
11	else	11	else
12	TFLAGS=-D_REENTRANT -D_THREAD_SAFE	12	TFLAGS=-D_REENTRANT -D_THREAD_SAFE
13	THRLIBS=-lpthread	13	THRLIBS=-lpthread
14	@@ -65,7 +65,6 @@	14	@@ -65,7 +65,7 @@
15		15
16	WEB_EXAMPLES = cgistub bugdb clidb	16	WEB_EXAMPLES = cgistub bugdb clidb
17		17
18	-CC = g++	18	-CC = g++
		19	+CC = ${CXX}
19		20
20	# Possible FastDB compile time parameters (-Dxxx should be added to DEFS macro):	21	# Possible FastDB compile time parameters (-Dxxx should be added to DEFS macro):
21	# 1. USE_LOCALE_SETTING - use C locale for string comparison operations	22	# 1. USE_LOCALE_SETTINGS - use C locale for string comparison operations
22	@@ -101,13 +100,13 @@	23	@@ -101,13 +101,13 @@
23	DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS	24	DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS
24		25
25	#CFLAGS = $(TFLAGS) -c -Wall -O5 -g $(DEFS)	26	#CFLAGS = $(TFLAGS) -c -Wall -O5 -g $(DEFS)
26	-CFLAGS = -c -Wall -O0 -g $(DEFS) $(TFLAGS)	27	-CFLAGS = -c -Wall -O0 -g $(DEFS) $(TFLAGS)
27	+CFLAGS += -c $(DEFS) $(TFLAGS)	28	+CFLAGS = -c ${CXXFLAGS} $(DEFS) $(TFLAGS)
28	#CFLAGS = -c -Wall -O0 -DDEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)	29	#CFLAGS = -c -Wall -O0 -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
29	-SHFLAGS=-shared	30	-SHFLAGS=-shared
30	+SHFLAGS=-shared -Wl,-soname,$@	31	+SHFLAGS=-shared -Wl,-soname,$@
31		32
Lines 36-42 Link Here
36		37
37	AR = ar	38	AR = ar
38	ARFLAGS = -cru	39	ARFLAGS = -cru
39	@@ -326,14 +325,13 @@	40	@@ -326,14 +326,13 @@
40		41
41	install: subsql installlib	42	install: subsql installlib
42	mkdir -p $(BINSPATH)	43	mkdir -p $(BINSPATH)