aboutsummaryrefslogtreecommitdiff
path: root/databases/libzdb
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2006-11-05 11:02:17 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2006-11-05 11:02:17 +0000
commit1ca4910cf7a45ea8e3b77427a921515868c4413e (patch)
tree0165df898b4faad2d6ede4a84d66569cf510ffe0 /databases/libzdb
parent2ca1ad31946b1319908fd2f3c96785032c3d7a86 (diff)
downloadports-1ca4910cf7a45ea8e3b77427a921515868c4413e.tar.gz
ports-1ca4910cf7a45ea8e3b77427a921515868c4413e.zip
Notes
Diffstat (limited to 'databases/libzdb')
-rw-r--r--databases/libzdb/Makefile21
-rw-r--r--databases/libzdb/distinfo6
-rw-r--r--databases/libzdb/files/patch-configure55
-rw-r--r--databases/libzdb/pkg-plist4
4 files changed, 44 insertions, 42 deletions
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index 83deffd3b8c0..7f81f9b89b01 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= libzdb
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.1
+PORTREVISION= 0
CATEGORIES= databases
MASTER_SITES= http://www.tildeslash.com/libzdb/dist/
@@ -19,18 +19,20 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnometarget
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
+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
+ SQLITE " Add Sqlite support" on \
+ PGSQL "Add PgSQL support" on
.include <bsd.port.pre.mk>
.if defined(WITH_MYSQL)
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql=${PREFIX}
-CONFIGURE_ENV+= CPPFLAGS+="-I${LOCALBASE}/include/mysql" \
- LDFLAGS+="-L${LOCALBASE}/lib/mysql"
.else
CONFIGURE_ARGS+= --without-mysql
.endif
@@ -42,6 +44,13 @@ CONFIGURE_ARGS+= --with-sqlite=${PREFIX}
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
diff --git a/databases/libzdb/distinfo b/databases/libzdb/distinfo
index 81c4b3792314..0845b12c5c5d 100644
--- a/databases/libzdb/distinfo
+++ b/databases/libzdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (libzdb-1.0.4.tar.gz) = ac61dde8fde854dca394dd56a7fd55a7
-SHA256 (libzdb-1.0.4.tar.gz) = a14549e7a700ccbca35bec192101bc64e23d98e324ae95eb6d8f4a56f400c918
-SIZE (libzdb-1.0.4.tar.gz) = 499729
+MD5 (libzdb-1.1.tar.gz) = 632a0f8ca709e98b2b702426ed277c9d
+SHA256 (libzdb-1.1.tar.gz) = 32a93ce8158c5c83a530e1af1b5b9ce21a4e50a2b23bcbadead835f3416e26d9
+SIZE (libzdb-1.1.tar.gz) = 508028
diff --git a/databases/libzdb/files/patch-configure b/databases/libzdb/files/patch-configure
index 0def5e0ca232..d2b83c50c66b 100644
--- a/databases/libzdb/files/patch-configure
+++ b/databases/libzdb/files/patch-configure
@@ -1,51 +1,44 @@
---- configure.orig Fri Aug 25 15:22:45 2006
-+++ configure Wed Aug 30 06:02:33 2006
-@@ -19263,10 +19263,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) /usr/local/bin/libtool'
-
- # Prevent multiple expansion
-
-@@ -19361,7 +19361,7 @@
+--- configure.orig Sun Nov 5 05:57:07 2006
++++ configure Sun Nov 5 18:57:50 2006
+@@ -19366,7 +19366,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-+LIBS="%%PTHREAD_LIBS%% $LIBS"
++LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19424,7 +19424,7 @@
+@@ -19429,7 +19429,7 @@
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
-+ LIBS="%%PTHREAD_LIBS%% $LIBS"
++ LIBS="-pthread $LIBS"
else
{ { echo "$as_me:$LINENO: error: POSIX thread library is required" >&5
-@@ -19599,7 +19599,7 @@
+@@ -19455,8 +19455,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 @@
_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/include"
- DBLDFLAGS="$DBLDFLAGS -L$with_mysql/lib/ -lmysqlclient"
++ DBCPPFLAGS="$DBCPPFLAGS -I$with_mysql/includemysql"
++ DBLDFLAGS="$DBLDFLAGS -L$with_mysql/lib/mysql -lmysqlclient"
else
-@@ -20657,7 +20657,7 @@
-
- # If the compiler is gcc, tune warnings and make the char type unsigned
- if test "x$GCC" = "xyes"; then
-- CFLAGS="$CFLAGS -Wall -Wunused -Wno-unused-label -funsigned-char";
-+ #CFLAGS="$CFLAGS -Wall -Wunused -Wno-unused-label -funsigned-char";
- # does this compiler support -Wno-pointer-sign ?
- svd_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Wno-pointer-sign"
+ mysql="no"
+ fi
diff --git a/databases/libzdb/pkg-plist b/databases/libzdb/pkg-plist
index 27814d8e4406..c7ac47feec54 100644
--- a/databases/libzdb/pkg-plist
+++ b/databases/libzdb/pkg-plist
@@ -6,5 +6,5 @@ include/URL.h
lib/libzdb.a
lib/libzdb.la
lib/libzdb.so
-lib/libzdb-1.0.4.so
-lib/libzdb-1.0.4.so.1
+lib/libzdb-1.1.so
+lib/libzdb-1.1.so.1