Update to 2.95.

Move pkg's doc file to Makefile.

4 files changed, 26 insertions, 18 deletions

diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index 4542b41b71f7..fd45bc49969a 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	fastdb
-PORTVERSION=	2.94
+PORTVERSION=	2.95
 CATEGORIES=	databases
 MASTER_SITES=	http://www.garret.ru/~knizhnik/
 
@@ -25,6 +25,8 @@ MAKE_ENV=	OSTYPE="${OPSYS}" \
 MAKEFILE=	makefile
 INSTALLS_SHLIB=	yes
 
+PORTDOCS=	FastDB.htm
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/databases/fastdb/distinfo b/databases/fastdb/distinfo
index 70a56eeefa72..bb4e395c9752 100644
--- a/databases/fastdb/distinfo
+++ b/databases/fastdb/distinfo
@@ -1,2 +1,2 @@
-MD5 (fastdb-2.94.tar.gz) = 1b1ee1e3d928dc99a563de6700379963
-SIZE (fastdb-2.94.tar.gz) = 775751
+MD5 (fastdb-2.95.tar.gz) = 45140a4df76f0bf7c6bc938db0e37702
+SIZE (fastdb-2.95.tar.gz) = 779888
diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile
index 883beb0ff587..023c25e6a192 100644
--- a/databases/fastdb/files/patch-makefile
+++ b/databases/fastdb/files/patch-makefile
@@ -1,6 +1,6 @@
---- makefile.orig	Thu Dec  4 13:21:49 2003
-+++ makefile	Thu Dec  4 13:26:32 2003
-@@ -32,8 +32,8 @@
+--- makefile.orig	Sun Mar 28 22:41:06 2004
++++ makefile	Sun Mar 28 22:45:57 2004
+@@ -33,11 +33,11 @@
  SUFF=
  else
  ifneq (,$(findstring FreeBSD,$(OSTYPE)))
@@ -9,34 +9,42 @@
 +TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
 +THRLIBS=${PTHREAD_LIBS}
  else 
- TFLAGS=-D_REENTRANT -D_THREAD_SAFE
- THRLIBS=-lpthread
-@@ -65,7 +65,7 @@
+-TFLAGS=-D_REENTRANT -D_THREAD_SAFE
+-THRLIBS=-lpthread
++TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
++THRLIBS=${PTHREAD_LIBS}
+ endif
+ SUFF=_r
+ endif
+@@ -66,21 +66,21 @@
  
  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
-@@ -107,13 +107,12 @@
- DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS
+ # DEFS macro is deprecatred, edit config.h file instead
+ DEFS = 
  
  #CFLAGS = $(TFLAGS) -c -Wall -O5 -g  -fPIC $(DEFS) 
 -CFLAGS = -c -Wall -O0 -g -fPIC $(DEFS) $(TFLAGS)
 +CFLAGS = -c ${CXXFLAGS} $(DEFS) $(TFLAGS) -fPIC
  #CFLAGS = -c -Wall -O0 -fPIC -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
- SHFLAGS=-shared -Wl,-soname,$@
  
--
+-#SHFLAGS=-shared -Wl,-soname,$@
+-SHFLAGS=-shared
++SHFLAGS=-shared -Wl,-soname,$@
++#SHFLAGS=-shared
+ 
+ 
  LD = $(CC)
 -LDFLAGS = -g $(TFLAGS)
 +LDFLAGS = $(TFLAGS)
  
  AR = ar
  ARFLAGS = -cru
-@@ -354,13 +354,12 @@
+@@ -320,14 +320,13 @@
+ 
  install: subsql installlib
  	mkdir -p $(BINSPATH)
 -	cp subsql $(BINSPATH)
diff --git a/databases/fastdb/pkg-plist b/databases/fastdb/pkg-plist
index 30e5b3930514..909b3b9d87d5 100644
--- a/databases/fastdb/pkg-plist
+++ b/databases/fastdb/pkg-plist
@@ -26,6 +26,4 @@ lib/libcli_r.so.2
 lib/libfastdb_r.a
 lib/libfastdb_r.so
 lib/libfastdb_r.so.2
-%%PORTDOCS%%%%DOCSDIR%%/FastDB.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/fastdb