diff -ruN --exclude=CVS /usr/ports/databases/fastdb/Makefile /usr/home/chinsan/project/fastdb/Makefile --- /usr/ports/databases/fastdb/Makefile Tue May 2 17:44:08 2006 +++ /usr/home/chinsan/project/fastdb/Makefile Tue Jul 11 12:36:09 2006 @@ -7,14 +7,12 @@ # PORTNAME= fastdb -PORTVERSION= 3.27 +PORTVERSION= 3.29 CATEGORIES= databases MASTER_SITES= http://www.garret.ru/~knizhnik/ MAINTAINER= osa@FreeBSD.org COMMENT= Main Memory Relational Database Management System - -BROKEN= Size mismatch WRKSRC= ${WRKDIR}/${PORTNAME} diff -ruN --exclude=CVS /usr/ports/databases/fastdb/distinfo /usr/home/chinsan/project/fastdb/distinfo --- /usr/ports/databases/fastdb/distinfo Tue Apr 18 16:17:39 2006 +++ /usr/home/chinsan/project/fastdb/distinfo Tue Jul 11 12:36:46 2006 @@ -1,3 +1,3 @@ -MD5 (fastdb-3.27.tar.gz) = 98de722595537ae8f9254c7b71aa6741 -SHA256 (fastdb-3.27.tar.gz) = f5d44b7d240d96e41ab1bb88a0c0de86b5ec04ffb3081a1f33551ba6dd6e3982 -SIZE (fastdb-3.27.tar.gz) = 1098100 +MD5 (fastdb-3.29.tar.gz) = b69ab87dd7d7290c0f48588334523a45 +SHA256 (fastdb-3.29.tar.gz) = 862ea5d4e921c9176b9ba242ebd6149b7b5ec7bba16adfd45f25c2e01798538f +SIZE (fastdb-3.29.tar.gz) = 1111141 diff -ruN --exclude=CVS /usr/ports/databases/fastdb/files/patch-makefile /usr/home/chinsan/project/fastdb/files/patch-makefile --- /usr/ports/databases/fastdb/files/patch-makefile Wed Feb 15 18:22:40 2006 +++ /usr/home/chinsan/project/fastdb/files/patch-makefile Tue Jul 11 12:45:56 2006 @@ -1,5 +1,5 @@ ---- makefile.orig Wed Feb 15 13:12:09 2006 -+++ makefile Wed Feb 15 13:16:38 2006 +--- makefile.orig Tue Jul 11 12:39:16 2006 ++++ makefile Tue Jul 11 12:45:31 2006 @@ -33,11 +33,11 @@ SUFF= else @@ -16,7 +16,7 @@ endif SUFF=_r endif -@@ -67,21 +67,21 @@ +@@ -67,21 +67,22 @@ WEB_EXAMPLES = cgistub bugdb clidb @@ -31,7 +31,7 @@ +CFLAGS = -c -Iinc ${CXXFLAGS} -fPIC $(DEFS) $(TFLAGS) #CFLAGS = -c -Iinc -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 @@ -43,7 +43,7 @@ AR = ar ARFLAGS = -cru -@@ -355,24 +355,22 @@ +@@ -367,24 +368,20 @@ install: subsql cleanupsem installlib mkdir -p $(BINSPATH) @@ -61,12 +61,10 @@ mkdir -p $(LIBSPATH) - cp $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH) + ${BSD_INSTALL_PROGRAM} $(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 -- -cp $(JNI_LIB) $(LIBSPATH) -- -ln -f -s $(LIBSPATH)/$(JNI_LIB) $(LIBSPATH)/libjnicli$(SUFF).so -+# -cp $(JNI_LIB) $(LIBSPATH) -+# -ln -f -s $(LIBSPATH)/$(JNI_LIB) $(LIBSPATH)/libjnicli$(SUFF).so + (cd $(LIBSPATH) && ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so \ + && ln -f -s $(CLI_SHARED) libcli$(SUFF).so) +- if [ -f $(JNI_LIB) ]; then cp $(JNI_LIB) $(LIBSPATH); \ +- cd $(LIBSPATH) && ln -f -s $(JNI_LIB) libjnicli$(SUFF).so; fi uninstall: rm -fr $(INCSPATH) diff -ruN --exclude=CVS /usr/ports/databases/fastdb/pkg-plist /usr/home/chinsan/project/fastdb/pkg-plist --- /usr/ports/databases/fastdb/pkg-plist Tue Aug 30 20:01:56 2005 +++ /usr/home/chinsan/project/fastdb/pkg-plist Tue Jul 11 13:01:18 2006 @@ -14,7 +14,9 @@ include/fastdb/harray.h include/fastdb/hashtab.h include/fastdb/query.h +include/fastdb/rectangle.h include/fastdb/reference.h +include/fastdb/rtree.h include/fastdb/stdtp.h include/fastdb/sync.h include/fastdb/sync_unix.h @@ -27,4 +29,4 @@ lib/libfastdb_r.a lib/libfastdb_r.so lib/libfastdb_r.so.2 -@dirrm include/fastdb +@dirrmtry include/fastdb