diff options
29 files changed, 3 insertions, 788 deletions
@@ -7017,3 +7017,5 @@ japanese/prime-dict||2014-09-06|Not staged japanese/scim-prime||2014-09-06|Cascade removal (japanese/prime dependency) graphics/povray31||2014-09-06|Not staged graphics/pvmpov||2014-09-06|Cascade removal (graphics/povray31) +databases/firebird21-server||2014-09-06|Not staged +databases/firebird21-client||2014-09-06|Not staged diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 310637d49d09..9f4342078fd3 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -540,9 +540,7 @@ FIREBIRD_VER= ${FIREBIRD_DEFAULT:S/.//} FIREBIRD_VER= ${USE_FIREBIRD} .endif -.if ${FIREBIRD_VER} == "21" -LIB_DEPENDS+= libfbclient.so:${PORTSDIR}/databases/firebird21-client -.elif ${FIREBIRD_VER} == "25" +.if ${FIREBIRD_VER} == "25" LIB_DEPENDS+= libfbclient.so:${PORTSDIR}/databases/firebird25-client .else IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} diff --git a/databases/Makefile b/databases/Makefile index 93a10abc3c3b..8ece21d65317 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -54,8 +54,6 @@ SUBDIR += erlang-mysql SUBDIR += evolution-data-server SUBDIR += fastdb - SUBDIR += firebird21-client - SUBDIR += firebird21-server SUBDIR += firebird25-client SUBDIR += firebird25-server SUBDIR += flamerobin diff --git a/databases/firebird21-client/Makefile b/databases/firebird21-client/Makefile deleted file mode 100644 index af4cc087c9b7..000000000000 --- a/databases/firebird21-client/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Created by: Max Kochubey <root@hangover.org.ru> -# $FreeBSD$ - -PORTNAME= firebird -PORTREVISION= 1 -PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}-client - -COMMENT= Firebird-2 database client - -MASTERDIR= ${.CURDIR}/../firebird21-server -BROKEN= Does not respect CC and hardcode gcc at some places - -PLIST= ${PKGDIR}/pkg-plist.client - -CLIENT_ONLY= yes - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile deleted file mode 100644 index 1fc2a85f753e..000000000000 --- a/databases/firebird21-server/Makefile +++ /dev/null @@ -1,234 +0,0 @@ -# Created by: Max Kochubey <root@hangover.org.ru> -# $FreeBSD$ - -PORTNAME= firebird -PORTVERSION= 2.1.5 -PORTREVISION?= 2 -CATEGORIES?= databases -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/ -PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server -DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.18497-0 -DIST_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT?= Firebird-2 relational database (server) - -CONFLICTS?= ${PORTNAME}20-client-* \ - ${PORTNAME}25-client-* \ - ${PORTNAME}20-server-* \ - ${PORTNAME}25-server-* - -LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu - -USES= bison gmake tar:bzip2 -USE_GCC= any -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf aclocal libtool -ACLOCAL_ARGS= --automake-acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \ - -I ${WRKSRC}/m4 -MAKE_JOBS_UNSAFE= yes - -LOCALSTATEDIR= /var/db/firebird -CONFDIR= ${PREFIX}/etc/firebird -LIBEXECDIR= ${PREFIX}/libexec/firebird -PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ - LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird" - -# Don't use ld for linking, use gcc -LD= ${CC} - -# Don't strip binary files -STRIP= - -ONLY_FOR_ARCHS= i386 amd64 -CONFLICTS+= firebird-client-2.0* firebird-server-2.0* \ - firebird-client-2.5* firebird-server-2.5* - -INSTALL_FB= ${INSTALL} ${COPY} -g firebird -IPCRM_CMD= /usr/bin/ipcrm -IPCS_CMD= /usr/bin/ipcs - -IPCCHECK!= ${IPCRM_CMD} -q 0 2>&1 || true -.if ${IPCCHECK:Mimplemented} -IGNORE= your system does not support sysvipc -.endif - -.if !defined(CLIENT_ONLY) -# Server part stuff -LIB_DEPENDS+= libfbembed.so:${PORTSDIR}/databases/firebird21-client - -AUTOGENARGS= --without-editline --with-lock-manager - -ALL_TARGET= firebird_boot ref_databases msgs libfbembed intl otherfiles \ - inet_server extlib embed_gfix embed_gbak embed_gdef embed_util \ - embed_fbudf - -SUB_FILES= pkg-message aliases.conf - -UTIL_BIN= fb_inet_server fb_lock_print fbstat gbak gdef gfix gsec nbackup -UDF_SO= ib_udf.so fbudf.so -UDF_SQL= src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql - -PKGINSTALL?= ${PKGDIR}/pkg-install-server -.else -# Client part stuff -AUTOGENARGS= --without-editline - -ALL_TARGET= firebird_basic libfbembed embed_isql embed_gpre \ - embed_gdef embed_qli libfbclient extlib - -USE_LDCONFIG= yes -CLIENT_BIN= gpre isql-fb qli - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -FB_DOCS_FILES= WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \ - ods11-index-structure.html -FB_DOCS_DIRS= sql.extensions license upgrade -.endif -.endif - -MAKE_ENV+= FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}" - -OPTIONS_DEFINE= DOCS - -NO_STAGE= yes -post-extract: - @${RM} -rf ${WRKSRC}/extern/icu - -post-patch: - @${MKDIR} ${WRKSRC}/m4 - ${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4 - ${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+ - ${REINPLACE_CMD} -e \ - 's|/isql|/isql-fb|g' -e \ - 's|/gstat|/fbstat|g' ${WRKSRC}/builds/posix/make.defaults - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" -CFLAGS+= -DAMD64 -.endif - -.if !defined(CLIENT_ONLY) - -USERS= ${PORTNAME} -GROUPS= ${USERS} - -post-install: - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} -.endif - -.ifndef WITHOUT_IPC_CLEANUP -pre-build: -.if !defined(CLIENT_ONLY) - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - ${MAKE} -C ${WRKSRC}/extern/btyacc - [ -f ${WRKDIR}/ipcs.pre.build ] || ${IPCS_CMD} -s | ${TAIL} -n +3 | \ - ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build - -post-build: - ${IPCS_CMD} -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build - ${DIFF} -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build | \ - ${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh - ${SH} ${WRKDIR}/ipcrm.sh -.endif - -do-configure: - @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} MAKE=${MAKE_CMD} \ - ${AUTOTOOLS_VARS} ./autogen.sh --localstatedir=${LOCALSTATEDIR} \ - --prefix=${LOCALSTATEDIR} --exec-prefix=${PREFIX} \ - --libexecdir=${LIBEXECDIR} \ - --sysconfdir=${CONFDIR} --datadir=${DATADIR} \ - --with-icu-config=${LOCALBASE}/bin/icu-config \ - ${AUTOGENARGS}) - -do-install: -.if !defined(CLIENT_ONLY) - - ${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin - ${INSTALL_PROGRAM} -o root -g firebird -m 4550 ${WRKSRC}/gen/firebird/bin/fb_lock_mgr ${PREFIX}/bin - ${INSTALL_PROGRAM} -m 500 ${WRKSRC}/gen/firebird/bin/gds_drop ${PREFIX}/bin - - @${MKDIR} ${CONFDIR} - ${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf.sample -.if !exists(${CONFDIR}/aliases.conf) - ${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf -.endif - - ${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl - - ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} - - ${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LIBEXECDIR}/udf - ${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${LIBEXECDIR}/udf - -.if !exists(${LOCALSTATEDIR}/security2.fdb) - ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb ${LOCALSTATEDIR}/security2.fdb -.endif - ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb ${LOCALSTATEDIR}/security2.fdb.sample - - ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${LOCALSTATEDIR}/help - - ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LIBEXECDIR}/intl/fbintl -.if !exists(${CONFDIR}/fbintl.conf) - ${INSTALL_FB} -m 0444 ${WRKSRC}/gen/firebird/misc/fbintl.conf ${CONFDIR} -.endif - ${INSTALL_FB} -m 0444 ${WRKSRC}/gen/firebird/misc/fbintl.conf ${CONFDIR}/fbintl.conf.sample -.else -# defined CLIENT_ONLY - ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin - - ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/firebird/misc/firebird.conf > ${WRKDIR}/firebird.conf - - @${MKDIR} ${CONFDIR} -.if !exists(${CONFDIR}/firebird.conf) - ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR} -.endif - ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}/firebird.conf.sample - - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \ - ${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \ - ${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \ - ${PREFIX}/lib - - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2.1 - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2 - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so - - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2.1 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so - - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2.1 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so - - @${MKDIR} ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include - - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${DATADIR} - -.if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" - @${MKDIR} ${FB_DOCS_DIRS:S!^!${DOCSDIR}/!} - @${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${DOCSDIR} - @${LN} -sf ${DOCSDIR}/README.user ${DOCSDIR}/README - @${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${DOCSDIR}/sql.extensions - @${INSTALL_DATA} ${WRKSRC}/doc/license/* ${DOCSDIR}/license - @${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${DOCSDIR}/upgrade -.endif -.endif - -.include <bsd.port.post.mk> diff --git a/databases/firebird21-server/distinfo b/databases/firebird21-server/distinfo deleted file mode 100644 index 6de66455515b..000000000000 --- a/databases/firebird21-server/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (firebird/Firebird-2.1.5.18497-0.tar.bz2) = 8eaf5910ccee12af8f6abc17747cdea2c3ff4e6bee381a870d192679a44f83eb -SIZE (firebird/Firebird-2.1.5.18497-0.tar.bz2) = 14057151 diff --git a/databases/firebird21-server/files/aliases.conf.in b/databases/firebird21-server/files/aliases.conf.in deleted file mode 100644 index ded23bfd70cb..000000000000 --- a/databases/firebird21-server/files/aliases.conf.in +++ /dev/null @@ -1,9 +0,0 @@ -# -# List of known database aliases -# ------------------------------ -# -# Examples: -# -# employee = %%EXAMPLESDIR%%/employee.fdb -# security = /var/db/firebird/security2.fdb -# diff --git a/databases/firebird21-server/files/icu.m4 b/databases/firebird21-server/files/icu.m4 deleted file mode 100644 index 37d0f8a08c40..000000000000 --- a/databases/firebird21-server/files/icu.m4 +++ /dev/null @@ -1,46 +0,0 @@ -dnl AM_PATH_ICU([MINIMUM-VERSION]) -dnl Adds support for ICU -AC_DEFUN([AM_PATH_ICU], -[ - rast_lib_icu_major="$1" - rast_lib_icu_minor="$2" - rast_lib_icu_version="$1.$2" - - AC_ARG_WITH(icu-config, - AC_HELP_STRING([--with-icu-config=PATH],[path to icu-config]), - [ - AC_MSG_RESULT(using $withval for icu-config) - ICU_CONFIG="$withval" - ], [ - AC_PATH_PROG(ICU_CONFIG, icu-config, no) - ]) - HAVE_ICU="no" - if test "$ICU_CONFIG" != "no"; then - AC_MSG_CHECKING([ICU version]) - ICU_VERSION="`$ICU_CONFIG --version`" - if test $? -eq 0; then - changequote(<<, >>) - ICU_MAJOR=`expr "$ICU_VERSION" : '\(.*\)\..*'` - ICU_MINOR=`expr "$ICU_VERSION" : '.*\.\(.*\)'` - changequote([, ]) - if expr "$ICU_MAJOR" '>' "$rast_lib_icu_major" > /dev/null || - ( expr "$ICU_MAJOR" '=' "$rast_lib_icu_major" > /dev/null && - expr "$ICU_MINOR" '>=' "$rast_lib_icu_minor" > /dev/null ); then - AC_MSG_RESULT([$ICU_VERSION]) - - ICU_CPPFLAGS=`$ICU_CONFIG --cppflags` - ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly` - ICU_LDFLAGS=`$ICU_CONFIG --ldflags-searchpath` - AC_SUBST(ICU_CPPFLAGS) - AC_SUBST(ICU_LIBS) - AC_SUBST(ICU_LDFLAGS) - HAVE_ICU="yes" - else - AC_MSG_WARN([$ICU_VERSION is too old; $rast_lib_icu_version is required]) - fi - else - AC_MSG_WARN([icu-config --version failed]) - fi - fi - AC_SUBST(HAVE_ICU) -]) diff --git a/databases/firebird21-server/files/patch-autogen.sh b/databases/firebird21-server/files/patch-autogen.sh deleted file mode 100644 index 891c077fd261..000000000000 --- a/databases/firebird21-server/files/patch-autogen.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- autogen.sh.orig 2010-09-08 15:44:05.000000000 +0700 -+++ autogen.sh 2010-10-18 13:37:36.000000000 +0700 -@@ -63,7 +63,7 @@ - fi - - echo "Running autoreconf ..." --$AUTORECONF --install --force --verbose || exit 1 -+$AUTORECONF --install --force --verbose -I ./m4 || exit 1 - - # Hack to bypass bug in autoreconf - --install switch not passed to libtoolize, - # therefore missing config.sub and confg.guess files diff --git a/databases/firebird21-server/files/patch-builds%install%misc%firebird.conf b/databases/firebird21-server/files/patch-builds%install%misc%firebird.conf deleted file mode 100644 index d0105af83cf6..000000000000 --- a/databases/firebird21-server/files/patch-builds%install%misc%firebird.conf +++ /dev/null @@ -1,20 +0,0 @@ ---- builds/install/misc/firebird.conf.orig Tue Aug 15 22:38:52 2006 -+++ builds/install/misc/firebird.conf Tue Aug 15 22:39:24 2006 -@@ -60,7 +60,7 @@ - # - # Type: string - # --#RootDirectory = -+#RootDirectory = /var/db/firebird - - - # ---------------------------- -@@ -125,7 +125,7 @@ - # - # Type: string (special format) - # --#UdfAccess = Restrict UDF -+UdfAccess = Restrict %%PREFIX%%/libexec/firebird/udf - - - # ---------------------------- diff --git a/databases/firebird21-server/files/patch-builds%posix%Makefile.in.firebird b/databases/firebird21-server/files/patch-builds%posix%Makefile.in.firebird deleted file mode 100644 index 12922fd739aa..000000000000 --- a/databases/firebird21-server/files/patch-builds%posix%Makefile.in.firebird +++ /dev/null @@ -1,45 +0,0 @@ ---- builds/posix/Makefile.in.firebird.orig 2008-12-10 21:22:15.000000000 +0600 -+++ builds/posix/Makefile.in.firebird 2010-10-19 12:36:20.000000000 +0700 -@@ -185,9 +185,6 @@ - # - - external_libraries: --ifeq ($(STD_ICU),false) -- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu --endif - ifeq ($(STD_EDITLINE),false) - ifeq ($(EDITLINE_FLG),Y) - $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline -@@ -519,12 +516,12 @@ - #___________________________________________________________________________ - # - .PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \ -- clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \ -+ clean_gpre_gen clean_dbs clean_examples clean_makefiles \ - clean_editline clean_all - - - clean: clean_objects clean_dependancies clean_extern_objects clean_build \ -- clean_yacc_gen clean_gpre_gen clean_icu clean_dbs clean_examples -+ clean_yacc_gen clean_gpre_gen clean_dbs clean_examples - - ifeq ($(EDITLINE_FLG),Y) - clean: clean_editline -@@ -538,7 +535,6 @@ - $(RM) $(ROOT)/libtool - $(RM_R) $(ROOT)/autom4te.cache - -make -C $(ROOT)/extern/editline distclean -- -make -C $(ROOT)/extern/icu/source distclean - -make -C $(ROOT)/extern/btyacc distclean - - clean_dbs: -@@ -551,9 +547,6 @@ - clean_editline: - -make -C $(ROOT)/extern/editline clean - --clean_icu: -- -make -C $(ROOT)/extern/icu/source clean -- - clean_objects: - $(RM) `find $(TMP_ROOT)/ -type f -name '*.o' -print` - diff --git a/databases/firebird21-server/files/patch-builds%posix%make.defaults b/databases/firebird21-server/files/patch-builds%posix%make.defaults deleted file mode 100644 index d63c0988bf4b..000000000000 --- a/databases/firebird21-server/files/patch-builds%posix%make.defaults +++ /dev/null @@ -1,40 +0,0 @@ ---- builds/posix/make.defaults 2008-09-04 06:47:18.000000000 -0500 -+++ builds/posix/make.defaults 2010-12-18 19:51:28.000000000 -0500 -@@ -118,7 +118,7 @@ - CHMOD= chmod - CHMOD_6= chmod 666 - CHMOD_7= chmod 777 --CHMOD_S7= chmod 06777 -+CHMOD_S7= chmod 04555 - MV= mv -f - TOUCH= touch - CP= cp -@@ -162,7 +162,7 @@ - STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) - - LINK_LIBS = @LIBS@ --ICU_LIBS = -licuuc -licudata -licui18n -+ICU_LIBS = @ICU_LIBS@ @ICU_LDFLAGS@ - STATICLINK_LIBS = @LIBS@ - SO_LINK_LIBS = @LIBS@ - -@@ -239,10 +239,6 @@ - endif - endif - --LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \ -- $(LIB)/$(LIB_PREFIX)icudata.$(SHRLIB_EXT) \ -- $(LIB)/$(LIB_PREFIX)icui18n.$(SHRLIB_EXT) -- - # Shared library name for usage inside of the UDF - IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT) - LIBIBUTIL_SO = $(LIB)/$(IbUtilLibraryName) -@@ -268,7 +264,7 @@ - FB_SUPER_SERVER = $(BIN)/fbserver$(EXEC_EXT) - FB_CLASSIC_SERVER = $(BIN)/fb_inet_server$(EXEC_EXT) - --STATIC_CXXSUPPORT_LIB = -lsupc++ -lgcc_eh -+STATIC_CXXSUPPORT_LIB = -lstdc++ -lgcc_s -lgcc_eh - - # From utilities - CREATE_DB = $(BIN)/create_db$(EXEC_EXT) diff --git a/databases/firebird21-server/files/patch-builds%posix%make.rules b/databases/firebird21-server/files/patch-builds%posix%make.rules deleted file mode 100644 index e435c59b116a..000000000000 --- a/databases/firebird21-server/files/patch-builds%posix%make.rules +++ /dev/null @@ -1,13 +0,0 @@ ---- builds/posix/make.rules.orig 2008-12-10 07:03:31.000000000 +0600 -+++ builds/posix/make.rules 2010-10-19 12:40:17.000000000 +0700 -@@ -33,9 +33,7 @@ - - # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002 - CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan --ifeq ($(STD_ICU),false) -- CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n --endif -+CFLAGS:= $(CFLAGS) @ICU_CPPFLAGS@ - - ifeq ($(IsProdTypeBuild),Y) - CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD diff --git a/databases/firebird21-server/files/patch-builds-posix_empty.vers b/databases/firebird21-server/files/patch-builds-posix_empty.vers deleted file mode 100644 index 204bd00acf21..000000000000 --- a/databases/firebird21-server/files/patch-builds-posix_empty.vers +++ /dev/null @@ -1,11 +0,0 @@ ---- builds/posix/empty.vers 2013-03-23 02:37:17.000000000 -0500 -+++ builds/posix/empty.vers 2013-03-23 02:37:33.000000000 -0500 -@@ -27,6 +27,8 @@ - { - global: - main; -+ __progname; -+ environ; - - local: - *; diff --git a/databases/firebird21-server/files/patch-configure.in b/databases/firebird21-server/files/patch-configure.in deleted file mode 100644 index 74f876aa487c..000000000000 --- a/databases/firebird21-server/files/patch-configure.in +++ /dev/null @@ -1,50 +0,0 @@ ---- configure.in.orig 2009-06-05 16:50:33.000000000 +0700 -+++ configure.in 2010-10-19 12:42:22.000000000 +0700 -@@ -721,6 +721,7 @@ - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - fi -+AM_PATH_ICU(3, 6) - - AC_CHECK_SIZEOF(void *) - AC_CHECK_SIZEOF(long) -@@ -905,6 +906,10 @@ - AC_SUBST(NEW_FIREBIRD_DIR) - - AC_DEFINE_UNQUOTED(FB_PREFIX, $(if test "x$prefix" = "xNONE" ; then echo \"$ac_default_prefix\"; else echo \"$prefix\"; fi), [Installation path prefix]) -+AC_DEFINE_UNQUOTED(FB_EXEC_PREFIX, "$exec_prefix", [Executables path prefix]) -+AC_DEFINE_UNQUOTED(FB_CONF_PREFIX, "$sysconfdir", [Single-machine data path prefix]) -+AC_DEFINE_UNQUOTED(FB_MSG_PREFIX, "$datadir", [Architecture-independent data path prefix]) -+AC_DEFINE_UNQUOTED(FB_LIBEXEC_PREFIX, "$libexecdir", [Program executables path prefix]) - - AC_CONFIG_COMMANDS(,,[ - dnl # rebuild version header if needed -@@ -1267,9 +1272,6 @@ - if test "$STD_EDITLINE" = "false"; then - AC_CONFIG_FILES(gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline) - fi --if test "$STD_ICU" = "false"; then -- AC_CONFIG_FILES(gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu) --fi - - case "$PLATFORM" in - SOLARIS | solx86 ) -@@ -1280,18 +1282,7 @@ - esac - - --if test "$PROD_BUILD_FLG" = N; then -- DEBUG_ICU=--enable-debug --fi -- --if test "$STD_ICU" = "true"; then - AC_OUTPUT --else --AC_OUTPUT --(cd extern/icu/source --chmod +x runConfigureICU configure install-sh --./runConfigureICU "$ICU_PLATFORM" "$DEBUG_ICU" --prefix=`pwd`/..) --fi - - dnl Print out the build configuration (the most interesting thing) - echo diff --git a/databases/firebird21-server/files/patch-extern-btyacc_Makefile b/databases/firebird21-server/files/patch-extern-btyacc_Makefile deleted file mode 100644 index 7a242d7a06be..000000000000 --- a/databases/firebird21-server/files/patch-extern-btyacc_Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- extern/btyacc/Makefile 2013-10-03 02:19:05.000000000 -0500 -+++ extern/btyacc/Makefile 2013-10-03 02:19:21.000000000 -0500 -@@ -8,14 +8,14 @@ - - HDRS = defs.h mstring.h - --CFLAGS = -g -Wall -Wstrict-prototypes -Wmissing-prototypes -+CFLAGS += -g -Wall -Wstrict-prototypes -Wmissing-prototypes - - #LDFLAGS = -static - - LIBS = - --CC = gcc --LINKER = gcc -+CC ?= gcc -+LINKER ?= gcc - # LINKER = cl - # CC = cl - diff --git a/databases/firebird21-server/files/patch-src%common%config%config.cpp b/databases/firebird21-server/files/patch-src%common%config%config.cpp deleted file mode 100644 index b05adf508983..000000000000 --- a/databases/firebird21-server/files/patch-src%common%config%config.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/config/config.cpp.orig Tue Aug 15 22:53:43 2006 -+++ src/common/config/config.cpp Tue Aug 15 22:54:38 2006 -@@ -111,7 +111,7 @@ - {TYPE_STRING, "RemoteBindAddress", (ConfigValue) 0}, - {TYPE_STRING, "ExternalFileAccess", (ConfigValue) "None"}, // location(s) of external files for tables - {TYPE_STRING, "DatabaseAccess", (ConfigValue) "Full"}, // location(s) of databases -- {TYPE_STRING, "UdfAccess", (ConfigValue) "Restrict UDF"}, // location(s) of UDFs -+ {TYPE_STRING, "UdfAccess", (ConfigValue) "Restrict " FB_LIBEXEC_PREFIX "/UDF"}, // location(s) of UDFs - {TYPE_STRING, "TempDirectories", (ConfigValue) 0}, - #ifdef DEV_BUILD - {TYPE_BOOLEAN, "BugcheckAbort", (ConfigValue) true}, // whether to abort() engine when internal error is found diff --git a/databases/firebird21-server/files/patch-src%jrd%db_alias.cpp b/databases/firebird21-server/files/patch-src%jrd%db_alias.cpp deleted file mode 100644 index 27f7d6dc114d..000000000000 --- a/databases/firebird21-server/files/patch-src%jrd%db_alias.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/jrd/db_alias.cpp.orig Tue Aug 15 23:07:31 2006 -+++ src/jrd/db_alias.cpp Tue Aug 15 23:10:08 2006 -@@ -33,8 +33,8 @@ - - bool ResolveDatabaseAlias(const string& alias, string& database) - { -- string alias_filename; -- Firebird::Prefix(alias_filename, ALIAS_FILE); -+ string alias_filename = string(FB_CONF_PREFIX) -+ + PathUtils::dir_sep + ALIAS_FILE; - ConfigFile aliasConfig(false); - aliasConfig.setConfigFilePath(alias_filename); - diff --git a/databases/firebird21-server/files/patch-src%jrd%gds.cpp b/databases/firebird21-server/files/patch-src%jrd%gds.cpp deleted file mode 100644 index f22bc183629e..000000000000 --- a/databases/firebird21-server/files/patch-src%jrd%gds.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/jrd/gds.cpp.orig Tue Aug 15 22:49:37 2006 -+++ src/jrd/gds.cpp Tue Aug 15 22:50:14 2006 -@@ -3734,7 +3734,7 @@ - Firebird::PathName msgPrefix; - if (!fb_utils::readenv(FB_MSG_ENV, msgPrefix)) - { -- msgPrefix = prefix; -+ msgPrefix = FB_MSG_PREFIX; - } - msgPrefix.copyTo(ib_prefix_msg_val, sizeof(ib_prefix_msg_val)); - ib_prefix_msg = ib_prefix_msg_val; diff --git a/databases/firebird21-server/files/patch-src%jrd%os%config_root.h b/databases/firebird21-server/files/patch-src%jrd%os%config_root.h deleted file mode 100644 index 976da187b36a..000000000000 --- a/databases/firebird21-server/files/patch-src%jrd%os%config_root.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/jrd/os/config_root.h.orig Tue Aug 15 22:57:33 2006 -+++ src/jrd/os/config_root.h Tue Aug 15 22:57:53 2006 -@@ -76,7 +76,7 @@ - { - GetRoot(); - install_dir = root_dir; -- config_file = root_dir + string(CONFIG_FILE); -+ config_file = string(FB_CONF_PREFIX) + PathUtils::dir_sep + string(CONFIG_FILE); - } - - diff --git a/databases/firebird21-server/files/patch-src%jrd%plugin_manager.cpp b/databases/firebird21-server/files/patch-src%jrd%plugin_manager.cpp deleted file mode 100644 index 7a2ffab72408..000000000000 --- a/databases/firebird21-server/files/patch-src%jrd%plugin_manager.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/jrd/plugin_manager.cpp.orig Tue Aug 15 23:11:04 2006 -+++ src/jrd/plugin_manager.cpp Tue Aug 15 23:12:01 2006 -@@ -64,7 +64,7 @@ - void PluginManager::loadAllPlugins() - { - Firebird::PathName checkDir; -- const Firebird::PathName fbLibPath = Config::getRootDirectory(); -+ const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX; - - for (spIterator pathItr = searchPaths.begin(); pathItr != searchPaths.end(); ++pathItr) - { -@@ -131,7 +131,7 @@ - PluginManager::Module *PluginManager::loadPluginModule(const Firebird::PathName& name) - { - Firebird::PathName checkPath; -- const Firebird::PathName fbLibPath = Config::getRootDirectory(); -+ const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX; - - // Check to see if the module name was specified as a relative path - // from one of our search paths. This only makes sense if the name diff --git a/databases/firebird21-server/files/patch-src%jrd%svc.cpp b/databases/firebird21-server/files/patch-src%jrd%svc.cpp deleted file mode 100644 index a76b1568b036..000000000000 --- a/databases/firebird21-server/files/patch-src%jrd%svc.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- src/jrd/svc.cpp.orig Mon Jul 31 11:43:28 2006 -+++ src/jrd/svc.cpp Wed Nov 15 16:56:13 2006 -@@ -583,7 +583,8 @@ - { - #ifndef SERVICE_THREAD - TEXT service_path[MAXPATHLEN]; -- gds__prefix(service_path, serv->serv_executable); -+ strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN); -+ strlcat(service_path, serv->serv_executable, MAXPATHLEN); - service_fork(service_path, service); - #else - /* if service is single threaded, only call if not currently running */ -@@ -1742,7 +1743,8 @@ - TEXT service_path[MAXPATHLEN]; - - if (serv->serv_executable) { -- gds__prefix(service_path, serv->serv_executable); -+ strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN); -+ strlcat(service_path, serv->serv_executable, MAXPATHLEN); - service->svc_flags = SVC_forked; - service_fork(service_path, service); - } diff --git a/databases/firebird21-server/files/patch-src%lock%lock.cpp b/databases/firebird21-server/files/patch-src%lock%lock.cpp deleted file mode 100644 index 279324733739..000000000000 --- a/databases/firebird21-server/files/patch-src%lock%lock.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/lock/lock.cpp.orig Fri Feb 3 16:13:23 2006 -+++ src/lock/lock.cpp Wed Aug 16 12:41:32 2006 -@@ -2708,7 +2708,12 @@ - #ifdef DEBUG_MANAGER - gds__prefix(string, DEBUG_MANAGER); - #else -- gds__prefix(string, LOCK_MANAGER); -+ if (! getenv("FIREBIRD")) { -+ strlcpy(string, FB_EXEC_PREFIX "/", MAXPATHLEN); -+ strlcat(string, LOCK_MANAGER, MAXPATHLEN); -+ } else { -+ gds__prefix(string, LOCK_MANAGER); -+ } - #endif - if (statistics(string, &stat_buf) == -1) { - // bug() fills the vector with this address, it must be static. diff --git a/databases/firebird21-server/files/patch-src+jrd+IntlManager.cpp b/databases/firebird21-server/files/patch-src+jrd+IntlManager.cpp deleted file mode 100644 index c918181dce4f..000000000000 --- a/databases/firebird21-server/files/patch-src+jrd+IntlManager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/jrd/IntlManager.cpp.orig Tue Nov 21 16:24:19 2006 -+++ src/jrd/IntlManager.cpp Tue Nov 21 16:30:40 2006 -@@ -78,7 +78,7 @@ - #endif - - Firebird::PathName intlPath; -- PathUtils::concatPath(intlPath, Config::getRootDirectory(), "intl"); -+ PathUtils::concatPath(intlPath, FB_LIBEXEC_PREFIX, "intl"); - - ScanDir dir(intlPath.c_str(), "*.conf"); - diff --git a/databases/firebird21-server/files/pkg-message.in b/databases/firebird21-server/files/pkg-message.in deleted file mode 100644 index 3d098ff99886..000000000000 --- a/databases/firebird21-server/files/pkg-message.in +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################### - -Firebird was installed. - -1) Before start the server ensure that the following line exists in /etc/services: - -gds_db 3050/tcp #InterBase Database Remote Protocol - -2) If you use inetd then add the following line to /etc/inetd.conf - -gds_db stream tcp nowait firebird %%PREFIX%%/bin/fb_inet_server fb_inet_server - -And finally restart inetd. - -3) It is STRONGLY recommended that you change the SYSDBA -password with: - -% gsec -user SYSDBA -pass masterkey -GSEC> modify SYSDBA -pw newpassword -GSEC> quit - -before doing anything serious with Firebird. - -4) See documentation in %%DOCSDIR%%/ for more information. -5) Enjoy it ;) - -################################################################################ diff --git a/databases/firebird21-server/pkg-descr b/databases/firebird21-server/pkg-descr deleted file mode 100644 index ed76025f94b8..000000000000 --- a/databases/firebird21-server/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Firebird is a relational database offering many ANSI SQL-99 features -that runs on Linux, Windows, and a variety of Unix platforms. Firebird -offers excellent concurrency, high performance, and powerful language -support for stored procedures and triggers. It has been used in -production systems, under a variety of names since 1981. - -Firebird is completely free of any registration, licensing or deployment -fees. It may be deployed freely for use with any third-party software, -whether commercial or not. - -WWW: http://sourceforge.net/projects/firebird/ -WWW: http://www.firebirdsql.org/ diff --git a/databases/firebird21-server/pkg-install-server b/databases/firebird21-server/pkg-install-server deleted file mode 100644 index 582b1f677808..000000000000 --- a/databases/firebird21-server/pkg-install-server +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -# $FreeBSD: /tmp/pcvs/ports/databases/firebird21-server/files/pkg-install.in,v 1.1 2010-12-20 09:05:05 acm Exp $ - -PATH=/bin:/usr/bin:/usr/sbin - -buildwarning() { -cat <<EOF -############################################################################### - - ** IMPORTANT ** - -Keep in mind that if you build firebird server as 'root', this may cause -conflicts with SysV semaphores of running services. - -If you want to cancel it, press ctrl-C now if you need check some things -before of build it. - -############################################################################### -EOF - sleep 5 -} - -case $2 in -PRE-INSTALL) - buildwarning -;; - -POST-INSTALL) -cd /var/db/firebird - -# Lock files - -for i in isc_init1 isc_lock1 isc_event1 -do - FileName=$i.`hostname` - touch $FileName - chmod uga=rw $FileName - chown firebird:firebird $FileName -done - -touch firebird.log -chown firebird:firebird firebird.log security2.fdb - -;; - -esac diff --git a/databases/firebird21-server/pkg-plist b/databases/firebird21-server/pkg-plist deleted file mode 100644 index 0930ac018dd2..000000000000 --- a/databases/firebird21-server/pkg-plist +++ /dev/null @@ -1,36 +0,0 @@ -bin/fb_inet_server -bin/fb_lock_mgr -bin/fb_lock_print -bin/fbstat -bin/gbak -bin/gdef -bin/gds_drop -bin/gfix -bin/gsec -bin/nbackup -libexec/firebird/intl/fbintl -libexec/firebird/udf/fbudf.so -libexec/firebird/udf/fbudf.sql -libexec/firebird/udf/ib_udf.so -libexec/firebird/udf/ib_udf2.sql -@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true -%%CONFDIR%%/aliases.conf.sample -@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf -@unexec (cmp -s %D/%%CONFDIR%%/fbintl.conf %D/%%CONFDIR%%/fbintl.conf.sample && rm -f %D/%%CONFDIR%%/fbintl.conf) || true -%%CONFDIR%%/fbintl.conf.sample -@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf -@dirrmtry %%CONFDIR%% -@dirrm libexec/firebird/intl -@dirrm libexec/firebird/udf -@dirrm libexec/firebird -@cwd / -@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security2.fdb %D/%%LOCALSTATEDIR%%/security2.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security2.fdb) || true -%%LOCALSTATEDIR%%/security2.fdb.sample -@exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb -%%LOCALSTATEDIR%%/help/help.fdb -@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log -@rmtry %%LOCALSTATEDIR%%/isc_event1.`hostname` -@rmtry %%LOCALSTATEDIR%%/isc_init1.`hostname` -@rmtry %%LOCALSTATEDIR%%/isc_lock1.`hostname` -@dirrm %%LOCALSTATEDIR%%/help -@dirrmtry %%LOCALSTATEDIR%% diff --git a/databases/firebird21-server/pkg-plist.client b/databases/firebird21-server/pkg-plist.client deleted file mode 100644 index 4d0287323d57..000000000000 --- a/databases/firebird21-server/pkg-plist.client +++ /dev/null @@ -1,27 +0,0 @@ -bin/gpre -bin/isql-fb -bin/qli -include/ib_util.h -include/ibase.h -include/iberror.h -include/perf.h -lib/libfbclient.so -lib/libfbclient.so.2 -lib/libfbclient.so.2.1 -lib/libfbclient.so.%%FIREBIRD_VERSION%% -lib/libfbembed.so -lib/libfbembed.so.2 -lib/libfbembed.so.2.1 -lib/libfbembed.so.%%FIREBIRD_VERSION%% -lib/libgds.so -lib/libgds.so.2 -lib/libgds.so.2.1 -lib/libib_util.so -@unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi -%%CONFDIR%%/firebird.conf.sample -@exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf -@dirrmtry %%CONFDIR%% -%%DATADIR%%/de_DE.msg -%%DATADIR%%/firebird.msg -%%DATADIR%%/fr_FR.msg -@dirrm %%DATADIR%% |