Date: Sat, 26 Apr 2008 03:00:30 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/123081: Update port: databases/libzdb to 2.2 Message-ID: <20080426030030.6e67bf35.tkato432@yahoo.com> Resent-Message-ID: <200804251810.m3PIA1Yh071859@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123081 >Category: ports >Synopsis: Update port: databases/libzdb to 2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Apr 25 18:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.3-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 2.2 Remove file: files/patch-configure >How-To-Repeat: >Fix: diff -urN /usr/ports/databases/libzdb/Makefile databases/libzdb/Makefile --- /usr/ports/databases/libzdb/Makefile 2008-02-18 00:54:19.000000000 +0900 +++ databases/libzdb/Makefile 2008-04-25 03:48:03.000000000 +0900 @@ -6,26 +6,25 @@ # PORTNAME= libzdb -PORTVERSION= 2.1 +PORTVERSION= 2.2 CATEGORIES= databases MASTER_SITES= http://www.tildeslash.com/libzdb/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= Thread-safe connection pool library -GNU_CONFIGURE= yes +OPTIONS= MYSQL "Add MySQL support" on \ + SQLITE " Add Sqlite support" on \ + PGSQL "Add PgSQL support" on + +USE_GNOME= gnometarget USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnometarget -USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" - -OPTIONS= MYSQL "Add MySQL support" on \ - SQLITE " Add Sqlite support" on \ - PGSQL "Add PgSQL support" on +USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION} @@ -53,6 +52,11 @@ .endif post-patch: - @${REINPLACE_CMD} 's,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lpthread |${PTHREAD_LIBS} |g ; \ + s|_mysql/lib |_mysql/lib/mysql |g ; \ + s|_mysql/include |_mysql/include/mysql |g ; \ + s|_mysql/include"|_mysql/include/mysql"|g ; \ + s|_mysql/lib/l|_mysql/lib/mysql/l|g ; \ + s|_mysql/lib/ |_mysql/lib/mysql |g' ${WRKSRC}/configure .include <bsd.port.post.mk> diff -urN /usr/ports/databases/libzdb/distinfo databases/libzdb/distinfo --- /usr/ports/databases/libzdb/distinfo 2008-02-18 00:54:19.000000000 +0900 +++ databases/libzdb/distinfo 2008-03-30 02:25:55.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (libzdb-2.1.tar.gz) = 5abec56051f105cacb6dcec237a1d989 -SHA256 (libzdb-2.1.tar.gz) = cfcd50e2e56cee30210b5c6ba8da0cf31ddcbf717396203d1fd53415e30b16d8 -SIZE (libzdb-2.1.tar.gz) = 586589 +MD5 (libzdb-2.2.tar.gz) = 3a1677704ce3821c53d6d0ae7b98dbb5 +SHA256 (libzdb-2.2.tar.gz) = 2b5212a733ef394670168b01723d4826f81530794d261ab46f2c6e6773c61580 +SIZE (libzdb-2.2.tar.gz) = 854701 diff -urN /usr/ports/databases/libzdb/files/patch-configure databases/libzdb/files/patch-configure --- /usr/ports/databases/libzdb/files/patch-configure 2007-02-26 15:35:24.000000000 +0900 +++ databases/libzdb/files/patch-configure 1970-01-01 09:00:00.000000000 +0900 @@ -1,44 +0,0 @@ ---- configure.orig Fri Feb 16 05:10:48 2007 -+++ configure Mon Feb 26 14:33:53 2007 -@@ -19459,7 +19459,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="%%PTHREAD_LIBS%% $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19522,7 +19522,7 @@ - #define HAVE_LIBPTHREAD 1 - _ACEOF - -- LIBS="-lpthread $LIBS" -+ LIBS="%%PTHREAD_LIBS%% $LIBS" - - else - { { echo "$as_me:$LINENO: error: POSIX thread library is required" >&5 -@@ -19548,8 +19548,8 @@ - else - svd_LDFLAGS=$LDFLAGS - svd_CPPFLAGS=$CPPFLAGS -- LDFLAGS="-L$with_mysql/lib $LDFLAGS" -- CPPFLAGS="-I$with_mysql/include $CPPFLAGS" -+ LDFLAGS="-L$with_mysql/lib/mysql $LDFLAGS" -+ CPPFLAGS="-I$with_mysql/include/mysql $CPPFLAGS" - - for ac_header in mysql.h - do -@@ -19697,9 +19697,9 @@ - _ACEOF - - mysql="yes" -- if test -r "$with_mysql/lib/libmysqlclient.a"; then -- DBCPPFLAGS="$DBCPPFLAGS -I$with_mysql/include" -- DBLDFLAGS="$DBLDFLAGS -L$with_mysql/lib/ -lmysqlclient" -+ if test -r "$with_mysql/lib/mysql/libmysqlclient.a"; then -+ DBCPPFLAGS="$DBCPPFLAGS -I$with_mysql/includemysql" -+ DBLDFLAGS="$DBLDFLAGS -L$with_mysql/lib/mysql -lmysqlclient" - else - mysql="no" - fi diff -urN /usr/ports/databases/libzdb/pkg-plist databases/libzdb/pkg-plist --- /usr/ports/databases/libzdb/pkg-plist 2008-02-18 00:54:19.000000000 +0900 +++ databases/libzdb/pkg-plist 2008-04-25 03:47:35.000000000 +0900 @@ -9,4 +9,4 @@ lib/libzdb.la lib/libzdb.so lib/libzdb-%%VERSION%%.so -lib/libzdb-%%VERSION%%.so.4 +lib/libzdb-%%VERSION%%.so.5 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080426030030.6e67bf35.tkato432>