Attachment #29723 for bug #50362

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




#

PORTNAME=	fastdb
PORTVERSION=	2.58
CATEGORIES=	databases
MASTER_SITES=	http://www.garret.ru/~knizhnik/

MAINTAINER=	osa@FreeBSD.org.ru
COMMENT=	Main Memory Relational Database Management System

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_GMAKE=	yes
MAKE_ENV=	OSTYPE="${OPSYS}" \
		PREFIX="${PREFIX}" \
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"

Line 1 Link Here

(-)ports/databases/fastdb/distinfo (-1 / +1 lines)
1	MD5 (fastdb-2.57.tar.gz) = 9667162004340138eb2409e2e2749877	1	MD5 (fastdb-2.58.tar.gz) = 6907b953ca1a731a0f1e91306796ad57




--- makefile.orig	Tue Feb 18 20:58:28 2003
+++ makefile	Thu Mar 27 20:58:31 2003
@@ -32,6 +32,6 @@
 SUFF=
 else
 ifneq (,$(findstring FreeBSD,$(OSTYPE)))
-TFLAGS=-pthread
-THRLIBS=
+TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
+THRLIBS=${PTHREAD_LIBS}
 else 
 TFLAGS=-D_REENTRANT -D_THREAD_SAFE
 THRLIBS=-lpthread
@@ -65,7 +65,7 @@
 
 WEB_EXAMPLES = cgistub bugdb clidb

+CFLAGS = -c ${CXXFLAGS} $(DEFS) $(TFLAGS)
 #CFLAGS = -c -Wall -O0 -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
-SHFLAGS=-shared
+SHFLAGS = -shared -Wl,-soname,$@
 
 
 LD = $(CC)

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

+	${BSD_INSTALL_PROGRAM} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
 	cd $(LIBSPATH); ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so
 	cd $(LIBSPATH); ln -f -s $(CLI_SHARED) libcli$(SUFF).so
-
-
 
 uninstall:
 	rm -fr $(INCSPATH)

Return to bug 50362

Lines 7-23 Link Here

(-)ports/databases/fastdb/Makefile (-3 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= fastdb	9	PORTNAME= fastdb
10	PORTVERSION= 2.57	10	PORTVERSION= 2.58
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= http://www.garret.ru/~knizhnik/	12	MASTER_SITES= http://www.garret.ru/~knizhnik/
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= osa@FreeBSD.org.ru
15	COMMENT= Main Memory Relational Database Management System	15	COMMENT= Main Memory Relational Database Management System
16		16
17	WRKSRC= ${WRKDIR}/${PORTNAME}	17	WRKSRC= ${WRKDIR}/${PORTNAME}
18		18
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	MAKE_ENV= OSTYPE="${OPSYS:L}" \	20	MAKE_ENV= OSTYPE="${OPSYS}" \
21	PREFIX="${PREFIX}" \	21	PREFIX="${PREFIX}" \
22	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	22	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
23	PTHREAD_LIBS="${PTHREAD_LIBS}"	23	PTHREAD_LIBS="${PTHREAD_LIBS}"

Lines 1-16 Link Here

(-)ports/databases/fastdb/files/patch-makefile (-8 / +10 lines)
1	--- makefile.orig Tue Dec 10 00:22:22 2002	1	--- makefile.orig Tue Feb 18 20:58:28 2003
2	+++ makefile Tue Jan 14 18:57:13 2003	2	+++ makefile Thu Mar 27 20:58:31 2003
3	@@ -32,8 +32,8 @@	3	@@ -32,6 +32,6 @@
4	SUFF=	4	SUFF=
5	else	5	else
6	ifneq (,$(findstring freebsd,$(OSTYPE)))	6	ifneq (,$(findstring FreeBSD,$(OSTYPE)))
7	-TFLAGS=-pthread	7	-TFLAGS=-pthread
8	-THRLIBS=	8	-THRLIBS=
9	+TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}	9	+TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
10	+THRLIBS=${PTHREAD_LIBS}	10	+THRLIBS=${PTHREAD_LIBS}
11	else	11	else
12	TFLAGS=-D_REENTRANT -D_THREAD_SAFE
13	THRLIBS=-lpthread
14	@@ -65,7 +65,7 @@	12	@@ -65,7 +65,7 @@
15		13
16	WEB_EXAMPLES = cgistub bugdb clidb	14	WEB_EXAMPLES = cgistub bugdb clidb
Lines 28-34 Link Here
28	+CFLAGS = -c ${CXXFLAGS} $(DEFS) $(TFLAGS)	26	+CFLAGS = -c ${CXXFLAGS} $(DEFS) $(TFLAGS)
29	#CFLAGS = -c -Wall -O0 -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)	27	#CFLAGS = -c -Wall -O0 -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
30	-SHFLAGS=-shared	28	-SHFLAGS=-shared
31	+SHFLAGS=-shared -Wl,-soname,$@	29	+SHFLAGS = -shared -Wl,-soname,$@
32		30
33		31
34	LD = $(CC)	32	LD = $(CC)
Lines 37-43 Link Here
37		35
38	AR = ar	36	AR = ar
39	ARFLAGS = -cru	37	ARFLAGS = -cru
40	@@ -326,14 +326,13 @@	38	@@ -326,18 +326,15 @@
41		39
42	install: subsql installlib	40	install: subsql installlib
43	mkdir -p $(BINSPATH)	41	mkdir -p $(BINSPATH)
Lines 54-57 Link Here
54	+ ${BSD_INSTALL_PROGRAM} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)	52	+ ${BSD_INSTALL_PROGRAM} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
55	cd $(LIBSPATH); ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so	53	cd $(LIBSPATH); ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so
56	cd $(LIBSPATH); ln -f -s $(CLI_SHARED) libcli$(SUFF).so	54	cd $(LIBSPATH); ln -f -s $(CLI_SHARED) libcli$(SUFF).so
		55	-
		56	-
57		57
		58	uninstall:
		59	rm -fr $(INCSPATH)