6 files changed, 35 insertions, 34 deletions

diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index 1b6ad529322e..875351ae1c79 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -7,26 +7,27 @@
 #
 
 PORTNAME=	fastdb
-PORTVERSION=	2.41
+PORTVERSION=	2.51
+PORTCOMMENT=	Main Memory Relational Database Management System
 CATEGORIES=	databases
-MASTER_SITES=	http://www.ispras.ru/~knizhnik/
+MASTER_SITES=	http://www.garret.ru/~knizhnik/
 
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
-MAKE_ENV=	PREFIX="${PREFIX}" \
+MAKE_ENV=	OSTYPE="${OPSYS:L}" \
+		PREFIX="${PREFIX}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKEFILE=	makefile
-INSTALL_TARGET=	installlib
 INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/fastdb/distinfo b/databases/fastdb/distinfo
index 8f9d8520f351..e97d5fb723b9 100644
--- a/databases/fastdb/distinfo
+++ b/databases/fastdb/distinfo
@@ -1 +1 @@
-MD5 (fastdb-2.41.tar.gz) = d5cc58fd466c73d2627f4bbf57440892
+MD5 (fastdb-2.51.tar.gz) = 0371eff57d1e7ca958027253cb31ed54
diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile
index 6390a17fb512..a9bafe47d0b3 100644
--- a/databases/fastdb/files/patch-makefile
+++ b/databases/fastdb/files/patch-makefile
@@ -1,7 +1,7 @@
---- makefile.orig	Thu Jul  4 23:46:37 2002
-+++ makefile	Thu Jul  4 23:50:24 2002
-@@ -2,13 +2,13 @@
- # Makefile for Generic Unix with GCC compiler
+--- makefile.orig	Mon Oct 28 19:50:00 2002
++++ makefile	Sun Nov  3 09:09:41 2002
+@@ -4,13 +4,13 @@
+ FAULT_TOLERANT=0
  
  # Place where to copy GastDB header files
 -INCSPATH=/usr/local/include/fastdb
@@ -16,19 +16,19 @@
 +BINSPATH=${PREFIX}/bin
  
  OBJS = class.o compiler.o database.o hashtab.o file.o symtab.o ttree.o \
- 	cursor.o query.o wwwapi.o unisock.o sync.o
-@@ -30,8 +30,8 @@
- TFLAGS=-pthread
- THRLIBS=
- else 
--TFLAGS=-D_REENTRANT -D_THREAD_SAFE
--THRLIBS=-lpthread
+ 	cursor.o query.o wwwapi.o unisock.o sync.o localcli.o
+@@ -29,8 +29,8 @@
+ SUFF=
+ else
+ ifneq (,$(findstring freebsd,$(OSTYPE)))
+-TFLAGS=-pthread
+-THRLIBS=
 +TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
 +THRLIBS=${PTHREAD_LIBS}
- endif
- SUFF=_r
- endif
-@@ -60,7 +60,6 @@
+ else 
+ TFLAGS=-D_REENTRANT -D_THREAD_SAFE
+ THRLIBS=-lpthread
+@@ -62,7 +62,6 @@
  
  WEB_EXAMPLES = cgistub bugdb clidb
  
@@ -36,12 +36,12 @@
  
  # Possible FastDB compile time parameters (-Dxxx should be added to DEFS macro):
  # 1. USE_LOCALE_SETTING - use C locale for string comparison operations
-@@ -93,13 +92,13 @@
- 
- #CFLAGS = $(TFLAGS) -c -Wall -O5 -g $(TFLAGS) 
+@@ -98,13 +97,13 @@
+ DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS
  
+ #CFLAGS = $(TFLAGS) -c -Wall -O5 -g $(DEFS) 
 -CFLAGS = -c -Wall -O0 -g $(DEFS) $(TFLAGS)
-+CFLAGS += -c $(TFLAGS)
++CFLAGS += -c $(DEFS) $(TFLAGS)
  #CFLAGS = -c -Wall -O0 -DDEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
 -SHFLAGS=-shared
 +SHFLAGS=-shared -Wl,-soname,$@
@@ -53,7 +53,13 @@
  
  AR = ar
  ARFLAGS = -cru
-@@ -302,14 +301,13 @@
+@@ -314,14 +313,13 @@
+ 
+ install: subsql installlib
+ 	mkdir -p $(BINSPATH)
+-	cp subsql $(BINSPATH)
+-	strip $(BINSPATH)/subsql
++	${BSD_INSTALL_PROGRAM} subsql $(BINSPATH)
  
  installlib: $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED)
  	mkdir -p $(INCSPATH)
@@ -61,13 +67,7 @@
 +	${BSD_INSTALL_DATA} $(INCS) $(INCSPATH)
  	mkdir -p $(LIBSPATH)
 -	cp $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
--	cp -P libcli.so $(LIBSPATH)
 +	${BSD_INSTALL_DATA} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
  	ln -f -s $(LIBSPATH)/$(FASTDB_SHARED) $(LIBSPATH)/libfastdb$(SUFF).so
  	ln -f -s $(LIBSPATH)/$(CLI_SHARED) $(LIBSPATH)/libcli$(SUFF).so
- 	mkdir -p $(BINSPATH)
--	cp subsql $(BINSPATH)
-+	${BSD_INSTALL_PROGRAM} subsql $(BINSPATH)
- 
- 
  
diff --git a/databases/fastdb/pkg-comment b/databases/fastdb/pkg-comment
deleted file mode 100644
index 5bb0c507d8ce..000000000000
--- a/databases/fastdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Main Memory Relational Database Management System
diff --git a/databases/fastdb/pkg-descr b/databases/fastdb/pkg-descr
index 9db6ac497f07..aee6dd3ec87b 100644
--- a/databases/fastdb/pkg-descr
+++ b/databases/fastdb/pkg-descr
@@ -7,4 +7,4 @@ Main Memory Relational Database Management System
    - Efficient log-less transactions 
    - Zero time recovery 
 
-WWW: http://www.ispras.ru/~knizhnik/fastdb.html
+WWW: http://www.garret.ru/~knizhnik/fastdb.html
diff --git a/databases/fastdb/pkg-plist b/databases/fastdb/pkg-plist
index a852003b02ca..bb879ec43d14 100644
--- a/databases/fastdb/pkg-plist
+++ b/databases/fastdb/pkg-plist
@@ -1,6 +1,7 @@
 bin/subsql
 include/fastdb/array.h
 include/fastdb/class.h
+include/fastdb/cli.h
 include/fastdb/cursor.h
 include/fastdb/database.h
 include/fastdb/datetime.h