From 195ef8b9310f5752e9d86324b8f8771155df37d2 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 4 Nov 2011 08:16:23 +0000 Subject: [PATCH] - regen WANTLIB --- databases/gq/Makefile | 9 +++++---- databases/iodbc/Makefile | 6 +++--- databases/keximdb/Makefile | 12 +++++++----- databases/libdbi-drivers/Makefile | 9 ++++----- databases/libpqxx/Makefile | 6 +++--- databases/mdbtools/snapshot/Makefile | 9 +++++---- databases/mysqlcc/Makefile | 6 +++--- databases/postgresql-odbc/Makefile | 6 +++--- databases/py-cdb/Makefile | 6 ++++-- databases/py-mysql/Makefile | 6 +++--- databases/py-odbc/Makefile | 6 +++--- databases/py-pgsql/Makefile | 6 +++--- databases/py-psycopg2/Makefile | 6 +++--- databases/py-pygresql/Makefile | 6 +++--- databases/py-sqlalchemy/Makefile | 6 ++++-- databases/py-sqlite/Makefile | 6 +++--- databases/py-sqlite2/Makefile | 6 +++--- databases/py-storm/Makefile | 6 ++++-- databases/py-sybase/Makefile | 6 +++--- databases/qt3-sqlite3-plugin/Makefile | 6 +++--- databases/ruby-do_mysql/Makefile | 6 +++--- databases/ruby-mysql/Makefile | 6 +++--- databases/ruby-mysqlplus/Makefile | 6 +++--- databases/skytools/Makefile | 6 +++--- databases/sqlitebrowser/Makefile | 6 +++--- databases/sqliteman/Makefile | 9 +++------ 26 files changed, 90 insertions(+), 84 deletions(-) diff --git a/databases/gq/Makefile b/databases/gq/Makefile index 32ba366d444..44346e36039 100644 --- a/databases/gq/Makefile +++ b/databases/gq/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.37 2011/09/16 08:48:02 espie Exp $ +# $OpenBSD: Makefile,v 1.38 2011/11/04 08:16:23 jasper Exp $ COMMENT= GTK-based LDAP client DISTNAME= gq-1.0beta1 -REVISION= 15 +REVISION= 16 CATEGORIES= databases sysutils HOMEPAGE= http://biot.com/gq/ @@ -16,12 +16,13 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/} -WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \ +WANTLIB= X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \ Xinerama Xrandr Xrender atk-1.0 c cairo crypto expat \ fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \ gobject-2.0 krb5 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pixman-1 png pthread-stubs sasl2 ssl xcb z xml2 ldap>=7 \ - lber>=7 gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0 + lber>=7 gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0 \ + GL gthread-2.0 pthread xcb-render xcb-shm MODULES= devel/gettext diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile index 7c7cc8f0ba3..3520a9e78ca 100644 --- a/databases/iodbc/Makefile +++ b/databases/iodbc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2011/09/16 08:48:02 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2011/11/04 08:16:23 jasper Exp $ COMMENT-main= ODBC 3.x driver manager COMMENT-admin= ODBC 3.x driver manager admin application @@ -9,7 +9,7 @@ DISTNAME= libiodbc-$V PKGNAME= iodbc-$V PKGNAME-main= iodbc-$V PKGNAME-admin= iodbc-admin-$V -REVISION-admin = 0 +REVISION-admin = 1 CATEGORIES= databases @@ -56,7 +56,7 @@ WANTLIB-admin= ${MODGETTEXT_WANTLIB} c pthread \ gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ gtk-x11-2.0 iodbc iodbcinst m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pcre pixman-1 png pthread-stubs xcb xcb-render \ - xcb-shm z + xcb-shm z ffi stdc++ EXDIR=${PREFIX}/share/examples/iodbc/ post-install: diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile index aa856aaabc6..a483e58a1bd 100644 --- a/databases/keximdb/Makefile +++ b/databases/keximdb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/09/16 08:48:03 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2011/11/04 08:16:23 jasper Exp $ CATEGORIES= databases x11 x11/kde COMMENT= MDB (access) file migration driver for kexi @@ -7,7 +7,7 @@ VERSION= 1.6.1 MASTER_SITES= ${MASTER_SITE_KDE:S@$@stable/koffice-${VERSION}/src/@} DISTNAME= keximdb-1.1.0 DIST_SUBDIR= kde -REVISION= 4 +REVISION= 5 HOMEPAGE= http://www.kexi-project.org/wiki/wikiview/index.php?MDBDriver SHARED_ONLY= Yes @@ -34,13 +34,15 @@ LIB_DEPENDS += x11/kde/libs3 \ x11/kde/office3 \ databases/mdbtools/snapshot -WANTLIB += ICE SM X11 Xau Xdmcp Xext Xrender jpeg m png rpcsvc -WANTLIB += stdc++ util z art_lgpl_2 fam glib-2.0 idn -WANTLIB += pcre pthread-stubs xcb kdecore>=7 DCOP kabc kdefx +WANTLIB += ICE SM X11 Xext Xrender jpeg m png +WANTLIB += stdc++ util z art_lgpl_2 glib-2.0 idn +WANTLIB += pcre xcb kdecore>=7 DCOP kabc kdefx WANTLIB += kdeprint kdesu kdeui kparts kutils kwalletclient kio WANTLIB += kmdi knewstuff kresources ktexteditor vcard kofficecore>=3 WANTLIB += kexicore kexidatatable kexidb kexidbparser kexiextendedwidgets WANTLIB += kexiguiutils keximain keximigrate kexiutils kofficeui WANTLIB += koproperty kowmf kstore kwmf mdb +WANTLIB += GL Xcursor Xdamage Xfixes Xft Xi Xinerama Xmu Xrandr +WANTLIB += Xt Xxf86vm drm expat fontconfig freetype lcms mng .include diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index 8285a7e123d..3226e5e4faa 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/09/16 08:48:03 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2011/11/04 08:16:24 jasper Exp $ V = 0.8.3-1 COMMENT-main = mysql driver for libdbi @@ -15,7 +15,7 @@ PKGNAME-sqlite = libdbi-drivers-sqlite-${V:S/-/./} PKGNAME-sqlite3 = libdbi-drivers-sqlite3-${V:S/-/./} REVISION-sqlite3 = 0 PKGNAME-freetds = libdbi-drivers-freetds-${V:S/-/./} -REVISION-freetds = 2 +REVISION-freetds = 3 CATEGORIES = databases HOMEPAGE = http://libdbi-drivers.sourceforge.net/ @@ -70,11 +70,10 @@ LIB_DEPENDS-sqlite3 = databases/sqlite3 \ databases/libdbi RUN_DEPENDS-sqlite3 = -WANTLIB-freetds = m ct dbi gcrypt gmp gnutls gpg-error hogweed \ +WANTLIB-freetds = m ct dbi gmp gnutls p11-kit hogweed \ nettle tasn1 z ${MODGETTEXT_WANTLIB} LIB_DEPENDS-freetds = databases/freetds \ - databases/libdbi \ - security/libgcrypt + databases/libdbi REGRESS_IS_INTERACTIVE =Yes REGRESS_DEPENDS = databases/libdbi-drivers,-main \ diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile index 117ff885f88..6d498d4a0e7 100644 --- a/databases/libpqxx/Makefile +++ b/databases/libpqxx/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2011/09/16 08:48:03 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2011/11/04 08:16:24 jasper Exp $ COMMENT= C++ client API for PostgreSQL DISTNAME= libpqxx-2.5.3 -REVISION= 2 +REVISION= 3 CATEGORIES= databases SHARED_LIBS += pqxx 1.0 # .0.0 @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += pq>=4 +WANTLIB += pq>=4 com_err crypto m ssl stdc++ MASTER_SITES= http://pqxx.org/download/software/libpqxx/ \ ftp://pqxx.org/software/libpqxx/ diff --git a/databases/mdbtools/snapshot/Makefile b/databases/mdbtools/snapshot/Makefile index 9a1bf8be522..0346ee7572c 100644 --- a/databases/mdbtools/snapshot/Makefile +++ b/databases/mdbtools/snapshot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2011/09/16 08:48:03 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2011/11/04 08:16:24 jasper Exp $ COMMENT-main= read microsoft Access MDB COMMENT-gmdb= graphical interface to MDB tools @@ -9,7 +9,7 @@ PKGNAME-gmdb= gmdb-${DATE} HOMEPAGE= http://mdbtools.sourceforge.net/ REVISION-main= 6 -REVISION-gmdb= 9 +REVISION-gmdb= 10 CATEGORIES= databases converters MASTER_SITES= ftp://quatramaran.ens.fr/pub/espie/ @@ -59,8 +59,9 @@ WANTLIB-gmdb= ${WANTLIB} \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pixman-1 png popt pthread ssl util xml2 z xcb-render \ pthread-stubs xcb mdb mdbsql gio-2.0 gmodule-2.0 \ - gobject-2.0 gthread-2.0 gnomeui-2 xcb-render-util \ - canberra gcrypt gpg-error ltdl ogg vorbis vorbisfile + gobject-2.0 gthread-2.0 gnomeui-2 \ + canberra gcrypt gpg-error ltdl ogg vorbis vorbisfile \ + GL Xxf86vm drm ffi stdc++ xcb-shm WANTLIB-main= ${WANTLIB} readline termcap diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile index 438b43b2401..df942f2322a 100644 --- a/databases/mysqlcc/Makefile +++ b/databases/mysqlcc/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.14 2011/09/16 08:48:03 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2011/11/04 08:16:24 jasper Exp $ COMMENT= GUI client for MySQL VERSION= 0.9.8 DISTNAME= mysqlcc-${VERSION}-src PKGNAME= mysqlcc-${VERSION} -REVISION= 1 +REVISION= 2 CATEGORIES= databases HOMEPAGE= http://mysqlcc.sourceforge.net/ @@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += X11 Xext c m pthread pthread-stubs stdc++ xcb z +WANTLIB += X11 Xext c m pthread stdc++ z WANTLIB += lib/mysql/mysqlclient>=10 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mysqlcc/} diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile index 53acf20e249..dd397fbf159 100644 --- a/databases/postgresql-odbc/Makefile +++ b/databases/postgresql-odbc/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2011/09/16 08:48:03 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2011/11/04 08:16:24 jasper Exp $ COMMENT= ODBC driver for PostgreSQL VERSION= 08.03.0400 PKGNAME= postgresql-odbc-${VERSION} DISTNAME= psqlodbc-${VERSION} CATEGORIES= databases -REVISION = 0 +REVISION = 1 HOMEPAGE= http://pgfoundry.org/projects/psqlodbc/ @@ -24,7 +24,7 @@ SHARED_ONLY = Yes LIB_DEPENDS = databases/postgresql>=8.3 \ databases/iodbc -WANTLIB = pq iodbc iodbcinst pthread +WANTLIB = pq iodbc iodbcinst pthread com_err crypto ssl USE_GMAKE= Yes USE_LIBTOOL= Yes diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile index 790ec21f7e4..d83771da908 100644 --- a/databases/py-cdb/Makefile +++ b/databases/py-cdb/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2011/09/16 08:48:03 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2011/11/04 08:16:24 jasper Exp $ COMMENT= Python extension module for accessing cdb databases DISTNAME= python-cdb-0.32 PKGNAME= ${DISTNAME:S/python/py/} -REVISION = 7 +REVISION = 8 CATEGORIES= databases HOMEPAGE= http://pilcrow.madison.wi.us/ @@ -19,6 +19,8 @@ MASTER_SITES= ${HOMEPAGE}/python-cdb/ MODULES= lang/python +WANTLIB= ${MODPY_WANTLIB} + NO_REGRESS= Yes DOCSDIR= ${PREFIX}/share/doc/py-cdb diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile index 7d6654d9e6e..54878c25c83 100644 --- a/databases/py-mysql/Makefile +++ b/databases/py-mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.41 2011/11/04 08:16:24 jasper Exp $ SHARED_ONLY = Yes @@ -7,7 +7,7 @@ COMMENT = Python interface to MySQL MODPY_EGG_VERSION = 1.2.3 DISTNAME = MySQL-python-${MODPY_EGG_VERSION} PKGNAME = py-mysql-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = databases @@ -21,7 +21,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -WANTLIB = crypto m pthread ssl z +WANTLIB = crypto m pthread ssl z ${MODPY_WANTLIB} WANTLIB += lib/mysql/mysqlclient_r>=14 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mysql-python/} diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile index b4ed67dcca4..cfcdcbd4986 100644 --- a/databases/py-odbc/Makefile +++ b/databases/py-odbc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2011/11/04 08:16:24 jasper Exp $ SHARED_ONLY = Yes @@ -6,7 +6,7 @@ COMMENT = ODBC bindings for Python MODPY_EGG_VERSION=2.1.8 DISTNAME = pyodbc-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 PKGNAME = ${DISTNAME:S/py/py-/} CATEGORIES = databases @@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += m stdc++ +WANTLIB += m stdc++ ${MODPY_WANTLIB} MASTER_SITES = ${HOMEPAGE}files/ EXTRACT_SUFX = .zip diff --git a/databases/py-pgsql/Makefile b/databases/py-pgsql/Makefile index 713d8a58926..6578a2ead1a 100644 --- a/databases/py-pgsql/Makefile +++ b/databases/py-pgsql/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2011/11/04 08:16:24 jasper Exp $ COMMENT = Python DB-API 2.0 compliant interface to PostgreSQL MODPY_EGG_VERSION = 2.5.1 DISTNAME = pyPgSQL-${MODPY_EGG_VERSION} PKGNAME = py-pgsql-${MODPY_EGG_VERSION} -REVISION = 3 +REVISION = 4 CATEGORIES = databases HOMEPAGE = http://pypgsql.sourceforge.net/ @@ -27,7 +27,7 @@ BUILD_DEPENDS = databases/postgresql RUN_DEPENDS = py-mxDateTime-*-${PY_FLAVOR}:devel/py-mxDateTime,${PY_FLAVOR} LIB_DEPENDS = databases/postgresql REGRESS_DEPENDS = ${RUN_DEPENDS} -WANTLIB += pq>=5 +WANTLIB += pq>=5 ${MODPY_WANTLIB} # To run the tests, create and start a test database as follows: # createdb -E UNICODE pypgsql diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index 35effb91849..60b538df22b 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2011/11/04 08:16:24 jasper Exp $ SHARED_ONLY = Yes @@ -7,7 +7,7 @@ COMMENT = PostgreSQL database adapter for Python MODPY_EGG_VERSION = 2.4.1 DISTNAME = psycopg2-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = databases HOMEPAGE = http://initd.org/projects/psycopg2 @@ -25,7 +25,7 @@ MASTER_SITES = ${MASTER_SITE_PYPI:=p/psycopg2/} \ MODULES = lang/python LIB_DEPENDS = databases/postgresql -WANTLIB += pq +WANTLIB += pq ${MODPY_WANTLIB} RUN_DEPENDS = databases/postgresql REGRESS_DEPENDS = ${RUN_DEPENDS} diff --git a/databases/py-pygresql/Makefile b/databases/py-pygresql/Makefile index 5226a47b994..6464a3981dd 100644 --- a/databases/py-pygresql/Makefile +++ b/databases/py-pygresql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2011/11/04 08:16:24 jasper Exp $ COMMENT = PostgreSQL module for Python @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 4.0 DISTNAME = PyGreSQL-${MODPY_EGG_VERSION} PKGNAME = py-pygresql-${MODPY_EGG_VERSION} CATEGORIES = databases -REVISION = 2 +REVISION = 3 HOMEPAGE = http://www.pygresql.org/ @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP = Yes MODULES = lang/python LIB_DEPENDS = databases/postgresql -WANTLIB += pq>=5 +WANTLIB += pq>=5 ${MODPY_WANTLIB} BUILD_DEPENDS = databases/postgresql,-server RUN_DEPENDS = databases/postgresql,-main diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile index 228a2224073..d07d6517abb 100644 --- a/databases/py-sqlalchemy/Makefile +++ b/databases/py-sqlalchemy/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.24 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2011/11/04 08:16:24 jasper Exp $ COMMENT = database toolkit for Python MODPY_EGG_VERSION = 0.7.1 DISTNAME = SQLAlchemy-${MODPY_EGG_VERSION} PKGNAME = py-sqlalchemy-${MODPY_EGG_VERSION:S/p/./} -REVISION = 0 +REVISION = 1 CATEGORIES = databases @@ -25,6 +25,8 @@ MODULES = lang/python MODPY_SETUPTOOLS = Yes PKG_ARCH = * +WANTLIB+= ${MODPY_WANTLIB} + MAKE_ENV += PYTHONPATH=. # Other DB connectors would work, too. diff --git a/databases/py-sqlite/Makefile b/databases/py-sqlite/Makefile index aa0676f0fb8..524b1cbd358 100644 --- a/databases/py-sqlite/Makefile +++ b/databases/py-sqlite/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2011/11/04 08:16:24 jasper Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= SQLite adapter for Python VERSION= 1.0 DISTNAME= pysqlite-${VERSION} PKGNAME= py-sqlite-${VERSION} -REVISION = 6 +REVISION = 7 CATEGORIES= databases WRKDIST= ${WRKDIR}/pysqlite @@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes LIB_DEPENDS = databases/sqlite -WANTLIB += sqlite>=8.6 +WANTLIB += sqlite>=8.6 ${MODPY_WANTLIB} MODULES= lang/python diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile index 3b4d4aacb71..af75b5cba34 100644 --- a/databases/py-sqlite2/Makefile +++ b/databases/py-sqlite2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2011/11/04 08:16:24 jasper Exp $ COMMENT = SQLite3 adapter for Python @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 2.6.0 DISTNAME = pysqlite-${MODPY_EGG_VERSION} PKGNAME = py-sqlite2-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = databases devel MAINTAINER = Eric Faurot @@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP = Yes PERMIT_DISTFILES_CDROM = Yes LIB_DEPENDS = databases/sqlite3 -WANTLIB += sqlite3>=8.6 +WANTLIB += sqlite3>=8.6 ${MODPY_WANTLIB} BUILD_DEPENDS = textproc/py-sphinx MODULES = lang/python diff --git a/databases/py-storm/Makefile b/databases/py-storm/Makefile index 0dc60966a38..17526072c39 100644 --- a/databases/py-storm/Makefile +++ b/databases/py-storm/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2011/11/04 08:16:24 jasper Exp $ COMMENT= generic object relational mapper for Python MODPY_EGG_VERSION= 0.18 DISTNAME= storm-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 PKGNAME= py-${DISTNAME} CATEGORIES= databases @@ -22,6 +22,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://launchpad.net/storm/trunk/0.18/+download/ EXTRACT_SUFX= .tar.bz2 +WANTLIB= ${MODPY_WANTLIB} + MODULES= lang/python MODPY_SETUPTOOLS= Yes diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile index 22540dfa1c9..179165d7771 100644 --- a/databases/py-sybase/Makefile +++ b/databases/py-sybase/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2011/11/04 08:16:24 jasper Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= Python interface to the Sybase relational database system DISTNAME= sybase-0.36 PKGNAME= py-${DISTNAME} -REVISION = 7 +REVISION = 8 CATEGORIES= databases HOMEPAGE= http://www.object-craft.com.au/projects/sybase/ @@ -25,7 +25,7 @@ MODPY_DISTUTILS_BUILD= build_ext MODPY_DISTUTILS_BUILDARGS= -DHAVE_FREETDS=61 LIB_DEPENDS = databases/freetds -WANTLIB += ct>=1 +WANTLIB += ct>=1 ${MODPY_WANTLIB} MAKE_ENV+= SYBASE="${LOCALBASE}" NO_REGRESS= Yes diff --git a/databases/qt3-sqlite3-plugin/Makefile b/databases/qt3-sqlite3-plugin/Makefile index d2764e0376d..c5f67c6e0d1 100644 --- a/databases/qt3-sqlite3-plugin/Makefile +++ b/databases/qt3-sqlite3-plugin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2011/11/04 08:16:24 jasper Exp $ SHARED_ONLY= Yes COMMENT= qt3 sqlite3 plugin @@ -10,14 +10,14 @@ MASTER_SITES= http://kde-apps.org/CONTENT/content-files/ V= 0.2 DISTNAME= 23011-qt-sqlite3-$V PKGNAME= qt3-sqlite3-$V -REVISION= 3 +REVISION= 4 WRKDIST= ${WRKDIR}/qt-sqlite3-${V} MODULES= x11/qt3 LIB_DEPENDS += databases/sqlite3 -WANTLIB += sqlite3 +WANTLIB += sqlite3 m stdc++ # GPL PERMIT_PACKAGE_CDROM= Yes diff --git a/databases/ruby-do_mysql/Makefile b/databases/ruby-do_mysql/Makefile index 835c6e5448d..da32e67e277 100644 --- a/databases/ruby-do_mysql/Makefile +++ b/databases/ruby-do_mysql/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2011/09/16 08:48:04 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2011/11/04 08:16:24 jasper Exp $ COMMENT= ruby-data_objects driver for MySQL DISTNAME= do_mysql-0.10.2 -REVISION = 1 +REVISION = 2 CATEGORIES= databases # MIT @@ -19,7 +19,7 @@ CONFIGURE_STYLE= ruby gem ext BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= databases/ruby-data_objects,${MODRUBY_FLAVOR} -WANTLIB= mysqlclient +WANTLIB= mysqlclient crypto ssl z LIB_DEPENDS= databases/mysql # Requires running MySQL database diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile index e8ec5fb070b..1e16785d6cd 100644 --- a/databases/ruby-mysql/Makefile +++ b/databases/ruby-mysql/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.20 2011/09/16 08:48:05 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2011/11/04 08:16:24 jasper Exp $ COMMENT= access a MySQL database from Ruby DISTNAME= mysql-2.8.1 -REVISION= 7 +REVISION= 8 CATEGORIES= databases HOMEPAGE= http://tmtm.org/mysql/ruby/ @@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/ruby -WANTLIB= mysqlclient +WANTLIB= mysqlclient crypto ssl z LIB_DEPENDS= databases/mysql diff --git a/databases/ruby-mysqlplus/Makefile b/databases/ruby-mysqlplus/Makefile index aeedbc89dc5..0f3889c4dea 100644 --- a/databases/ruby-mysqlplus/Makefile +++ b/databases/ruby-mysqlplus/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2011/09/16 08:48:05 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2011/11/04 08:16:24 jasper Exp $ COMMENT= enhanced ruby mysql driver, supporting async and threading DISTNAME= mysqlplus-0.1.2 -REVISION = 1 +REVISION = 2 CATEGORIES= databases HOMEPAGE= http://github.com/oldmoe/mysqlplus @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/ruby -WANTLIB= mysqlclient +WANTLIB= mysqlclient crypto ssl z LIB_DEPENDS= databases/mysql diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile index 452310a4514..e2291aadcba 100644 --- a/databases/skytools/Makefile +++ b/databases/skytools/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.15 2011/09/16 08:48:05 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2011/11/04 08:16:24 jasper Exp $ COMMENT= PostgreSQL tools from Skype MODPY_EGG_VERSION= 2.1.12 DISTNAME= skytools-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES= databases @@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -WANTLIB= c +WANTLIB= c ${MODPY_WANTLIB} MASTER_SITES= http://pgfoundry.org/frs/download.php/2872/ diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile index 17286fbd7b5..8365281fe4f 100644 --- a/databases/sqlitebrowser/Makefile +++ b/databases/sqlitebrowser/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.11 2011/09/16 08:48:05 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2011/11/04 08:16:24 jasper Exp $ COMMENT= graphical interface to sqlite databases DISTNAME= sqlitebrowser-1.3 -REVISION = 4 +REVISION = 5 DISTFILES= ${DISTNAME}-src.tar.gz WRKDIST= ${WRKDIR}/sqlitebrowser CATEGORIES= databases x11 @@ -13,7 +13,7 @@ MODULES= x11/qt3 NO_REGRESS= Yes LIB_DEPENDS += databases/sqlite3 -WANTLIB= Xext m X11 c pthread pthread-stubs stdc++ xcb sqlite3 +WANTLIB= Xext m X11 c pthread stdc++ sqlite3 # Special: files are macintosh encoded. post-extract: diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index cf3c8685730..1a55092b5d6 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2011/09/16 08:48:05 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2011/11/04 08:16:24 jasper Exp $ COMMENT = gui for sqlite CATEGORIES = databases x11 DISTNAME = sqliteman-1.2.0 -REVISION = 2 +REVISION = 3 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sqliteman/} HOMEPAGE = http://sourceforge.net/projects/sqliteman/ @@ -15,10 +15,6 @@ PERMIT_DISTFILES_FTP = Yes PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes -WANTLIB = ICE SM X11 Xext Xi Xinerama Xrandr Xrender \ - c fontconfig freetype m pthread stdc++ z png glib-2.0 \ - gthread-2.0 pthread-stubs xcb - MODULES = devel/cmake CONFIGURE_STYLE = cmake SEPARATE_BUILD = simple @@ -26,6 +22,7 @@ SEPARATE_BUILD = simple LIB_DEPENDS = x11/qt4 \ editors/qscintilla WANTLIB += QtCore QtGui QtSql QtXml qscintilla2 +WANTLIB += c m pthread stdc++ RUN_DEPENDS = x11/qt4,-sqlite \ devel/desktop-file-utils