freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename databases/firebird2-* to databases/firebird20-*

Browse Source
This commit is contained in:
Sergey Skvortsov
2008-11-24 06:22:36 +00:00
parent b8c34bedd8
commit 18c5d4f355
32 changed files with 22 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MOVED
View File

@@ -3663,3 +3663,5 @@ security/libfwbuilder2|security/libfwbuilder|2008-11-05|replaced by libfwbuilder
security/fwbuilder2|security/fwbuilder|2008-11-05|replaced by fwbuilder 3.0
japanese/magicpoint|misc/magicpoint|2008-11-07|Integrated into misc/magicpoint
x11-drivers/xf86-input-wacom|x11-drivers/input-wacom|2008-11-18|Port was renamed
databases/firebird2-client|databases/firebird20-client|2008-11-24|Renamed
databases/firebird2-server|databases/firebird20-server|2008-11-24|Renamed

6
Mk/bsd.database.mk
View File

@@ -435,13 +435,15 @@ USE_FIREBIRD= ${WITH_FIREBIRD_VER}
.endif
.if ${USE_FIREBIRD:L} == "yes"
FIREBIRD_VER= 2
FIREBIRD_VER= 20
.else
FIREBIRD_VER= ${USE_FIREBIRD}
.endif
.if ${FIREBIRD_VER} == "2"
LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird2-client
LIB_DEPENDS+= fbclient.2.0:${PORTSDIR}/databases/firebird20-client
.if ${FIREBIRD_VER} == "20"
LIB_DEPENDS+= fbclient.2.0:${PORTSDIR}/databases/firebird20-client
.elif ${FIREBIRD_VER} == "1"
LIB_DEPENDS+= fbclient.1:${PORTSDIR}/databases/firebird-client
.else

4
databases/Makefile
View File

@@ -54,8 +54,8 @@
SUBDIR += fastdb
SUBDIR += firebird-client
SUBDIR += firebird-server
SUBDIR += firebird2-client
SUBDIR += firebird2-server
SUBDIR += firebird20-client
SUBDIR += firebird20-server
SUBDIR += fireprofile
SUBDIR += flamerobin
SUBDIR += fortytwo-bdb

19
databases/firebird2-client/Makefile
View File

@@ -1,19 +0,0 @@
# New ports collection makefile for: firebird2-client
# Date created: 15 August 2006
# Whom: Sergey Skvortsov <skv@protey.ru>
#
# $FreeBSD$
#
PORTNAME= firebird
PKGNAMESUFFIX= -client
COMMENT= Firebird-2 database client
MASTERDIR= ${.CURDIR}/../firebird2-server
PLIST= ${PKGDIR}/pkg-plist.client
CLIENT_ONLY= yes
.include "${MASTERDIR}/Makefile"

230
databases/firebird2-server/Makefile
View File

