Date: Tue, 23 Nov 2010 13:10:12 GMT From: hangover <root@hangover.org.ru> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/152402: New port: databases/firebird21-server Message-ID: <201011231310.oANDACEL013638@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/152402; it has been noted by GNATS.
From: hangover <root@hangover.org.ru>
To: bug-followup@freebsd.org
Cc:
Subject: Re: ports/152402: New port: databases/firebird21-server
Date: Tue, 23 Nov 2010 18:36:47 +0600
This is a multi-part message in MIME format.
--------------070104030805030903020107
Content-Type: multipart/alternative;
boundary="------------090408010506060503020500"
--------------090408010506060503020500
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Hi, everybody.
I've updated port - now it successfully compiles on adm64 arch.
--------------090408010506060503020500
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 7bit
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#ffffff" text="#000000">
<font size="-1"><font face="Consolas">Hi, everybody.<br>
<br>
I've updated port - now it successfully compiles on adm64 arch.<br>
</font></font>
</body>
</html>
--------------090408010506060503020500--
--------------070104030805030903020107
Content-Type: application/x-shar;
name="firebird21-server.shar"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="firebird21-server.shar"
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# firebird21-server
# firebird21-server/files
# firebird21-server/files/icu.m4
# firebird21-server/files/patch-autogen.sh
# firebird21-server/files/patch-configure.in
# firebird21-server/files/pkg-install.in
# firebird21-server/files/pkg-message.in
# firebird21-server/files/aliases.conf.in
# firebird21-server/files/patch-builds%install%misc%firebird.conf
# firebird21-server/files/patch-builds%posix%Makefile.in.firebird
# firebird21-server/files/patch-builds%posix%make.defaults
# firebird21-server/files/patch-builds%posix%make.rules
# firebird21-server/files/patch-src%lock%lock.cpp
# firebird21-server/files/patch-src%common%config%config.cpp
# firebird21-server/files/patch-src%jrd%db_alias.cpp
# firebird21-server/files/patch-src%jrd%gds.cpp
# firebird21-server/files/patch-src%jrd%os%config_root.h
# firebird21-server/files/patch-src%jrd%plugin_manager.cpp
# firebird21-server/files/patch-src%jrd%svc.cpp
# firebird21-server/files/patch-src+jrd+IntlManager.cpp
# firebird21-server/Makefile
# firebird21-server/distinfo
# firebird21-server/pkg-descr
# firebird21-server/pkg-plist
# firebird21-server/pkg-plist.client
#
echo c - firebird21-server
mkdir -p firebird21-server > /dev/null 2>&1
echo c - firebird21-server/files
mkdir -p firebird21-server/files > /dev/null 2>&1
echo x - firebird21-server/files/icu.m4
sed 's/^X//' >firebird21-server/files/icu.m4 << '0640e695a421c669e8ba9a63cbefbe04'
Xdnl AM_PATH_ICU([MINIMUM-VERSION])
Xdnl Adds support for ICU
XAC_DEFUN([AM_PATH_ICU],
X[
X rast_lib_icu_major="$1"
X rast_lib_icu_minor="$2"
X rast_lib_icu_version="$1.$2"
X
X AC_ARG_WITH(icu-config,
X AC_HELP_STRING([--with-icu-config=PATH],[path to icu-config]),
X [
X AC_MSG_RESULT(using $withval for icu-config)
X ICU_CONFIG="$withval"
X ], [
X AC_PATH_PROG(ICU_CONFIG, icu-config, no)
X ])
X HAVE_ICU="no"
X if test "$ICU_CONFIG" != "no"; then
X AC_MSG_CHECKING([ICU version])
X ICU_VERSION="`$ICU_CONFIG --version`"
X if test $? -eq 0; then
X changequote(<<, >>)
X ICU_MAJOR=`expr "$ICU_VERSION" : '\(.*\)\..*'`
X ICU_MINOR=`expr "$ICU_VERSION" : '.*\.\(.*\)'`
X changequote([, ])
X if expr "$ICU_MAJOR" '>' "$rast_lib_icu_major" > /dev/null ||
X ( expr "$ICU_MAJOR" '=' "$rast_lib_icu_major" > /dev/null &&
X expr "$ICU_MINOR" '>=' "$rast_lib_icu_minor" > /dev/null ); then
X AC_MSG_RESULT([$ICU_VERSION])
X
X ICU_CPPFLAGS=`$ICU_CONFIG --cppflags`
X ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly`
X ICU_LDFLAGS=`$ICU_CONFIG --ldflags-searchpath`
X AC_SUBST(ICU_CPPFLAGS)
X AC_SUBST(ICU_LIBS)
X AC_SUBST(ICU_LDFLAGS)
X HAVE_ICU="yes"
X else
X AC_MSG_WARN([$ICU_VERSION is too old; $rast_lib_icu_version is required])
X fi
X else
X AC_MSG_WARN([icu-config --version failed])
X fi
X fi
X AC_SUBST(HAVE_ICU)
X])
0640e695a421c669e8ba9a63cbefbe04
echo x - firebird21-server/files/patch-autogen.sh
sed 's/^X//' >firebird21-server/files/patch-autogen.sh << '733a64c057fe54c0df2da8afc5170cf9'
X--- autogen.sh.orig 2010-09-08 15:44:05.000000000 +0700
X+++ autogen.sh 2010-10-18 13:37:36.000000000 +0700
X@@ -63,7 +63,7 @@
X fi
X
X echo "Running autoreconf ..."
X-$AUTORECONF --install --force --verbose || exit 1
X+$AUTORECONF --install --force --verbose -I ./m4 || exit 1
X
X # Hack to bypass bug in autoreconf - --install switch not passed to libtoolize,
X # therefore missing config.sub and confg.guess files
733a64c057fe54c0df2da8afc5170cf9
echo x - firebird21-server/files/patch-configure.in
sed 's/^X//' >firebird21-server/files/patch-configure.in << 'e1d3c72b6ee819ee9757b5735553a2ec'
X--- configure.in.orig 2009-06-05 16:50:33.000000000 +0700
X+++ configure.in 2010-10-19 12:42:22.000000000 +0700
X@@ -721,6 +721,7 @@
X AC_MSG_RESULT(yes)],
X [AC_MSG_RESULT(no)])
X fi
X+AM_PATH_ICU(3, 6)
X
X AC_CHECK_SIZEOF(void *)
X AC_CHECK_SIZEOF(long)
X@@ -905,6 +906,10 @@
X AC_SUBST(NEW_FIREBIRD_DIR)
X
X AC_DEFINE_UNQUOTED(FB_PREFIX, $(if test "x$prefix" = "xNONE" ; then echo \"$ac_default_prefix\"; else echo \"$prefix\"; fi), [Installation path prefix])
X+AC_DEFINE_UNQUOTED(FB_EXEC_PREFIX, "$exec_prefix", [Executables path prefix])
X+AC_DEFINE_UNQUOTED(FB_CONF_PREFIX, "$sysconfdir", [Single-machine data path prefix])
X+AC_DEFINE_UNQUOTED(FB_MSG_PREFIX, "$datadir", [Architecture-independent data path prefix])
X+AC_DEFINE_UNQUOTED(FB_LIBEXEC_PREFIX, "$libexecdir", [Program executables path prefix])
X
X AC_CONFIG_COMMANDS(,,[
X dnl # rebuild version header if needed
X@@ -1267,9 +1272,6 @@
X if test "$STD_EDITLINE" = "false"; then
X AC_CONFIG_FILES(gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline)
X fi
X-if test "$STD_ICU" = "false"; then
X- AC_CONFIG_FILES(gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu)
X-fi
X
X case "$PLATFORM" in
X SOLARIS | solx86 )
X@@ -1280,18 +1282,7 @@
X esac
X
X
X-if test "$PROD_BUILD_FLG" = N; then
X- DEBUG_ICU=--enable-debug
X-fi
X-
X-if test "$STD_ICU" = "true"; then
X AC_OUTPUT
X-else
X-AC_OUTPUT
X-(cd extern/icu/source
X-chmod +x runConfigureICU configure install-sh
X-./runConfigureICU "$ICU_PLATFORM" "$DEBUG_ICU" --prefix=`pwd`/..)
X-fi
X
X dnl Print out the build configuration (the most interesting thing)
X echo
e1d3c72b6ee819ee9757b5735553a2ec
echo x - firebird21-server/files/pkg-install.in
sed 's/^X//' >firebird21-server/files/pkg-install.in << 'd7840fc3c4e47b7d79e8814df171bae4'
X#!/bin/sh
X
X# $FreeBSD: ports/databases/firebird20-server/files/pkg-install.in,v 1.5 2009/08/02 19:32:40 mezz Exp $
X
XPATH=/bin:/usr/bin:/usr/sbin
X
Xcase $2 in
XPRE-INSTALL)
X
Xif [ `id -u` -ne 0 ]; then
X echo; echo "You must be root to run this step!"; echo; echo
X exit 1
Xfi
X
Xnofbuid=0
XfbUID=`id -u firebird 2>/dev/null`
Xif [ $? -ne 0 ]; then
X fbUID=90
X while [ ! -z `id -un $fbUID 2>/dev/null` ]
X do
X fbUID=$(($fbUID+1))
X done
X nofbuid=1
Xfi
X
XfbGID=`pw groupshow firebird 2>/dev/null`
Xif [ $? -ne 0 ]; then
X fbGID=90
X while [ ! -z `id -gn $fbGID 2>/dev/null` ]
X do
X fbGID=$(($fbGID+1))
X done
X echo "firebird:*:$fbGID:" >> /etc/group
Xelse
X fbGID=`echo $fbGID | awk -F: '{print $3}'`
Xfi
X
Xecho "firebird user using uid $fbUID"
Xecho "firebird user using gid $fbGID"
X
Xif which -s pw; then
X if [ $nofbuid -ne 0 ]; then
X pw useradd firebird -u $fbUID -g $fbGID -h - -s /usr/sbin/nologin \
X -d /nonexistent -c "Firebird Database Administrator"
X fi
Xelse
X echo -n "unable to create user firebird - please create it manually,"
X echo " before reinstalling this package."
X exit 1
Xfi
X;;
X
XPOST-INSTALL)
Xcd /var/db/firebird
X
X# Lock files
X
Xfor i in isc_init1 isc_lock1 isc_event1
Xdo
X FileName=$i.`hostname`
X touch $FileName
X chmod uga=rw $FileName
X chown firebird:firebird $FileName
Xdone
X
Xtouch firebird.log
Xchown firebird:firebird firebird.log security2.fdb
X
X;;
X
Xesac
d7840fc3c4e47b7d79e8814df171bae4
echo x - firebird21-server/files/pkg-message.in
sed 's/^X//' >firebird21-server/files/pkg-message.in << '463b2db1b8e4269a5b9dd42ab121e2d2'
X
X---------------------------------------------------------
XFirebird is now installed.
X
XBefore start the server ensure that the following line exists in /etc/services:
X
Xgds_db 3050/tcp #InterBase Database Remote Protocol
X
XIf you use inetd then add the following line to /etc/inetd.conf
X
Xgds_db stream tcp nowait firebird %%PREFIX%%/bin/fb_inet_server fb_inet_server
X
XAnd finally restart inetd.
X
XIt is STRONGLY recommended that you change the SYSDBA
Xpassword with:
X
X% gsec -user SYSDBA -pass masterkey
XGSEC> modify SYSDBA -pw newpassword
XGSEC> quit
X
Xbefore doing anything serious with Firebird.
X
XSee documentation in %%DOCSDIR%%/
Xfor more information.
X---------------------------------------------------------
X
463b2db1b8e4269a5b9dd42ab121e2d2
echo x - firebird21-server/files/aliases.conf.in
sed 's/^X//' >firebird21-server/files/aliases.conf.in << '5100ca515d17ad8c5947bdef8074f4d1'
X#
X# List of known database aliases
X# ------------------------------
X#
X# Examples:
X#
X# employee = %%EXAMPLESDIR%%/employee.fdb
X# security = /var/db/firebird/security2.fdb
X#
5100ca515d17ad8c5947bdef8074f4d1
echo x - firebird21-server/files/patch-builds%install%misc%firebird.conf
sed 's/^X//' >firebird21-server/files/patch-builds%install%misc%firebird.conf << 'fe2b75abe52ab99a4d368a1554ef2d4f'
X--- builds/install/misc/firebird.conf.orig Tue Aug 15 22:38:52 2006
X+++ builds/install/misc/firebird.conf Tue Aug 15 22:39:24 2006
X@@ -60,7 +60,7 @@
X #
X # Type: string
X #
X-#RootDirectory =
X+#RootDirectory = /var/db/firebird
X
X
X # ----------------------------
X@@ -125,7 +125,7 @@
X #
X # Type: string (special format)
X #
X-#UdfAccess = Restrict UDF
X+UdfAccess = Restrict %%PREFIX%%/libexec/firebird/udf
X
X
X # ----------------------------
fe2b75abe52ab99a4d368a1554ef2d4f
echo x - firebird21-server/files/patch-builds%posix%Makefile.in.firebird
sed 's/^X//' >firebird21-server/files/patch-builds%posix%Makefile.in.firebird << '7d54fe475f6bb380d64ea38e55a2ff7f'
X--- builds/posix/Makefile.in.firebird.orig 2008-12-10 21:22:15.000000000 +0600
X+++ builds/posix/Makefile.in.firebird 2010-10-19 12:36:20.000000000 +0700
X@@ -185,9 +185,6 @@
X #
X
X external_libraries:
X-ifeq ($(STD_ICU),false)
X- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
X-endif
X ifeq ($(STD_EDITLINE),false)
X ifeq ($(EDITLINE_FLG),Y)
X $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
X@@ -519,12 +516,12 @@
X #___________________________________________________________________________
X #
X .PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \
X- clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \
X+ clean_gpre_gen clean_dbs clean_examples clean_makefiles \
X clean_editline clean_all
X
X
X clean: clean_objects clean_dependancies clean_extern_objects clean_build \
X- clean_yacc_gen clean_gpre_gen clean_icu clean_dbs clean_examples
X+ clean_yacc_gen clean_gpre_gen clean_dbs clean_examples
X
X ifeq ($(EDITLINE_FLG),Y)
X clean: clean_editline
X@@ -538,7 +535,6 @@
X $(RM) $(ROOT)/libtool
X $(RM_R) $(ROOT)/autom4te.cache
X -make -C $(ROOT)/extern/editline distclean
X- -make -C $(ROOT)/extern/icu/source distclean
X -make -C $(ROOT)/extern/btyacc distclean
X
X clean_dbs:
X@@ -551,9 +547,6 @@
X clean_editline:
X -make -C $(ROOT)/extern/editline clean
X
X-clean_icu:
X- -make -C $(ROOT)/extern/icu/source clean
X-
X clean_objects:
X $(RM) `find $(TMP_ROOT)/ -type f -name '*.o' -print`
X
7d54fe475f6bb380d64ea38e55a2ff7f
echo x - firebird21-server/files/patch-builds%posix%make.defaults
sed 's/^X//' >firebird21-server/files/patch-builds%posix%make.defaults << '2f2d033019e702713f5e48459d542952'
X--- builds/posix/make.defaults.orig 2008-09-04 18:47:18.000000000 +0700
X+++ builds/posix/make.defaults 2010-11-23 17:06:28.000000000 +0600
X@@ -118,7 +118,7 @@
X CHMOD= chmod
X CHMOD_6= chmod 666
X CHMOD_7= chmod 777
X-CHMOD_S7= chmod 06777
X+CHMOD_S7= chmod 04555
X MV= mv -f
X TOUCH= touch
X CP= cp
X@@ -162,7 +162,7 @@
X STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS)
X
X LINK_LIBS = @LIBS@
X-ICU_LIBS = -licuuc -licudata -licui18n
X+ICU_LIBS = @ICU_LIBS@ @ICU_LDFLAGS@
X STATICLINK_LIBS = @LIBS@
X SO_LINK_LIBS = @LIBS@
X
X@@ -239,10 +239,6 @@
X endif
X endif
X
X-LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
X- $(LIB)/$(LIB_PREFIX)icudata.$(SHRLIB_EXT) \
X- $(LIB)/$(LIB_PREFIX)icui18n.$(SHRLIB_EXT)
X-
X # Shared library name for usage inside of the UDF
X IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT)
X LIBIBUTIL_SO = $(LIB)/$(IbUtilLibraryName)
X@@ -268,7 +264,7 @@
X FB_SUPER_SERVER = $(BIN)/fbserver$(EXEC_EXT)
X FB_CLASSIC_SERVER = $(BIN)/fb_inet_server$(EXEC_EXT)
X
X-STATIC_CXXSUPPORT_LIB = -lsupc++ -lgcc_eh
X+STATIC_CXXSUPPORT_LIB = -lstdc++ -lgcc_s -lgcc_eh
X
X # From utilities
X CREATE_DB = $(BIN)/create_db$(EXEC_EXT)
2f2d033019e702713f5e48459d542952
echo x - firebird21-server/files/patch-builds%posix%make.rules
sed 's/^X//' >firebird21-server/files/patch-builds%posix%make.rules << '1299c26911fc4e7b576fc04c8571b42c'
X--- builds/posix/make.rules.orig 2008-12-10 07:03:31.000000000 +0600
X+++ builds/posix/make.rules 2010-10-19 12:40:17.000000000 +0700
X@@ -33,9 +33,7 @@
X
X # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
X CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
X-ifeq ($(STD_ICU),false)
X- CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
X-endif
X+CFLAGS:= $(CFLAGS) @ICU_CPPFLAGS@
X
X ifeq ($(IsProdTypeBuild),Y)
X CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
1299c26911fc4e7b576fc04c8571b42c
echo x - firebird21-server/files/patch-src%lock%lock.cpp
sed 's/^X//' >firebird21-server/files/patch-src%lock%lock.cpp << '521dab96aade1ac27db3b391d5653259'
X--- src/lock/lock.cpp.orig Fri Feb 3 16:13:23 2006
X+++ src/lock/lock.cpp Wed Aug 16 12:41:32 2006
X@@ -2708,7 +2708,12 @@
X #ifdef DEBUG_MANAGER
X gds__prefix(string, DEBUG_MANAGER);
X #else
X- gds__prefix(string, LOCK_MANAGER);
X+ if (! getenv("FIREBIRD")) {
X+ strlcpy(string, FB_EXEC_PREFIX "/", MAXPATHLEN);
X+ strlcat(string, LOCK_MANAGER, MAXPATHLEN);
X+ } else {
X+ gds__prefix(string, LOCK_MANAGER);
X+ }
X #endif
X if (statistics(string, &stat_buf) == -1) {
X // bug() fills the vector with this address, it must be static.
521dab96aade1ac27db3b391d5653259
echo x - firebird21-server/files/patch-src%common%config%config.cpp
sed 's/^X//' >firebird21-server/files/patch-src%common%config%config.cpp << 'f27ac7b2904549c12b002fe21914977b'
X--- src/common/config/config.cpp.orig Tue Aug 15 22:53:43 2006
X+++ src/common/config/config.cpp Tue Aug 15 22:54:38 2006
X@@ -111,7 +111,7 @@
X {TYPE_STRING, "RemoteBindAddress", (ConfigValue) 0},
X {TYPE_STRING, "ExternalFileAccess", (ConfigValue) "None"}, // location(s) of external files for tables
X {TYPE_STRING, "DatabaseAccess", (ConfigValue) "Full"}, // location(s) of databases
X- {TYPE_STRING, "UdfAccess", (ConfigValue) "Restrict UDF"}, // location(s) of UDFs
X+ {TYPE_STRING, "UdfAccess", (ConfigValue) "Restrict " FB_LIBEXEC_PREFIX "/UDF"}, // location(s) of UDFs
X {TYPE_STRING, "TempDirectories", (ConfigValue) 0},
X #ifdef DEV_BUILD
X {TYPE_BOOLEAN, "BugcheckAbort", (ConfigValue) true}, // whether to abort() engine when internal error is found
f27ac7b2904549c12b002fe21914977b
echo x - firebird21-server/files/patch-src%jrd%db_alias.cpp
sed 's/^X//' >firebird21-server/files/patch-src%jrd%db_alias.cpp << 'bbb7840224cd918e1277dc3fe7eeab74'
X--- src/jrd/db_alias.cpp.orig Tue Aug 15 23:07:31 2006
X+++ src/jrd/db_alias.cpp Tue Aug 15 23:10:08 2006
X@@ -33,8 +33,8 @@
X
X bool ResolveDatabaseAlias(const string& alias, string& database)
X {
X- string alias_filename;
X- Firebird::Prefix(alias_filename, ALIAS_FILE);
X+ string alias_filename = string(FB_CONF_PREFIX)
X+ + PathUtils::dir_sep + ALIAS_FILE;
X ConfigFile aliasConfig(false);
X aliasConfig.setConfigFilePath(alias_filename);
X
bbb7840224cd918e1277dc3fe7eeab74
echo x - firebird21-server/files/patch-src%jrd%gds.cpp
sed 's/^X//' >firebird21-server/files/patch-src%jrd%gds.cpp << 'aa7f3c5d6b4e81e05860a932be5796bf'
X--- src/jrd/gds.cpp.orig Tue Aug 15 22:49:37 2006
X+++ src/jrd/gds.cpp Tue Aug 15 22:50:14 2006
X@@ -3734,7 +3734,7 @@
X Firebird::PathName msgPrefix;
X if (!fb_utils::readenv(FB_MSG_ENV, msgPrefix))
X {
X- msgPrefix = prefix;
X+ msgPrefix = FB_MSG_PREFIX;
X }
X msgPrefix.copyTo(ib_prefix_msg_val, sizeof(ib_prefix_msg_val));
X ib_prefix_msg = ib_prefix_msg_val;
aa7f3c5d6b4e81e05860a932be5796bf
echo x - firebird21-server/files/patch-src%jrd%os%config_root.h
sed 's/^X//' >firebird21-server/files/patch-src%jrd%os%config_root.h << 'a988003f24a3cb912162a06b9699128b'
X--- src/jrd/os/config_root.h.orig Tue Aug 15 22:57:33 2006
X+++ src/jrd/os/config_root.h Tue Aug 15 22:57:53 2006
X@@ -76,7 +76,7 @@
X {
X GetRoot();
X install_dir = root_dir;
X- config_file = root_dir + string(CONFIG_FILE);
X+ config_file = string(FB_CONF_PREFIX) + PathUtils::dir_sep + string(CONFIG_FILE);
X }
X
X
a988003f24a3cb912162a06b9699128b
echo x - firebird21-server/files/patch-src%jrd%plugin_manager.cpp
sed 's/^X//' >firebird21-server/files/patch-src%jrd%plugin_manager.cpp << '5c6cb94bb15549b03df0674d136d0e22'
X--- src/jrd/plugin_manager.cpp.orig Tue Aug 15 23:11:04 2006
X+++ src/jrd/plugin_manager.cpp Tue Aug 15 23:12:01 2006
X@@ -64,7 +64,7 @@
X void PluginManager::loadAllPlugins()
X {
X Firebird::PathName checkDir;
X- const Firebird::PathName fbLibPath = Config::getRootDirectory();
X+ const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX;
X
X for (spIterator pathItr = searchPaths.begin(); pathItr != searchPaths.end(); ++pathItr)
X {
X@@ -131,7 +131,7 @@
X PluginManager::Module *PluginManager::loadPluginModule(const Firebird::PathName& name)
X {
X Firebird::PathName checkPath;
X- const Firebird::PathName fbLibPath = Config::getRootDirectory();
X+ const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX;
X
X // Check to see if the module name was specified as a relative path
X // from one of our search paths. This only makes sense if the name
5c6cb94bb15549b03df0674d136d0e22
echo x - firebird21-server/files/patch-src%jrd%svc.cpp
sed 's/^X//' >firebird21-server/files/patch-src%jrd%svc.cpp << '99a8b1ab6335909206fe3090521073e3'
X--- src/jrd/svc.cpp.orig Mon Jul 31 11:43:28 2006
X+++ src/jrd/svc.cpp Wed Nov 15 16:56:13 2006
X@@ -583,7 +583,8 @@
X {
X #ifndef SERVICE_THREAD
X TEXT service_path[MAXPATHLEN];
X- gds__prefix(service_path, serv->serv_executable);
X+ strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN);
X+ strlcat(service_path, serv->serv_executable, MAXPATHLEN);
X service_fork(service_path, service);
X #else
X /* if service is single threaded, only call if not currently running */
X@@ -1742,7 +1743,8 @@
X TEXT service_path[MAXPATHLEN];
X
X if (serv->serv_executable) {
X- gds__prefix(service_path, serv->serv_executable);
X+ strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN);
X+ strlcat(service_path, serv->serv_executable, MAXPATHLEN);
X service->svc_flags = SVC_forked;
X service_fork(service_path, service);
X }
99a8b1ab6335909206fe3090521073e3
echo x - firebird21-server/files/patch-src+jrd+IntlManager.cpp
sed 's/^X//' >firebird21-server/files/patch-src+jrd+IntlManager.cpp << '685f48fd7ac7296eb1a8e08528da2dd3'
X--- src/jrd/IntlManager.cpp.orig Tue Nov 21 16:24:19 2006
X+++ src/jrd/IntlManager.cpp Tue Nov 21 16:30:40 2006
X@@ -78,7 +78,7 @@
X #endif
X
X Firebird::PathName intlPath;
X- PathUtils::concatPath(intlPath, Config::getRootDirectory(), "intl");
X+ PathUtils::concatPath(intlPath, FB_LIBEXEC_PREFIX, "intl");
X
X ScanDir dir(intlPath.c_str(), "*.conf");
X
685f48fd7ac7296eb1a8e08528da2dd3
echo x - firebird21-server/Makefile
sed 's/^X//' >firebird21-server/Makefile << 'fed50955667f65ca6c1d74b204b5f46f'
X# New ports collection makefile for: firebird21-server
X# Date created: 15 August 2006
X# Whom: Sergey Skvortsov <skv@protey.ru>
X#
X# $FreeBSD: ports/databases/firebird21-server/Makefile$
X#
X
XPORTNAME= firebird
XPORTVERSION= 2.1.3
XPORTREVISION= 0
XCATEGORIES?= databases
XMASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/
XPKGNAMESUFFIX?= -server
XDISTNAME= Firebird-2.1.3.18185-0
X
XMAINTAINER= ports@FreeBSD.org
XCOMMENT?= Firebird-2 relational database (server)
X
XLATEST_LINK= ${PORTNAME}21${PKGNAMESUFFIX}
X
XUSE_BISON= build
XUSE_BZIP2= yes
XUSE_GMAKE= yes
XGNU_CONFIGURE= yes
XUSE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
XACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
X -I ${WRKSRC}/m4
XMAKE_JOBS_UNSAFE= yes
X
XLOCALSTATEDIR= /var/db/firebird
XCONFDIR= ${PREFIX}/etc/firebird
XLIBEXECDIR= ${PREFIX}/libexec/firebird
XPLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \
X LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird"
X
X# Don't use ld for linking, use gcc
XLD= ${CC}
X
X# Don't strip binary files
XSTRIP=
X
XONLY_FOR_ARCHS= i386 amd64
XCONFLICTS+= firebird-client-1* firebird-server-1* \
X firebird-client-2.0* firebird-server-2.0*
X
XINSTALL_FB= ${INSTALL} ${COPY} -g firebird
X
XIPCCHECK!= ipcrm -q 0 2>&1 || true
X.if ${IPCCHECK:Mimplemented}
XIGNORE= your system does not support sysvipc
X.endif
X
X.include <bsd.port.pre.mk>
X
X.if ${ARCH} == "amd64"
XCFLAGS+= -DAMD64
X.endif
X
X.if !defined(CLIENT_ONLY)
X# Server part stuff
XLIB_DEPENDS+= fbembed.2:${PORTSDIR}/databases/firebird21-client
X
XAUTOGENARGS= --without-editline --with-lock-manager
X
XALL_TARGET= firebird_boot ref_databases msgs libfbembed intl otherfiles \
X inet_server extlib embed_gfix embed_gbak embed_gdef embed_util \
X embed_fbudf
X
XSUB_FILES= pkg-install pkg-message aliases.conf
X
XUTIL_BIN= fb_inet_server fb_lock_print gbak gdef gfix gsec gstat nbackup
XUDF_SO= ib_udf.so fbudf.so
XUDF_SQL= src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
X.else
X# Client part stuff
XLIB_DEPENDS= icuuc:${PORTSDIR}/devel/icu
X
XAUTOGENARGS= --without-editline
X
XALL_TARGET= firebird_basic libfbembed embed_isql embed_gpre \
X embed_gdef embed_qli libfbclient extlib
X
XUSE_LDCONFIG= yes
XCLIENT_BIN= gpre isql-fb qli
X
XCFLAGS+= -I${LOCALBASE}/include
XLDFLAGS+= -L${LOCALBASE}/lib
X
XCONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
X PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
X PTHREAD_LIBS="${PTHREAD_LIBS}"
X
X.if !defined(NOPORTDOCS)
XPORTDOCS= *
XFB_DOCS_FILES= WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
X ods11-index-structure.html
XFB_DOCS_DIRS= sql.extensions license upgrade
X.endif
X.endif
X
XMAKE_ENV+= FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
X
Xpost-extract:
X @${RM} -rf ${WRKSRC}/extern/icu
X
Xpost-patch:
X @${MKDIR} ${WRKSRC}/m4
X ${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4
X ${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+
X ${MAKE} -C ${WRKSRC}/extern/btyacc
X.if defined(CLIENT_ONLY)
X ${REINPLACE_CMD} -e 's|/isql|/isql-fb|g' ${WRKSRC}/builds/posix/make.defaults
X.endif
X
X.if !defined(CLIENT_ONLY)
Xpre-everything::
X @${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
X @${ECHO_MSG} "changed since version 1.x."
X @${ECHO_MSG} "Cancel this installation now and backup your databases"
X @${ECHO_MSG} "if you have not already done so."
X.if !defined(BATCH)
X @sleep 2
X.endif
X.endif
X
X.if !defined(CLIENT_ONLY)
Xpre-su-install:
X @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
X
Xpost-install:
X @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
X @${CAT} ${PKGMESSAGE}
X.endif
X
X.ifndef WITHOUT_IPC_CLEANUP
Xpre-build:
X.ifndef PACKAGE_BUILDING
X @if [ `${ID} -u` -eq 0 ]; then \
X ${ECHO_MSG} "==> Please do not build ${PORTNAME} as 'root' because this may cause conflicts with SysV semaphores of running services."; exit 1; fi
X.endif
X [ -f ${WRKDIR}/ipcs.pre.build ] || /usr/bin/ipcs -s | ${TAIL} -n +3 | \
X ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build
X
Xpost-build:
X /usr/bin/ipcs -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build
X /usr/bin/diff -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build | \
X ${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh
X ${SH} ${WRKDIR}/ipcrm.sh
X.endif
X
Xdo-configure:
X @${ECHO_MSG} " "
X @${ECHO_MSG} " "
X @${ECHO_MSG} "Configure arguments:"
X @${ECHO_MSG} "${CONFIGURE_ENV}"
X @${ECHO_MSG} " "
X @${ECHO_MSG} " "
X @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} MAKE=${GMAKE} \
X ${AUTOTOOLS_VARS} ./autogen.sh --localstatedir=${LOCALSTATEDIR} \
X --prefix=${LOCALSTATEDIR} --exec-prefix=${PREFIX} \
X --libexecdir=${LIBEXECDIR} \
X --sysconfdir=${CONFDIR} --datadir=${DATADIR} \
X --with-icu-config=${LOCALBASE}/bin/icu-config \
X ${AUTOGENARGS})
X
Xdo-install:
X.if !defined(CLIENT_ONLY)
X
X ${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
X ${INSTALL_PROGRAM} -o root -g firebird -m 4550 ${WRKSRC}/gen/firebird/bin/fb_lock_mgr ${PREFIX}/bin
X ${INSTALL_PROGRAM} -m 500 ${WRKSRC}/gen/firebird/bin/gds_drop ${PREFIX}/bin
X
X @${MKDIR} ${CONFDIR}
X ${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf.sample
X.if !exists(${CONFDIR}/aliases.conf)
X ${INSTALL_DATA} ${WRKDIR}/aliases.conf ${CONFDIR}/aliases.conf
X.endif
X
X ${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl
X
X ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR}
X
X ${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LIBEXECDIR}/udf
X ${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${LIBEXECDIR}/udf
X
X.if !exists(${LOCALSTATEDIR}/security2.fdb)
X ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb ${LOCALSTATEDIR}/security2.fdb
X.endif
X ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb ${LOCALSTATEDIR}/security2.fdb.sample
X
X ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${LOCALSTATEDIR}/help
X
X ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LIBEXECDIR}/intl/fbintl
X ${INSTALL_FB} -m 0444 ${WRKSRC}/gen/firebird/misc/fbintl.conf ${LIBEXECDIR}/intl/
X.else
X# defined CLIENT_ONLY
X ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin
X
X ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/firebird/misc/firebird.conf > ${WRKDIR}/firebird.conf
X
X @${MKDIR} ${CONFDIR}
X.if !exists(${CONFDIR}/firebird.conf)
X ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}
X.endif
X ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}/firebird.conf.sample
X
X ${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \
X ${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \
X ${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \
X ${PREFIX}/lib
X
X ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2.1
X ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2
X ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so
X
X ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2.1
X ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2
X ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so
X
X ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2.1
X ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2
X ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so
X
X @${MKDIR} ${PREFIX}/include
X ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include
X
X @${MKDIR} ${DATADIR}
X ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${DATADIR}
X
X.if !defined(NOPORTDOCS)
X @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"
X @${MKDIR} ${FB_DOCS_DIRS:S!^!${DOCSDIR}/!}
X @${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${DOCSDIR}
X @${LN} -sf ${DOCSDIR}/README.user ${DOCSDIR}/README
X @${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${DOCSDIR}/sql.extensions
X @${INSTALL_DATA} ${WRKSRC}/doc/license/* ${DOCSDIR}/license
X @${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${DOCSDIR}/upgrade
X.endif
X.endif
X
X.include <bsd.port.post.mk>
fed50955667f65ca6c1d74b204b5f46f
echo x - firebird21-server/distinfo
sed 's/^X//' >firebird21-server/distinfo << 'b5bd21ecc5b45a92714074e53590b4a3'
XMD5 (Firebird-2.1.3.18185-0.tar.bz2) = ec42bd5c85dc2f65baef185228bcc5ca
XSHA256 (Firebird-2.1.3.18185-0.tar.bz2) = 8047cbd4bdc79928be7369bf0cdfde74873f1de29c0ac74e7241826c02f0fd28
XSIZE (Firebird-2.1.3.18185-0.tar.bz2) = 13770360
b5bd21ecc5b45a92714074e53590b4a3
echo x - firebird21-server/pkg-descr
sed 's/^X//' >firebird21-server/pkg-descr << '0f478cdeda9f9f4b0f5e1be1949752f3'
XFirebird is a relational database offering many ANSI SQL-99 features
Xthat runs on Linux, Windows, and a variety of Unix platforms. Firebird
Xoffers excellent concurrency, high performance, and powerful language
Xsupport for stored procedures and triggers. It has been used in
Xproduction systems, under a variety of names since 1981.
X
XFirebird is completely free of any registration, licensing or deployment
Xfees. It may be deployed freely for use with any third-party software,
Xwhether commercial or not.
X
XWWW: http://sourceforge.net/projects/firebird/
XWWW: http://www.firebirdsql.org/
0f478cdeda9f9f4b0f5e1be1949752f3
echo x - firebird21-server/pkg-plist
sed 's/^X//' >firebird21-server/pkg-plist << '1f97f6dc26f87118137d8d1d22752904'
X@comment $FreeBSD: ports/databases/firebird21-server/pkg-plist$
Xbin/fb_inet_server
Xbin/fb_lock_mgr
Xbin/fb_lock_print
Xbin/gbak
Xbin/gdef
Xbin/gds_drop
Xbin/gfix
Xbin/gsec
Xbin/gstat
Xbin/nbackup
Xlibexec/firebird/intl/fbintl
Xlibexec/firebird/intl/fbintl.conf
Xlibexec/firebird/udf/fbudf.so
Xlibexec/firebird/udf/fbudf.sql
Xlibexec/firebird/udf/ib_udf.so
Xlibexec/firebird/udf/ib_udf2.sql
X@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true
X%%CONFDIR%%/aliases.conf.sample
X@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
X@dirrmtry %%CONFDIR%%
X@dirrm libexec/firebird/intl
X@dirrm libexec/firebird/udf
X@dirrm libexec/firebird
X@cwd /
X@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security2.fdb %D/%%LOCALSTATEDIR%%/security2.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security2.fdb) || true
X%%LOCALSTATEDIR%%/security2.fdb.sample
X@exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb
X%%LOCALSTATEDIR%%/help/help.fdb
X@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
X@rmtry %%LOCALSTATEDIR%%/isc_event1.`hostname`
X@rmtry %%LOCALSTATEDIR%%/isc_init1.`hostname`
X@rmtry %%LOCALSTATEDIR%%/isc_lock1.`hostname`
X@dirrm %%LOCALSTATEDIR%%/help
X@dirrmtry %%LOCALSTATEDIR%%
1f97f6dc26f87118137d8d1d22752904
echo x - firebird21-server/pkg-plist.client
sed 's/^X//' >firebird21-server/pkg-plist.client << '40e5ad976de3725093c3ee1c63aac880'
X@comment $FreeBSD: ports/databases/firebird21-server/pkg-plist.client$
Xbin/gpre
Xbin/isql-fb
Xbin/qli
Xinclude/ib_util.h
Xinclude/ibase.h
Xinclude/iberror.h
Xinclude/perf.h
Xlib/libfbclient.so
Xlib/libfbclient.so.2
Xlib/libfbclient.so.2.1
Xlib/libfbclient.so.%%FIREBIRD_VERSION%%
Xlib/libfbembed.so
Xlib/libfbembed.so.2
Xlib/libfbembed.so.2.1
Xlib/libfbembed.so.%%FIREBIRD_VERSION%%
Xlib/libgds.so
Xlib/libgds.so.2
Xlib/libgds.so.2.1
Xlib/libib_util.so
X@unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi
X%%CONFDIR%%/firebird.conf.sample
X@exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf
X@dirrmtry %%CONFDIR%%
X%%DATADIR%%/de_DE.msg
X%%DATADIR%%/firebird.msg
X%%DATADIR%%/fr_FR.msg
X@dirrm %%DATADIR%%
40e5ad976de3725093c3ee1c63aac880
exit
--------------070104030805030903020107--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011231310.oANDACEL013638>