Index: head/databases/libzdb/Makefile =================================================================== --- head/databases/libzdb/Makefile (revision 185956) +++ head/databases/libzdb/Makefile (revision 185957) @@ -1,56 +1,58 @@ # New ports collection makefile for: libzdb # Date created: Nov 28 2005 # Whom: vanilla@ # # $FreeBSD$ # PORTNAME= libzdb -PORTVERSION= 1.1.3 +PORTVERSION= 2.0 CATEGORIES= databases MASTER_SITES= http://www.tildeslash.com/libzdb/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= Thread-safe connection pool library GNU_CONFIGURE= yes 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 + +PLIST_SUB= VERSION=${PORTVERSION} .include .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${PREFIX} .else CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_SQLITE) USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite=${PREFIX} .else CONFIGURE_ARGS+= --without-sqlite .endif .if defined(WITH_PGSQL) USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql=${PREFIX} .else CONFIGURE_ARGS+= --without-pgsql .endif post-patch: @${REINPLACE_CMD} 's,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g' ${WRKSRC}/configure .include Property changes on: head/databases/libzdb/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/databases/libzdb/distinfo =================================================================== --- head/databases/libzdb/distinfo (revision 185956) +++ head/databases/libzdb/distinfo (revision 185957) @@ -1,3 +1,3 @@ -MD5 (libzdb-1.1.3.tar.gz) = 1449af48017ecc79c623ccb115a45f8b -SHA256 (libzdb-1.1.3.tar.gz) = 47413070fcbf2c1594ce7eef02591d56380d9fc5430116d31ec0172232b6e0cf -SIZE (libzdb-1.1.3.tar.gz) = 509250 +MD5 (libzdb-2.0.tar.gz) = 32cea8214f74b5f9c9185763159064c3 +SHA256 (libzdb-2.0.tar.gz) = 89f90f8c461bc6cf39e6edec68ab0170334a045f4948bef402b67a2208482736 +SIZE (libzdb-2.0.tar.gz) = 521236 Property changes on: head/databases/libzdb/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/libzdb/files/patch-configure =================================================================== --- head/databases/libzdb/files/patch-configure (revision 185956) +++ head/databases/libzdb/files/patch-configure (revision 185957) @@ -1,44 +1,44 @@ ---- configure.orig Sun Nov 5 05:57:07 2006 -+++ configure Sun Nov 5 18:57:50 2006 -@@ -19366,7 +19366,7 @@ +--- 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="%%PTHREAD_LIBS%% $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -19429,7 +19429,7 @@ +@@ -19522,7 +19522,7 @@ #define HAVE_LIBPTHREAD 1 _ACEOF - LIBS="-lpthread $LIBS" -+ LIBS="-pthread $LIBS" ++ LIBS="%%PTHREAD_LIBS%% $LIBS" else { { echo "$as_me:$LINENO: error: POSIX thread library is required" >&5 -@@ -19455,8 +19455,8 @@ +@@ -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 -@@ -19604,9 +19604,9 @@ +@@ -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 Property changes on: head/databases/libzdb/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/libzdb/pkg-plist =================================================================== --- head/databases/libzdb/pkg-plist (revision 185956) +++ head/databases/libzdb/pkg-plist (revision 185957) @@ -1,10 +1,10 @@ include/Connection.h include/ConnectionPool.h include/PreparedStatement.h include/ResultSet.h include/URL.h lib/libzdb.a lib/libzdb.la lib/libzdb.so -lib/libzdb-1.1.3.so -lib/libzdb-1.1.3.so.1 +lib/libzdb-%%VERSION%%.so +lib/libzdb-%%VERSION%%.so.2 Property changes on: head/databases/libzdb/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property