o Update to 2.23

o PTHREAD_{CFLAGS,LIBS}
o Support NOPORTDOCS

PR:		29438
Submitted by:	Kato Tsuguru <tkato@prontomail.com>

4 files changed, 53 insertions, 20 deletions

diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index b4847f28dcf3..51a667c5660b 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -7,21 +7,26 @@
 #
 
 PORTNAME=	fastdb
-PORTVERSION=	2.22
+PORTVERSION=	2.23
 CATEGORIES=	databases
 MASTER_SITES=	http://www.ispras.ru/~knizhnik/
 
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+
 USE_GMAKE=	yes
+MAKE_ENV=	PREFIX="${PREFIX}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKEFILE=	makefile
-
+INSTALL_TARGET=	installlib
 INSTALLS_SHLIB=	yes
 
-post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g ; \
-		s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g ; \
-		s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g" ${WRKSRC}/makefile
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/fastdb/distinfo b/databases/fastdb/distinfo
index 3987557765c1..8b4739949748 100644
--- a/databases/fastdb/distinfo
+++ b/databases/fastdb/distinfo
@@ -1 +1 @@
-MD5 (fastdb-2.22.tar.gz) = a544b9d6d6e70a60322b93fcc82e6557
+MD5 (fastdb-2.23.tar.gz) = d14f49fec98f06db90d8d59f6ede9cc2
diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile
index e4b4c71bb161..3dd46c77efc5 100644
--- a/databases/fastdb/files/patch-makefile
+++ b/databases/fastdb/files/patch-makefile
@@ -1,19 +1,19 @@
---- makefile.orig	Fri Apr  6 23:14:06 2001
-+++ makefile	Thu Jul 12 00:40:24 2001
+--- makefile.orig	Fri Apr  6 12:13:44 2001
++++ makefile	Wed Aug  8 02:04:05 2001
 @@ -2,13 +2,13 @@
  # Makefile for Generic Unix with GCC compiler
  
  # Place where to copy GastDB header files
 -INCSPATH=/usr/local/include/fastdb
-+INCSPATH=%%PREFIX%%/include/fastdb
++INCSPATH=${PREFIX}/include/fastdb
  
  #Place where to copy Fastdb library
 -LIBSPATH=/usr/local/lib
-+LIBSPATH=%%PREFIX%%/lib
++LIBSPATH=${PREFIX}/lib
  
  #Place where to copy Fastdb subsql utility
 -BINSPATH=/usr/local/bin
-+BINSPATH=%%PREFIX%%/bin
++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
@@ -23,25 +23,51 @@
  else 
 -TFLAGS=-D_REENTRANT -D_THREAD_SAFE
 -THRLIBS=-lpthread
-+TFLAGS=-D_REENTRANT -D_THREAD_SAFE %%PTHREAD_CFLAGS%%
-+THRLIBS=%%PTHREAD_LIBS%%
++TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
++THRLIBS=${PTHREAD_LIBS}
  endif
  SUFF=_r
  endif
-@@ -64,7 +64,7 @@
+@@ -60,19 +60,18 @@
+ 
+ WEB_EXAMPLES = cgistub bugdb clidb
+ 
+-CC = g++
  #DEFS =-DTHROW_EXCEPTION_ON_ERROR -DUSE_QUEUE_MANAGER
  DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS
  
 -CFLAGS = $(TFLAGS) -c -Wall -O5 -g $(TFLAGS) 
-+CFLAGS += $(TFLAGS) -c $(TFLAGS) 
++CFLAGS += -c $(TFLAGS) 
  
  #CFLAGS = -c -Wall -O0 -g $(DEFS) $(TFLAGS)
  #CFLAGS = -c -Wall -O0 -DDEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
-@@ -258,7 +258,6 @@
- 	cp $(INCS) $(INCSPATH)
+-SHFLAGS=-shared
++SHFLAGS=-shared -Wl,-soname,$@
+ 
+ 
+ LD = $(CC)
+-LDFLAGS = -g $(TFLAGS)
++LDFLAGS = $(TFLAGS)
+ 
+ AR = ar
+ ARFLAGS = -cru
+@@ -255,16 +254,15 @@
+ 
+ installlib: $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED)
+ 	mkdir -p $(INCSPATH)
+-	cp $(INCS) $(INCSPATH)
++	${BSD_INSTALL_DATA} $(INCS) $(INCSPATH)
  	mkdir -p $(LIBSPATH)
- 	cp $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(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)
+ 
+ cleanobj:
+ 	rm -fr *.o *.tgz core *~ cxx_repository
diff --git a/databases/fastdb/pkg-plist b/databases/fastdb/pkg-plist
index 6291362eca5a..a852003b02ca 100644
--- a/databases/fastdb/pkg-plist
+++ b/databases/fastdb/pkg-plist
@@ -13,10 +13,12 @@ include/fastdb/stdtp.h
 include/fastdb/sync.h
 include/fastdb/ttree.h
 include/fastdb/wwwapi.h
-@dirrm include/fastdb
 lib/libcli_r.a
 lib/libcli_r.so
 lib/libcli_r.so.2
 lib/libfastdb_r.a
 lib/libfastdb_r.so
 lib/libfastdb_r.so.2
+%%PORTDOCS%%share/doc/fastdb/FastDB.htm
+%%PORTDOCS%%@dirrm share/doc/fastdb
+@dirrm include/fastdb