aboutsummaryrefslogtreecommitdiffstats
path: root/databases/libzdb
diff options
context:
space:
mode:
authorlwhsu <lwhsu@FreeBSD.org>2008-04-28 00:30:18 +0800
committerlwhsu <lwhsu@FreeBSD.org>2008-04-28 00:30:18 +0800
commit180b0245f67cbb574aad2dc1d915cf9ac3e97d42 (patch)
treecedfae825a4a1168be9702ed8eb13a6fcd54d6ae /databases/libzdb
parent39e5bc0c1b4f1086be26e848c4c94ec90bf42b4c (diff)
downloadfreebsd-ports-gnome-180b0245f67cbb574aad2dc1d915cf9ac3e97d42.tar.gz
freebsd-ports-gnome-180b0245f67cbb574aad2dc1d915cf9ac3e97d42.tar.zst
freebsd-ports-gnome-180b0245f67cbb574aad2dc1d915cf9ac3e97d42.zip
- Update to version 2.2
PR: ports/123081 Submitted by: KATO Tsuguru <tkato432 AT yahoo.com>
Diffstat (limited to 'databases/libzdb')
-rw-r--r--databases/libzdb/Makefile22
-rw-r--r--databases/libzdb/distinfo6
-rw-r--r--databases/libzdb/files/patch-configure44
-rw-r--r--databases/libzdb/pkg-plist2
4 files changed, 17 insertions, 57 deletions
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index 8beec55f7328..c896e3a7ee6f 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -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 @@ CONFIGURE_ARGS+= --without-pgsql
.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 --git a/databases/libzdb/distinfo b/databases/libzdb/distinfo
index 9eb63b7c41c9..170fef613146 100644
--- a/databases/libzdb/distinfo
+++ b/databases/libzdb/distinfo
@@ -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 --git a/databases/libzdb/files/patch-configure b/databases/libzdb/files/patch-configure
deleted file mode 100644
index ec5015fbe46f..000000000000
--- a/databases/libzdb/files/patch-configure
+++ /dev/null
@@ -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 --git a/databases/libzdb/pkg-plist b/databases/libzdb/pkg-plist
index 3127937e5d0d..4f4e7d8f0311 100644
--- a/databases/libzdb/pkg-plist
+++ b/databases/libzdb/pkg-plist
@@ -9,4 +9,4 @@ lib/libzdb.a
lib/libzdb.la
lib/libzdb.so
lib/libzdb-%%VERSION%%.so
-lib/libzdb-%%VERSION%%.so.4
+lib/libzdb-%%VERSION%%.so.5