Date: Mon, 28 Mar 2005 14:29:09 -0300 (BRST) From: Renato Botelho <freebsd@galle.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79310: [PATCH] databases/firebird-devel: update to 20050327 (2.0-alpha1), take maintainership Message-ID: <200503281729.j2SHT9RF074079@data.galle.com.br> Resent-Message-ID: <200503281730.j2SHU3ZZ015346@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79310 >Category: ports >Synopsis: [PATCH] databases/firebird-devel: update to 20050327 (2.0-alpha1), take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Mar 28 17:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.3-RELEASE-p5 i386 >Organization: Galle Folheados - http://www.galle.com.br >Environment: System: FreeBSD data.galle.com.br 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #7: Thu Mar 3 09:03:28 BRST >Description: - Update to 20050327 (2.0-alpha1) - Take maintainership - Remove undeeded patch-src::common::classes::locks.h - Convert patch-autogen.sh to ${REINPLACE_CMD} Removed file(s): - files/patch-autogen.sh - files/patch-src::common::classes::locks.h Special thanks to Wendell Martins Borges <wendell@ramenzoni.com.br> for hosting source tarball Port maintainer (ports@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- firebird-devel-2.0.a1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/firebird-devel/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 12 Oct 2004 09:35:46 -0000 1.24 +++ Makefile 28 Mar 2005 17:23:54 -0000 @@ -6,15 +6,14 @@ # PORTNAME= firebird -PORTVERSION= 2.0.a0 -PORTREVISION= 1 +PORTVERSION= 2.0.a1 CATEGORIES= databases -MASTER_SITES= http://www.aims.net.au/chris/firebird/ +MASTER_SITES= http://www.ramenzoni.com.br/~garga/firebird/ MASTER_SITE_SUBDIR=firebird PKGNAMESUFFIX= -devel -DISTNAME= firebird2-20031110 +DISTNAME= firebird2-20050327 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd@galle.com.br COMMENT= The open-source InterBase(tm) 6.0 spin-off (Classic version) USE_BZIP2= yes @@ -23,6 +22,7 @@ GNU_CONFIGURE= yes WANT_AUTOCONF_VER= 259 USE_GCC= 3.4 +USE_REINPLACE= yes CONFLICTS= firebird-1.* NO_PACKAGE= pkg-install not finished @@ -52,6 +52,12 @@ @sleep 10 .endif +pre-configure: + @${REINPLACE_CMD} "s/AUTOCONF=autoconf/AUTOCONF=autoconf259/g; \ + s/LIBTOOL=libtool/LIBTOOL=libtool13/g; \ + s/LIBTOOLIZE=libtoolize/LIBTOOLIZE=libtoolize13/g" \ + ${WRKSRC}/autogen.sh + do-configure: @(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} ./autogen.sh --prefix=${PREFIX}/firebird --with-lock-manager --with-editline) Index: distinfo =================================================================== RCS file: /home/ncvs/ports/databases/firebird-devel/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 18 Mar 2004 17:59:58 -0000 1.5 +++ distinfo 28 Mar 2005 17:23:54 -0000 @@ -1,2 +1,2 @@ -MD5 (firebird2-20031110.tar.bz2) = fa8cc0819e0a74278719953cf013bcb1 -SIZE (firebird2-20031110.tar.bz2) = 3682236 +MD5 (firebird2-20050327.tar.bz2) = 93996c74033f0efa180527e69f45196a +SIZE (firebird2-20050327.tar.bz2) = 4321529 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/databases/firebird-devel/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 4 Dec 2003 17:34:20 -0000 1.3 +++ pkg-plist 28 Mar 2005 17:23:54 -0000 @@ -6,6 +6,7 @@ firebird/UDF/ib_udf.sql firebird/WhatsNew firebird/aliases.conf +firebird/aliases.conf.sample firebird/bin/fb_inet_server firebird/bin/fb_lock_mgr firebird/bin/fb_lock_print @@ -20,32 +21,57 @@ firebird/bin/isql firebird/bin/qli firebird/doc/README.NTSecurity +firebird/doc/README.Optimizer.txt +firebird/doc/README.Win32LibraryInstallation.txt firebird/doc/README.build.mingw.html firebird/doc/README.build.msvc.html firebird/doc/README.coding.style firebird/doc/README.instsvc +firebird/doc/README.isql_enhancements.txt firebird/doc/README.makefiles +firebird/doc/README.performance_monitoring +firebird/doc/README.sha1 firebird/doc/README.user firebird/doc/README.user.embedded firebird/doc/README.user.troubleshooting +firebird/doc/README.xnet +firebird/doc/sql.extensions/README.PSQL_stack_trace.txt firebird/doc/sql.extensions/README.aggregate_tracking firebird/doc/sql.extensions/README.case firebird/doc/sql.extensions/README.coalesce firebird/doc/sql.extensions/README.context_variables +firebird/doc/sql.extensions/README.context_variables2 +firebird/doc/sql.extensions/README.cursors +firebird/doc/sql.extensions/README.data_type_results_of_aggregations.txt firebird/doc/sql.extensions/README.data_types +firebird/doc/sql.extensions/README.ddl.txt +firebird/doc/sql.extensions/README.default_parameters +firebird/doc/sql.extensions/README.derived_tables.txt +firebird/doc/sql.extensions/README.distinct firebird/doc/sql.extensions/README.exception_handling +firebird/doc/sql.extensions/README.execute_block firebird/doc/sql.extensions/README.execute_statement firebird/doc/sql.extensions/README.explicit_locks +firebird/doc/sql.extensions/README.expression_indices +firebird/doc/sql.extensions/README.iif +firebird/doc/sql.extensions/README.keywords +firebird/doc/sql.extensions/README.leave_labels +firebird/doc/sql.extensions/README.null_value firebird/doc/sql.extensions/README.nullif firebird/doc/sql.extensions/README.order_by_expressions_nulls +firebird/doc/sql.extensions/README.plan +firebird/doc/sql.extensions/README.rows firebird/doc/sql.extensions/README.savepoints +firebird/doc/sql.extensions/README.select_expressions +firebird/doc/sql.extensions/README.sequence_generators firebird/doc/sql.extensions/README.universal_triggers +firebird/doc/sql.extensions/README.view_updates firebird/firebird.conf +firebird/firebird.conf.sample @unexec rm -f %D/firebird/firebird.log firebird/firebird.msg firebird/help/help.fdb firebird/include/blr.h -firebird/include/gds.h firebird/include/ib_util.h firebird/include/ibase.h firebird/include/iberror.h @@ -61,7 +87,8 @@ firebird/lib/libfbembed.so.2 firebird/lib/libfbembed.so.2.0.0 firebird/lib/libib_util.so -firebird/security.fdb +firebird/security2.fdb.sample +firebird/security2.fdb @dirrm firebird/UDF @dirrm firebird/bin @dirrm firebird/doc/sql.extensions Index: files/patch-autogen.sh =================================================================== RCS file: files/patch-autogen.sh diff -N files/patch-autogen.sh --- files/patch-autogen.sh 1 Jul 2004 17:06:35 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ ---- autogen.sh.orig Sat Nov 1 14:50:38 2003 -+++ autogen.sh Mon Nov 10 16:24:17 2003 -@@ -8,7 +8,7 @@ - SRCDIR=`dirname $0` - DIE=0 - --VER=`autoconf --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'` -+VER=`autoconf259 --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'` - case "$VER" in - 0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \ - 2\.[1-4][0-9] | 2\.5[0-6][a-z]* ) -@@ -20,7 +20,7 @@ - ;; - esac - --VER=`libtool --version|grep ' libtool)'|sed 's/.*) \([0-9][0-9.]*\) .*/\1/'` -+VER=`libtool13 --version|grep ' libtool)'|sed 's/.*) \([0-9][0-9.]*\) .*/\1/'` - case "$VER" in - 0* | 1\.[0-2] | 1\.[0-2][a-z]* | \ - 1\.3\.[0-2] | 1\.3\.[0-2][a-z]* ) -@@ -50,18 +50,18 @@ - - # Generate configure from configure.in - echo "Running libtoolize ..." --LIBTOOL_M4=`libtoolize --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*\(/[^']*\).*$,\1,"` -+LIBTOOL_M4=`libtoolize13 --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*\(/[^']*\).*$,\1,"` - if test "x$LIBTOOL_M4" != "x"; then - rm -f aclocal.m4 - cp $LIBTOOL_M4 aclocal.m4 - fi --libtoolize --copy --force || exit 1 -+libtoolize13 --copy --force || exit 1 - - echo "Running autoheader ..." --autoheader || exit 1 -+autoheader259 || exit 1 - - echo "Running autoconf ..." --autoconf || exit 1 -+autoconf259 || exit 1 - - # If NOCONFIGURE is set, skip the call to configure - if test "x$NOCONFIGURE" = "x"; then Index: files/patch-src::common::classes::locks.h =================================================================== RCS file: files/patch-src::common::classes::locks.h diff -N files/patch-src::common::classes::locks.h --- files/patch-src::common::classes::locks.h 4 Dec 2003 17:34:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,49 +0,0 @@ ---- src/common/classes/locks.h.orig Sun Aug 17 14:56:47 2003 -+++ src/common/classes/locks.h Wed Nov 12 11:12:25 2003 -@@ -77,7 +77,7 @@ - - /* Process-local spinlock. Used to manage memory heaps in threaded environment. */ - // Pthreads version of the class --#ifndef SOLARIS -+#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) - class Spinlock { - private: - pthread_spinlock_t spinlock; -@@ -100,6 +100,7 @@ - } - }; - #else -+#ifdef SOLARIS - // Who knows why Solaris 2.6 have not THIS funny spins? - //The next code is not comlpeted but let me compile //Konstantin - class Spinlock { -@@ -123,6 +124,29 @@ - system_call_failed::raise(); - } - }; -+#else // DARWIN and FREEBSD -+class Spinlock { -+private: -+ pthread_mutex_t mlock; -+public: -+ Spinlock() { -+ if (pthread_mutex_init(&mlock, 0)) -+ system_call_failed::raise(); -+ } -+ ~Spinlock() { -+ if (pthread_mutex_destroy(&mlock)) -+ system_call_failed::raise(); -+ } -+ void enter() { -+ if (pthread_mutex_lock(&mlock)) -+ system_call_failed::raise(); -+ } -+ void leave() { -+ if (pthread_mutex_unlock(&mlock)) -+ system_call_failed::raise(); -+ } -+}; -+#endif - - #endif - #endif --- firebird-devel-2.0.a1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503281729.j2SHT9RF074079>