@@ -1,230 +0,0 @@
# New ports collection makefile for: firebird2-server
# Date created: 15 August 2006
# Whom: Sergey Skvortsov <skv@protey.ru>
#
# $FreeBSD$
#
PORTNAME?= firebird
PORTVERSION= 2.0.3
PORTREVISION= 2
CATEGORIES?= databases
MASTER_SITES= SF
MASTER_SITE_SUBDIR=firebird
PKGNAMESUFFIX?= -server
DISTNAME= Firebird-2.0.3.12981-1
MAINTAINER= skv@FreeBSD.org
COMMENT?= Firebird-2 relational database (server)
LATEST_LINK= ${PORTNAME}2${PKGNAMESUFFIX}
USE_BISON= build
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:262 aclocal:19 libtool:15
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
-I ${WRKSRC}/m4
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-1* firebird-server-1*
INSTALL_FB= ${INSTALL} ${COPY} -g firebird
.if !defined(CLIENT_ONLY)
# Server part stuff
LIB_DEPENDS+= fbembed.2:${PORTSDIR}/databases/firebird2-client
AUTOGENARGS= --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-install pkg-message aliases.conf
UTIL_BIN= fb_inet_server fb_lock_print gbak gdef gfix gsec gstat nbackup
UDF_SO= ib_udf.so fbudf.so
UDF_SQL= src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
.else
# Client part stuff
LIB_DEPENDS= icuuc:${PORTSDIR}/devel/icu
AUTOGENARGS= --with-editline
ALL_TARGET= firebird_basic libfbembed embed_isql embed_gpre \
embed_gdef embed_qli libfbclient extlib
#ALL_TARGET= firebird_basic libfbembed libfbclient \
# client_gpre client_gdef client_isql client_qli extlib
USE_LDCONFIG= yes
CLIENT_BIN= gpre isql qli
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
.if !defined(NOPORTDOCS)
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}"
post-extract:
@${RM} -rf ${WRKSRC}/extern/icu
post-patch:
@${MKDIR} ${WRKSRC}/m4
${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4
${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+
.include <bsd.port.pre.mk>
.if !defined(CLIENT_ONLY)
pre-everything::
@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
@${ECHO_MSG} "changed since version 1.x."
@${ECHO_MSG} "Cancel this installation now and backup your databases"
@${ECHO_MSG} "if you have not already done so."
.if !defined(BATCH)
@sleep 2
.endif
.endif
.if !defined(CLIENT_ONLY)
pre-su-install:
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
post-install:
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}
.endif
.ifndef WITHOUT_IPC_CLEANUP
pre-build:
.ifndef PACKAGE_BUILDING
@if [ `${ID} -u` -eq 0 ]; then \
${ECHO_MSG} "==> Please do not build ${PORTNAME} as 'root' because this may cause conflicts with SysV semaphores of running services."; exit 1; fi
.endif
[ -f ${WRKDIR}/ipcs.pre.build ] || /usr/bin/ipcs -s | ${TAIL} -n +3 | \
${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build
post-build:
/usr/bin/ipcs -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build
/usr/bin/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=${GMAKE} \
${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})
post-configure:
@${REINPLACE_CMD} -e 's|__attribute__ ((__unused__));||' \
${WRKSRC}/src/dsql/parse.cpp
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
${INSTALL_FB} -m 0444 ${WRKSRC}/gen/firebird/misc/fbintl.conf ${LIBEXECDIR}/intl/
.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
${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so
${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
${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 !defined(NOPORTDOCS)
@${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>

3
databases/firebird2-server/distinfo
View File

@@ -1,3 +0,0 @@
MD5 (Firebird-2.0.3.12981-1.tar.bz2) = 5c70e72c4a3e4689d4bae2cee2694991
SHA256 (Firebird-2.0.3.12981-1.tar.bz2) = 2afe8411f844414f86ff93a66a75e542b78a1593019cc430a56ef27616885f00
SIZE (Firebird-2.0.3.12981-1.tar.bz2) = 12627615

9
databases/firebird2-server/files/aliases.conf.in
View File

@@ -1,9 +0,0 @@
#
# List of known database aliases
# ------------------------------
#
# Examples:
#
# employee = %%EXAMPLESDIR%%/employee.fdb
# security = /var/db/firebird/security2.fdb
#

46
databases/firebird2-server/files/icu.m4
View File

@@ -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)
])

20
databases/firebird2-server/files/patch-builds%install%misc%firebird.conf
View File

@@ -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
# ----------------------------

35
databases/firebird2-server/files/patch-builds%posix%Makefile.in.firebird
View File

@@ -1,35 +0,0 @@
--- builds/posix/Makefile.in.firebird.orig Sun Dec 18 20:56:17 2005
+++ builds/posix/Makefile.in.firebird Wed Sep 13 20:31:13 2006
@@ -186,7 +186,6 @@
#
external_libraries:
- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
ifeq ($(EDITLINE_FLG),Y)
$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
endif
@@ -515,12 +514,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_gpre_gen clean_icu clean_dbs clean_examples
+ clean_gpre_gen clean_dbs clean_examples
ifeq ($(EDITLINE_FLG),Y)
clean: clean_editline
@@ -542,9 +541,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`

30
databases/firebird2-server/files/patch-builds%posix%make.defaults
View File

@@ -1,30 +0,0 @@
--- builds/posix/make.defaults.orig 2007-09-04 15:51:17.000000000 +0800
+++ builds/posix/make.defaults 2007-10-05 07:05:13.947441166 +0800
@@ -107,7 +107,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
@@ -185,9 +185,6 @@
LIBFBSTATIC_A = $(LIB)/libfbstatic.a
LIBEDITLINE_A = $(LIB)/libeditline.a
-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)
@@ -203,7 +200,7 @@
STATICEXE_LINK:= @CXX@
LINK_LIBS = @LIBS@ @EDITLINE_A@
-ICU_LIBS = -licuuc -licudata -licui18n
+ICU_LIBS = @ICU_LIBS@ @ICU_LDFLAGS@
STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
SO_LINK_LIBS = @LIBS@

11
databases/firebird2-server/files/patch-builds%posix%make.rules
View File

@@ -1,11 +0,0 @@
--- builds/posix/make.rules.orig 2007-09-04 15:51:17.000000000 +0800
+++ builds/posix/make.rules 2007-10-05 06:56:37.104972944 +0800
@@ -33,7 +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 -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -DNAMESPACE=Vulcan
+CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan @ICU_CPPFLAGS@ -DNAMESPACE=Vulcan
ifeq ($(IsProdTypeBuild),Y)
CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD

44
databases/firebird2-server/files/patch-configure.in
View File

@@ -1,44 +0,0 @@
--- configure.in.orig 2007-09-04 15:51:12.000000000 +0800
+++ configure.in 2007-10-05 06:59:32.243635556 +0800
@@ -447,8 +447,9 @@
AC_CHECK_LIB(termcap, tgetent, , \
AC_CHECK_LIB(tinfo, tgetent, , \
AC_MSG_ERROR(termcap support not found)))))
- AC_SUBST(EDITLINE_A, -leditline)
+ AC_SUBST(EDITLINE_A, "-ledit -lreadline")
fi
+AM_PATH_ICU(3, 6)
dnl Check for functions
@@ -720,6 +721,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
@@ -1048,19 +1053,11 @@
gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in
Makefile:Makefile.in
gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline
-gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu
)
-if test "$PROD_BUILD_FLG" = N; then
- DEBUG_ICU=--enable-debug
-fi
-
AC_OUTPUT
-(cd extern/icu/source
-chmod +x runConfigureICU configure install-sh
-./runConfigureICU "$ICU_PLATFORM" "$DEBUG_ICU" --prefix=`pwd`/..)
dnl Print out the build configuration (the most interesting thing)

11
databases/firebird2-server/files/patch-src%common%config%config.cpp
View File

@@ -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

13
databases/firebird2-server/files/patch-src%jrd%db_alias.cpp
View File

@@ -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);

11
databases/firebird2-server/files/patch-src%jrd%gds.cpp
View File

@@ -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;

11
databases/firebird2-server/files/patch-src%jrd%os%config_root.h
View File

@@ -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);
}

20
databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp
View File

@@ -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

22
databases/firebird2-server/files/patch-src%jrd%svc.cpp
View File

@@ -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);
}

16
databases/firebird2-server/files/patch-src%lock%lock.cpp
View File

@@ -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.

11
databases/firebird2-server/files/patch-src+jrd+IntlManager.cpp
View File

@@ -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");

71
databases/firebird2-server/files/pkg-install.in
View File

@@ -1,71 +0,0 @@
#!/bin/sh
# $FreeBSD$
PATH=/bin:/usr/bin:/usr/sbin
case $2 in
PRE-INSTALL)
if [ `id -u` -ne 0 ]; then
echo; echo "You must be root to run this step!"; echo; echo
exit 1
fi
nofbuid=0
fbUID=`id -u firebird 2>/dev/null`
if [ $? -ne 0 ]; then
fbUID=90
while [ ! -z `id -un $fbUID 2>/dev/null` ]
do
fbUID=$(($fbUID+1))
done
nofbuid=1
fi
fbGID=`pw groupshow firebird 2>/dev/null`
if [ $? -ne 0 ]; then
fbGID=90
while [ ! -z `id -gn $fbGID 2>/dev/null` ]
do
fbGID=$(($fbGID+1))
done
echo "firebird:*:$fbGID:" >> /etc/group
else
fbGID=`echo $fbGID | awk -F: '{print $3}'`
fi
echo "firebird user using uid $fbUID"
echo "firebird user using gid $fbGID"
if which -s pw; then
if [ $nofbuid -ne 0 ]; then
pw useradd firebird -u $fbUID -g $fbGID -h - -s /bin/sh \
-d /var/db/firebird -c "Firebird Database Administrator"
fi
else
echo -n "unable to create user firebird - please create it manually,"
echo " before reinstalling this package."
exit 1
fi
;;
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

27
databases/firebird2-server/files/pkg-message.in
View File

@@ -1,27 +0,0 @@
---------------------------------------------------------
Firebird is now installed.
Before start the server ensure that the following line exists in /etc/services:
gds_db 3050/tcp #InterBase Database Remote Protocol
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.
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.
See documentation in %%DOCSDIR%%/
for more information.
---------------------------------------------------------

12
databases/firebird2-server/pkg-descr
View File

@@ -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/

35
databases/firebird2-server/pkg-plist
View File

@@ -1,35 +0,0 @@
@comment $FreeBSD$
bin/fb_inet_server
bin/fb_lock_mgr
bin/fb_lock_print
bin/gbak
bin/gdef
bin/gds_drop
bin/gfix
bin/gsec
bin/gstat
bin/nbackup
libexec/firebird/intl/fbintl
libexec/firebird/intl/fbintl.conf
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
@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%%

26
databases/firebird2-server/pkg-plist.client
View File

@@ -1,26 +0,0 @@
@comment $FreeBSD$
bin/gpre
bin/isql
bin/qli
include/blr.h
include/ib_util.h
include/ibase.h
include/iberror.h
include/perf.h
lib/libfbclient.so
lib/libfbclient.so.2
lib/libfbclient.so.%%FIREBIRD_VERSION%%
lib/libfbembed.so
lib/libfbembed.so.2
lib/libfbembed.so.%%FIREBIRD_VERSION%%
lib/libgds.so
lib/libgds.so.2
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%%

2
databases/firebird20-client/Makefile
View File

@@ -10,7 +10,7 @@ PKGNAMESUFFIX= -client
COMMENT= Firebird-2 database client
MASTERDIR= ${.CURDIR}/../firebird2-server
MASTERDIR= ${.CURDIR}/../firebird20-server
PLIST= ${PKGDIR}/pkg-plist.client

10
databases/firebird20-server/Makefile
View File

@@ -17,7 +17,7 @@ DISTNAME= Firebird-2.0.3.12981-1
MAINTAINER= skv@FreeBSD.org
COMMENT?= Firebird-2 relational database (server)
LATEST_LINK= ${PORTNAME}2${PKGNAMESUFFIX}
LATEST_LINK= ${PORTNAME}20${PKGNAMESUFFIX}
USE_BISON= build
USE_BZIP2= yes
@@ -40,13 +40,14 @@ LD= ${CC}
STRIP=
ONLY_FOR_ARCHS= i386 amd64
CONFLICTS= firebird-client-1* firebird-server-1*
CONFLICTS= firebird-client-1* firebird-server-1* \
firebird-client-2.1* firebird-server-2.1*
INSTALL_FB= ${INSTALL} ${COPY} -g firebird
.if !defined(CLIENT_ONLY)
# Server part stuff
LIB_DEPENDS+= fbembed.2:${PORTSDIR}/databases/firebird2-client
LIB_DEPENDS+= fbembed.2:${PORTSDIR}/databases/firebird20-client
AUTOGENARGS= --with-lock-manager
@@ -201,12 +202,15 @@ do-install:
${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \
${PREFIX}/lib
${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2.0
${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.0
${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.0
${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2
${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so

3
databases/firebird20-server/pkg-plist.client
View File

@@ -9,12 +9,15 @@ include/iberror.h
include/perf.h
lib/libfbclient.so
lib/libfbclient.so.2
lib/libfbclient.so.2.0
lib/libfbclient.so.%%FIREBIRD_VERSION%%
lib/libfbembed.so
lib/libfbembed.so.2
lib/libfbembed.so.2.0
lib/libfbembed.so.%%FIREBIRD_VERSION%%
lib/libgds.so
lib/libgds.so.2
lib/libgds.so.2.0
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

2
databases/flamerobin/Makefile
View File

@@ -34,7 +34,7 @@ MAN1= flamerobin.1
.if defined(WITH_FIREBIRD)
LIB_DEPENDS+= fbclient.1:${PORTSDIR}/databases/firebird-client
.else
LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird2-client
LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird20-client
.endif
.if exists(${WX_CONFIG})

2
databases/libdbi-drivers/Makefile
View File

@@ -79,7 +79,7 @@ PLIST_SUB+= SQLITE3="@comment "
.endif
.if defined(WITH_FIREBIRD)
LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client
LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird20-client
CONFIGURE_ARGS+= --with-firebird
PLIST_SUB+= FIREBIRD=""
.else

2
databases/libgda3/Makefile
View File

@@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --without-ldap
.endif
.if ${LIBGDA3_SLAVE}=="firebird"
LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client
LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird20-client
CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-firebird