Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2001 21:00:38 -0700 (PDT)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/29438: Update port: databases/fastdb to 2.23
Message-ID:  <200108040400.f7440cv52899@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         29438
>Category:       ports
>Synopsis:       Update port: databases/fastdb to 2.23
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 03 21:10:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.23

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/databases/fastdb/Makefile databases/fastdb/Makefile
--- /usr/ports/databases/fastdb/Makefile	Fri Jul 13 20:32:28 2001
+++ databases/fastdb/Makefile	Tue Jul 31 22:51:22 2001
@@ -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 -urN /usr/ports/databases/fastdb/distinfo databases/fastdb/distinfo
--- /usr/ports/databases/fastdb/distinfo	Fri Jul 13 20:32:30 2001
+++ databases/fastdb/distinfo	Tue Jul 31 21:25:08 2001
@@ -1 +1 @@
-MD5 (fastdb-2.22.tar.gz) = a544b9d6d6e70a60322b93fcc82e6557
+MD5 (fastdb-2.23.tar.gz) = d14f49fec98f06db90d8d59f6ede9cc2
diff -urN /usr/ports/databases/fastdb/files/patch-makefile databases/fastdb/files/patch-makefile
--- /usr/ports/databases/fastdb/files/patch-makefile	Fri Jul 13 20:32:30 2001
+++ databases/fastdb/files/patch-makefile	Tue Jul 31 22:32:38 2001
@@ -1,19 +1,19 @@
---- makefile.orig	Fri Apr  6 23:14:06 2001
-+++ makefile	Thu Jul 12 00:40:24 2001
+--- makefile.orig	Sat Apr  7 00:14:06 2001
++++ makefile	Tue Jul 31 22:23:43 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,45 @@
  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,15 +60,15 @@
+ 
+ WEB_EXAMPLES = cgistub bugdb clidb
+ 
+-CC = g++
++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)
+@@ -255,14 +255,13 @@
+ 
+ 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)
+ 
+ 
+ 
diff -urN /usr/ports/databases/fastdb/pkg-plist databases/fastdb/pkg-plist
--- /usr/ports/databases/fastdb/pkg-plist	Sat Mar  3 01:25:51 2001
+++ databases/fastdb/pkg-plist	Tue Jul 31 22:52:01 2001
@@ -13,10 +13,12 @@
 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

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108040400.f7440cv52899>