- update to 0.9.11 .

- SHARED_LIBS format.
- move LIB_DEPENDS variables out of the loops.
- advise another database location for SQLite, it doesn't affect
  existing setups.

espie glanced at the infrastructure changes;
"looks ok" msf@

security/prelude/libpreludedb/Makefile

@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.9 2006/11/25 19:54:16 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2006/12/30 16:30:11 aanriot Exp $
 
 COMMENT-main=	"Prelude framework database-access library"
 COMMENT-pgsql=	"PostgreSQL module for libpreludedb"
 COMMENT-mysql=	"MySQL module for libpreludedb"
 COMMENT-sqlite=	"SQLite3 module for libpreludedb"
 
-VERSION=	0.9.10
+VERSION=	0.9.11
 DISTNAME=	libpreludedb-${VERSION}
 
-PKGNAME-main=	prelude-${DISTNAME}p0
+PKGNAME-main=	prelude-libpreludedb-${VERSION}
 PKGNAME-pgsql=	prelude-libpreludedb-pgsql-${VERSION}
 PKGNAME-mysql=	prelude-libpreludedb-mysql-${VERSION}
 PKGNAME-sqlite=	prelude-libpreludedb-sqlite-${VERSION}
@@ -16,14 +16,28 @@ PKGNAME-sqlite=	prelude-libpreludedb-sqlite-${VERSION}
 MODULES=	lang/python \
 		devel/gettext
 
-SHARED_LIBS=	preludedb	4.2
+SHARED_LIBS=	preludedb	4.3	# .4.2
 
 WANTLIB=	z
+WANTLIB-main=	${WANTLIB} c pthread
+WANTLIB-mysql=	${WANTLIB} crypto m ssl
 
-LIB_DEPENDS=	gpg-error.>=1::security/libgpg-error		\
-		gcrypt.>=12::security/libgcrypt			\
-		gnutls.>=12::security/gnutls			\
-		prelude.>=7::security/prelude/libprelude
+LIB_DEPENDS=		gcrypt.>=12::security/libgcrypt \
+			gnutls.>=12::security/gnutls \
+			gpg-error.>=1::security/libgpg-error \
+			prelude.>=7::security/prelude/libprelude
+
+LIB_DEPENDS-pgsql=	${LIB_DEPENDS} \
+			preludedb.>=3::${BUILD_PKGPATH} \
+			pq.>=4::databases/postgresql
+
+LIB_DEPENDS-mysql=	${LIB_DEPENDS} \
+			preludedb.>=3::${BUILD_PKGPATH} \
+			lib/mysql/mysqlclient.>=16::databases/mysql
+
+LIB_DEPENDS-sqlite=	${LIB_DEPENDS} \
+			preludedb.>=3::${BUILD_PKGPATH} \
+			sqlite3.>=8::databases/sqlite3
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/doc
@@ -31,14 +45,10 @@ CONFIGURE_ENV=	PYTHON=${MODPY_BIN}
 
 PSEUDO_FLAVORS=	no_pgsql no_mysql no_sqlite
 FLAVOR?=
-
 MULTI_PACKAGES=	-main
 
 .if empty(FLAVOR:L:Mno_pgsql)
 MULTI_PACKAGES+=-pgsql
-LIB_DEPENDS-pgsql=	${LIB_DEPENDS} \
-			preludedb.>=3::${BUILD_PKGPATH} \
-			pq.>=4::databases/postgresql
 CONFIGURE_ARGS+=--with-pgsql
 .else
 CONFIGURE_ARGS+=--without-pgsql
@@ -46,10 +56,6 @@ CONFIGURE_ARGS+=--without-pgsql
 
 .if empty(FLAVOR:L:Mno_mysql)
 MULTI_PACKAGES+=-mysql
-LIB_DEPENDS-mysql=	${LIB_DEPENDS} \
-			preludedb.>=3::${BUILD_PKGPATH} \
-			lib/mysql/mysqlclient.>=16::databases/mysql
-WANTLIB-mysql=		${WANTLIB} m ssl crypto
 CONFIGURE_ARGS+=--with-mysql
 .else
 CONFIGURE_ARGS+=--without-mysql
@@ -57,16 +63,11 @@ CONFIGURE_ARGS+=--without-mysql
 
 .if empty(FLAVOR:L:Mno_sqlite)
 MULTI_PACKAGES+=-sqlite
-LIB_DEPENDS-sqlite=	${LIB_DEPENDS} \
-			preludedb.>=3::${BUILD_PKGPATH} \
-			sqlite3.>=8::databases/sqlite3
 CONFIGURE_ARGS+=--with-sqlite3
 .else
 CONFIGURE_ARGS+=--without-sqlite3
 .endif
 
-WANTLIB-main=	${WANTLIB} pthread c
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/libpreludedb/plugins/sql/
 

security/prelude/libpreludedb/distinfo

@@ -1,4 +1,4 @@
-MD5 (libpreludedb-0.9.10.tar.gz) = 50131972b9e84446f636c2e6d383d692
-RMD160 (libpreludedb-0.9.10.tar.gz) = 0fccef8774e67bd47a82259bb4e7b1115de5c07e
-SHA1 (libpreludedb-0.9.10.tar.gz) = eb0f19bd2557d4c86b34867c72cb0b27bb7c3fcd
-SIZE (libpreludedb-0.9.10.tar.gz) = 747841
+MD5 (libpreludedb-0.9.11.tar.gz) = f0b2a1229784419be1f9602f3f06d539
+RMD160 (libpreludedb-0.9.11.tar.gz) = ed0a551c0e80ecfab872f0fb098c5869384604d4
+SHA1 (libpreludedb-0.9.11.tar.gz) = 41cd62539a175d435f1330ff6fc165708f1bae62
+SIZE (libpreludedb-0.9.11.tar.gz) = 636984

security/prelude/libpreludedb/files/README.OpenBSD

@@ -23,7 +23,7 @@ Instructions for MySQL:
 
 Instructions for SQLite:
 
-  # cd /var/prelude/manager/
+  # cd /var/prelude/
   # sqlite3 prelude.db < $PREFIX/share/libpreludedb/classic/sqlite.sql
   # chown _prelude:_prelude prelude.db