Index: head/databases/fastdb/Makefile =================================================================== --- head/databases/fastdb/Makefile (revision 186651) +++ head/databases/fastdb/Makefile (revision 186652) @@ -1,43 +1,43 @@ # ex:ts=8 # New ports collection makefile for: fastdb # Date created: Mar 2, 2001 # Whom: Ying-Chieh Liao # # $FreeBSD$ # PORTNAME= fastdb -PORTVERSION= 3.32 +PORTVERSION= 3.33 CATEGORIES= databases MASTER_SITES= http://www.garret.ru/~knizhnik/ MAINTAINER= clsung@FreeBSD.org COMMENT= Main Memory Relational Database Management System WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes MAKE_ENV= OSTYPE="${OPSYS}" \ PREFIX="${PREFIX}" \ CXX="${CXX}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" MAKEFILE= makefile USE_LDCONFIG= yes PORTDOCS= FastDB.htm post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${DOCSDIR} .endif .include post-patch: .if ${OSVERSION} < 601105 ${REINPLACE_CMD} -e 's|^#define HAVE_GETHOSTBYNAME_R||' ${WRKSRC}/inc/config.h .endif .include Property changes on: head/databases/fastdb/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.70 \ No newline at end of property +1.71 \ No newline at end of property Index: head/databases/fastdb/distinfo =================================================================== --- head/databases/fastdb/distinfo (revision 186651) +++ head/databases/fastdb/distinfo (revision 186652) @@ -1,3 +1,3 @@ -MD5 (fastdb-3.32.tar.gz) = 5df4f1602f77d939bc5f6c6cb221aa44 -SHA256 (fastdb-3.32.tar.gz) = 5df50ea49e1e48fdff072dcb9a398ff1cb0aa45b714705d875537403c796058d -SIZE (fastdb-3.32.tar.gz) = 1117219 +MD5 (fastdb-3.33.tar.gz) = e70c6b2836bcddfbb1dc1782231d54bb +SHA256 (fastdb-3.33.tar.gz) = 1715f3e7d70440ba778fb98b7163cda861937673083e534353430275849cb4d3 +SIZE (fastdb-3.33.tar.gz) = 1168937 Property changes on: head/databases/fastdb/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.66 \ No newline at end of property +1.67 \ No newline at end of property Index: head/databases/fastdb/files/patch-makefile =================================================================== --- head/databases/fastdb/files/patch-makefile (revision 186651) +++ head/databases/fastdb/files/patch-makefile (revision 186652) @@ -1,75 +1,70 @@ ---- makefile.orig Tue Jul 11 12:39:16 2006 -+++ makefile Tue Jul 11 12:45:31 2006 -@@ -33,11 +33,11 @@ +--- makefile.orig Sat Oct 21 20:41:50 2006 ++++ makefile Tue Mar 6 09:00:42 2007 +@@ -32,8 +32,8 @@ + THRLIBS= SUFF= else - ifneq (,$(findstring FreeBSD,$(OSTYPE))) -TFLAGS=-pthread --THRLIBS= +-THRLIBS=-pthread +TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS} +THRLIBS=${PTHREAD_LIBS} - else --TFLAGS=-D_REENTRANT -D_THREAD_SAFE --THRLIBS=-lpthread -+TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS} -+THRLIBS=${PTHREAD_LIBS} - endif SUFF=_r endif -@@ -67,21 +67,22 @@ +@@ -62,21 +62,22 @@ + WEB_EXAMPLES = cgistub bugdb clidb -CC = g++ +CC = ${CXX} # DEFS macro is deprecatred, edit config.h file instead DEFS = #CFLAGS = $(TFLAGS) -Iinc -c -Wall -O5 -g -fPIC $(DEFS) -CFLAGS = -c -Iinc -Wall -O0 -g -fPIC $(DEFS) $(TFLAGS) +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 +SHFLAGS=-shared -Wl,-soname,$@ +#SHFLAGS=-shared LD = $(CC) -LDFLAGS = -g $(TFLAGS) +LDFLAGS = $(TFLAGS) AR = ar ARFLAGS = -cru -@@ -367,24 +368,20 @@ +@@ -386,24 +387,20 @@ install: subsql cleanupsem installlib mkdir -p $(BINSPATH) - cp subsql $(BINSPATH) - strip $(BINSPATH)/subsql - cp cleanupsem $(BINSPATH) - strip $(BINSPATH)/cleanupsem + ${BSD_INSTALL_PROGRAM} subsql $(BINSPATH) + ${BSD_INSTALL_PROGRAM} cleanupsem $(BINSPATH) 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) + ${BSD_INSTALL_PROGRAM} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH) (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) - cd $(LIBSPATH); rm -f $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(JNI_LIB) libfastdb$(SUFF).so libjnicli$(SUFF).so libcli$(SUFF).so + cd $(LIBSPATH); rm -f $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) libfastdb$(SUFF).so libcli$(SUFF).so rm $(BINSPATH)/subsql cleanobj: Property changes on: head/databases/fastdb/files/patch-makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property