diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile index 1ec61394d208..4a6c4bfaf774 100644 --- a/databases/fastdb/Makefile +++ b/databases/fastdb/Makefile @@ -1,34 +1,36 @@ PORTNAME= fastdb PORTVERSION= 3.75 PORTREVISION= 8 CATEGORIES= databases MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Main Memory Relational Database Management System WWW= https://sourceforge.net/projects/fastdb/ LICENSE= MIT USES= gmake dos2unix USE_GCC= yes MAKE_ENV= OSTYPE="${OPSYS}" MAKEFILE= makefile USE_LDCONFIG= yes -DOS2UNIX_FILES= ${MAKEFILE} +DOS2UNIX_FILES= ${MAKEFILE} \ + inc/stdtp.h \ + src/unisock.cpp CXXFLAGS+= -D_WANT_SEMUN WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS PORTDOCS= FastDB.htm # The port does not build with C++11 or later (bug 219275). USE_CXXSTD= gnu++98 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${STAGEDIR}${DOCSDIR} .include diff --git a/databases/fastdb/files/patch-inc_stdtp.h b/databases/fastdb/files/patch-inc_stdtp.h new file mode 100644 index 000000000000..55231af64c76 --- /dev/null +++ b/databases/fastdb/files/patch-inc_stdtp.h @@ -0,0 +1,24 @@ +--- inc/stdtp.h.orig 2026-02-23 10:44:29 UTC ++++ inc/stdtp.h +@@ -339,21 +339,6 @@ typedef double real8; + + #define MAX_NAT8 nat8(-1) + +-#ifndef BIG_ENDIAN +-#define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */ +-#endif +-#ifndef LITTLE_ENDIAN +-#define LITTLE_ENDIAN 1234 +-#endif +- +-#ifndef BYTE_ORDER +-#if defined(__sparc__) || defined(__m68k__) +-#define BYTE_ORDER BIG_ENDIAN +-#else +-#define BYTE_ORDER LITTLE_ENDIAN +-#endif +-#endif +- + #ifdef _WIN32 + typedef HANDLE descriptor_t; + #else diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile index 03beab8ee91d..ba8266f84f0e 100644 --- a/databases/fastdb/files/patch-makefile +++ b/databases/fastdb/files/patch-makefile @@ -1,91 +1,91 @@ ---- makefile.orig 2014-12-28 21:25:00.000000000 +0200 -+++ makefile 2014-12-28 21:33:28.000000000 +0200 -@@ -8,13 +8,13 @@ DEBUG?=1 +--- makefile.orig 2026-02-23 10:43:46 UTC ++++ makefile +@@ -8,13 +8,13 @@ PREFIX ?= /usr/local PREFIX ?= /usr/local # Place where to copy FastDB header files -INCSPATH=$(PREFIX)/include/fastdb +INCSPATH=$(DESTDIR)$(PREFIX)/include/fastdb #Place where to copy Fastdb library -LIBSPATH=$(PREFIX)/lib +LIBSPATH=$(DESTDIR)$(PREFIX)/lib #Place where to copy Fastdb subsql utility -BINSPATH=$(PREFIX)/bin +BINSPATH=$(DESTDIR)$(PREFIX)/bin ifdef NO_PTHREADS OBJS = class.o compiler.o database.o xml.o hashtab.o file.o symtab.o ttree.o rtree.o container.o \ -@@ -38,8 +38,8 @@ TFLAGS=-DNO_PTHREADS +@@ -38,8 +38,8 @@ else THRLIBS= SUFF= else -TFLAGS=-pthread -THRLIBS=-pthread +TFLAGS=-D_REENTRANT +THRLIBS=-lpthread SUFF=_r endif -@@ -65,23 +65,23 @@ EXAMPLES = guess testdb testleak testfra +@@ -65,23 +65,23 @@ WEB_EXAMPLES = cgistub bugdb clidb WEB_EXAMPLES = cgistub bugdb clidb -CC = g++ +CC = ${CXX} # DEFS macro is deprecatred, edit config.h file instead DEFS = -Wno-invalid-offsetof -Wno-write-strings ifeq ($(DEBUG), 1) -CFLAGS = -c -Iinc -Wall -O0 -g -fPIC $(DEFS) $(TFLAGS) +CFLAGS = -c -Iinc ${CXXFLAGS} -fPIC $(DEFS) $(TFLAGS) else CFLAGS = -c -Iinc -Wall -O5 -g -fPIC $(DEFS) $(TFLAGS) endif -#SHFLAGS=-shared -Wl,-soname,$@ -SHFLAGS=-shared +SHFLAGS=-shared -Wl,-soname,$@ +#SHFLAGS=-shared LD = $(CC) -LDFLAGS = -g $(TFLAGS) +LDFLAGS = $(TFLAGS) AR = ar ARFLAGS = -cru -@@ -439,17 +439,15 @@ examples/TestIndex.class: examples/TestI +@@ -439,17 +439,15 @@ install: subsql cleanupsem inspectsem installlib install: subsql cleanupsem inspectsem installlib mkdir -p $(BINSPATH) - cp subsql $(BINSPATH) - strip $(BINSPATH)/subsql - cp cleanupsem $(BINSPATH) - cp inspectsem $(BINSPATH) -- + ${BSD_INSTALL_PROGRAM} subsql $(BINSPATH) + ${BSD_INSTALL_PROGRAM} cleanupsem $(BINSPATH) + ${BSD_INSTALL_PROGRAM} inspectsem $(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_LIB} $(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); \ -@@ -457,7 +455,7 @@ installlib: $(FASTDB_LIB) $(CLI_LIB) $(F +@@ -457,7 +455,7 @@ uninstall: uninstall: rm -fr $(INCSPATH) - cd $(LIBSPATH); rm -f $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(JNI_LIB) libfastdb$(SUFF).so libjnicli.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: diff --git a/databases/fastdb/files/patch-src_unisock.cpp b/databases/fastdb/files/patch-src_unisock.cpp new file mode 100644 index 000000000000..30696ff693d9 --- /dev/null +++ b/databases/fastdb/files/patch-src_unisock.cpp @@ -0,0 +1,10 @@ +--- src/unisock.cpp.orig 2026-02-23 10:43:56 UTC ++++ src/unisock.cpp +@@ -9,7 +9,6 @@ + //-------------------------------------------------------------------*--------* + + #include "unisock.h" +-#undef BYTE_ORDER + + #ifdef VXWORKS + #include "fastdbShim.h"