From 764d4a86fe7e8142cf5ef81a3b6d0408e37703da Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 21 Apr 2015 18:40:20 +0000 Subject: [PATCH] add some missing pthread to WANTLIB (using modified portbump, thanks zhuk@) "exciting" one in databases/py-sqlalchemy; port had a bad PKG_ARCH=* line and also contained .so modules. --- archivers/libshrink/Makefile | 6 ++++-- archivers/py-lzo/Makefile | 8 +++++--- audio/gogglesmm/Makefile | 8 ++++---- audio/libmpd/Makefile | 7 ++++--- audio/mpdscribble/Makefile | 7 ++++--- audio/picard/Makefile | 7 ++++--- audio/pms/Makefile | 7 ++++--- audio/py-ao/Makefile | 7 ++++--- audio/py-cddb/Makefile | 7 ++++--- audio/py-ogg/Makefile | 8 +++++--- audio/py-vorbis/Makefile | 9 +++++---- audio/py-xmms/Makefile | 8 +++++--- audio/pykaraoke/Makefile | 9 +++++---- databases/py-cdb/Makefile | 9 +++++---- databases/py-odbc/Makefile | 8 ++++---- databases/py-pgsql/Makefile | 8 +++++--- databases/py-psycopg2/Makefile | 8 +++++--- databases/py-sqlalchemy/Makefile | 12 ++++++------ databases/py-sqlite/Makefile | 8 +++++--- databases/py-sqlite2/Makefile | 8 +++++--- databases/py-storm/Makefile | 8 +++++--- databases/py-sybase/Makefile | 8 +++++--- databases/qt3-sqlite3-plugin/Makefile | 8 ++++---- databases/repmgr/Makefile | 7 ++++--- databases/soprano/Makefile | 12 ++++++------ databases/sqliteman/Makefile | 8 ++++---- 26 files changed, 120 insertions(+), 90 deletions(-) diff --git a/archivers/libshrink/Makefile b/archivers/libshrink/Makefile index 7a2baee15d5..ab73fc30a35 100644 --- a/archivers/libshrink/Makefile +++ b/archivers/libshrink/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2014/11/10 16:42:52 benoit Exp $ +# $OpenBSD: Makefile,v 1.16 2015/04/21 18:40:20 sthen Exp $ COMMENT= compression wrapper library @@ -6,19 +6,21 @@ DISTNAME= shrink-0.5.4 PKGNAME= lib${DISTNAME} CATEGORIES= archivers devel SHARED_LIBS= shrink 2.0 +REVISION= 0 HOMEPAGE= http://opensource.conformal.com/wiki/Shrink MASTER_SITES= http://opensource.conformal.com/snapshots/shrink/ MAINTAINER= David Hill -WANTLIB= c crypto lzma lzo2 ssl util z LIB_DEPENDS= archivers/lzo2 \ archivers/xz # ISC PERMIT_PACKAGE_CDROM= Yes +WANTLIB += c crypto lzma lzo2 pthread ssl util z + do-configure: printf "major=${LIBshrink_VERSION:R}\nminor=${LIBshrink_VERSION:E}\n" \ > ${WRKSRC}/libshrink/shlib_version diff --git a/archivers/py-lzo/Makefile b/archivers/py-lzo/Makefile index d0889b0b159..583d6fab2dc 100644 --- a/archivers/py-lzo/Makefile +++ b/archivers/py-lzo/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2013/03/10 22:28:05 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2015/04/21 18:40:20 sthen Exp $ COMMENT = Python implementation of the LZO library MODPY_EGG_VERSION = 1.08 DISTNAME = python-lzo-${MODPY_EGG_VERSION} PKGNAME = py-lzo-${MODPY_EGG_VERSION} -REVISION = 3 +REVISION = 4 CATEGORIES = archivers HOMEPAGE = http://www.oberhumer.com/opensource/lzo/ @@ -15,12 +15,14 @@ MAINTAINER = Benoit Lecocq # GPLv2 PERMIT_PACKAGE_CDROM = Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += lzo pthread + MASTER_SITES = http://www.oberhumer.com/opensource/lzo/download/LZO-v1/ MODULES = lang/python LIB_DEPENDS = archivers/lzo -WANTLIB = lzo ${MODPY_WANTLIB} MAKE_ENV += CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile index bbece3a080b..4707c64d5ba 100644 --- a/audio/gogglesmm/Makefile +++ b/audio/gogglesmm/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2015/04/04 09:21:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2015/04/21 18:40:20 sthen Exp $ COMMENT = music collection manager and player DISTNAME = gogglesmm-0.12.7 EXTRACT_SUFX = .tar.xz -REVISION = 3 +REVISION = 4 CATEGORIES = audio x11 HOMEPAGE = https://code.google.com/p/gogglesmm/ @@ -13,8 +13,8 @@ MAINTAINER = Brian Callahan # GPLv3+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += FOX-1.6 GL GLU X11 c dbus-1 expat -WANTLIB += m sqlite3 stdc++ tag xine +WANTLIB += FOX-1.6 GL GLU X11 c dbus-1 expat m pthread sqlite3 stdc++ +WANTLIB += tag xine MASTER_SITES = https://gogglesmm.googlecode.com/files/ diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile index bb05b80b366..78121453afa 100644 --- a/audio/libmpd/Makefile +++ b/audio/libmpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2015/03/16 18:07:36 naddy Exp $ +# $OpenBSD: Makefile,v 1.21 2015/04/21 18:40:20 sthen Exp $ COMMENT= mpd client library @@ -6,7 +6,7 @@ VERSION= 11.8.17 DISTNAME= libmpd-${VERSION} SHARED_LIBS= mpd 3.2 #.3.0 CATEGORIES= audio -REVISION = 2 +REVISION = 3 MAINTAINER= Landry Breuil @@ -15,10 +15,11 @@ HOMEPAGE = http://gmpclient.org/ # GPLv3 PERMIT_PACKAGE_CDROM= Yes +WANTLIB += glib-2.0 pcre pthread + MASTER_SITES= http://www.musicpd.org/download/libmpd/${VERSION}/ LIB_DEPENDS= devel/glib2 -WANTLIB= glib-2.0 pcre CONFIGURE_STYLE= gnu diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile index a80e610c34b..02b5e1cf831 100644 --- a/audio/mpdscribble/Makefile +++ b/audio/mpdscribble/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2013/11/11 13:56:51 steven Exp $ +# $OpenBSD: Makefile,v 1.5 2015/04/21 18:40:20 sthen Exp $ COMMENT = mpd client to scrobble track info to last.fm V = 0.22 DISTNAME = mpdscribble-$V +REVISION = 0 CATEGORIES = audio @@ -14,12 +15,12 @@ MAINTAINER = Steven Mestdagh # GPLv2 PERMIT_PACKAGE_CDROM = Yes +WANTLIB += c curl glib-2.0 mpdclient pthread + MASTER_SITES = http://www.musicpd.org/download/mpdscribble/$V/ MODULES = devel/gettext -WANTLIB = c mpdclient glib-2.0 curl - LIB_DEPENDS = net/curl \ devel/glib2 \ audio/libmpdclient diff --git a/audio/picard/Makefile b/audio/picard/Makefile index fd1495c72cd..e594e26d212 100644 --- a/audio/picard/Makefile +++ b/audio/picard/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.16 2014/05/05 07:55:50 brad Exp $ +# $OpenBSD: Makefile,v 1.17 2015/04/21 18:40:20 sthen Exp $ COMMENT = automatic audio files tagger using the MusicBrainz database MODPY_EGG_VERSION = 0.16 DISTNAME = picard-${MODPY_EGG_VERSION} -REVISION = 0 +REVISION = 1 CATEGORIES = audio @@ -15,7 +15,8 @@ MAINTAINER = Amaury Gauthier # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += m stdc++ avcodec avformat ofa ${MODPY_WANTLIB} +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += avcodec avformat m ofa pthread stdc++ MASTER_SITES = http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \ ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ diff --git a/audio/pms/Makefile b/audio/pms/Makefile index a791fef9740..afa9e9d0fc2 100644 --- a/audio/pms/Makefile +++ b/audio/pms/Makefile @@ -1,18 +1,19 @@ -# $OpenBSD: Makefile,v 1.12 2015/01/24 11:07:57 schwarze Exp $ +# $OpenBSD: Makefile,v 1.13 2015/04/21 18:40:20 sthen Exp $ COMMENT= curses based frontend for mpd DISTNAME= pms-0.42 EXTRACT_SUFX = .tar.bz2 CATEGORIES= audio -REVISION = 2 +REVISION = 3 HOMEPAGE= http://pms.sourceforge.net/ # GPLv3 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c glib-2.0 m ncursesw stdc++ +WANTLIB += c glib-2.0 m ncursesw pthread stdc++ + LIB_DEPENDS= devel/glib2 MODULES= devel/gettext \ diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile index aedea8bcb63..6c821ad1a36 100644 --- a/audio/py-ao/Makefile +++ b/audio/py-ao/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2013/03/10 22:55:05 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY= Yes @@ -7,14 +7,15 @@ COMMENT= Python wrapper module for the ao library MODPY_EGG_VERSION=0.82 DISTNAME= pyao-${MODPY_EGG_VERSION} PKGNAME= ${DISTNAME:S/py/py-/} -REVISION = 9 +REVISION = 10 CATEGORIES= audio HOMEPAGE= http://ekyo.nerim.net/software/pyogg/ # GPL PERMIT_PACKAGE_CDROM= Yes -WANTLIB += ao ${MODPY_WANTLIB} +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += ao pthread MASTER_SITES= ${HOMEPAGE} diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile index 32cc7a5eee4..d195313f322 100644 --- a/audio/py-cddb/Makefile +++ b/audio/py-cddb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2013/03/10 22:55:05 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= CDDB audio CD track info access in Python DISTNAME= CDDB-1.4 PKGNAME= py-${DISTNAME:L} -REVISION = 7 +REVISION = 8 CATEGORIES= audio HOMEPAGE= http://cddb-py.sourceforge.net/ @@ -14,7 +14,8 @@ HOMEPAGE= http://cddb-py.sourceforge.net/ # GPL PERMIT_PACKAGE_CDROM= Yes -WANTLIB = ${MODPY_WANTLIB} +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pthread MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cddb-py/} # avoid possible conflict with the audio/p5-cddb distfile diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile index 5a8ee4e4202..a3e836153b5 100644 --- a/audio/py-ogg/Makefile +++ b/audio/py-ogg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2013/03/10 22:55:05 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY= Yes @@ -7,18 +7,20 @@ COMMENT= Python wrapper for the Ogg libraries MODPY_EGG_VERSION=1.3 DISTNAME= pyogg-${MODPY_EGG_VERSION} PKGNAME= ${DISTNAME:S/py/py-/} -REVISION = 9 +REVISION = 10 CATEGORIES= audio HOMEPAGE= http://ekyo.nerim.net/software/pyogg/ # LGPL PERMIT_PACKAGE_CDROM= Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += ogg pthread + MASTER_SITES= ${HOMEPAGE} MODULES= lang/python -WANTLIB += ogg ${MODPY_WANTLIB} LIB_DEPENDS= audio/libogg MODPY_ADJ_FILES = test/oggtail.py diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile index 652ee0f16f1..522b5e596cf 100644 --- a/audio/py-vorbis/Makefile +++ b/audio/py-vorbis/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2013/03/10 22:55:05 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY = Yes @@ -7,16 +7,17 @@ COMMENT = Python wrapper for the Vorbis libraries MODPY_EGG_VERSION=1.4 DISTNAME = pyvorbis-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME:S/py/py-/} -REVISION = 3 +REVISION = 4 CATEGORIES = audio HOMEPAGE = http://ekyo.nerim.net/software/pyogg/ # LGPL PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${HOMEPAGE} +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += ogg pthread vorbis vorbisenc vorbisfile -WANTLIB = ogg vorbis vorbisenc vorbisfile ${MODPY_WANTLIB} +MASTER_SITES = ${HOMEPAGE} MODULES = lang/python diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile index abb37b30678..74a66a1a0db 100644 --- a/audio/py-xmms/Makefile +++ b/audio/py-xmms/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2013/03/10 22:55:05 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= Python interface to XMMS DISTNAME= pyxmms-1.06 PKGNAME= ${DISTNAME:S/py/py-/} -REVISION = 7 +REVISION = 8 CATEGORIES= audio HOMEPAGE= http://people.via.ecp.fr/~flo/2002/PyXMMS/doc/xmms.html @@ -15,9 +15,11 @@ MASTER_SITES= http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/ # GPL PERMIT_PACKAGE_CDROM= Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pthread xmms + MODULES= lang/python -WANTLIB += xmms ${MODPY_WANTLIB} LIB_DEPENDS= audio/xmms MODPY_DISTUTILS_BUILD= build_ext diff --git a/audio/pykaraoke/Makefile b/audio/pykaraoke/Makefile index ce2ce3eb482..868cfcbaf43 100644 --- a/audio/pykaraoke/Makefile +++ b/audio/pykaraoke/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2013/04/03 06:57:56 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2015/04/21 18:40:20 sthen Exp $ COMMENT = free karaoke player V = 0.7.1 MODPY_EGG_VERSION = ${V} DISTNAME = pykaraoke-${V} -REVISION = 5 +REVISION = 6 CATEGORIES = audio HOMEPAGE = http://kibosh.org/pykaraoke/ @@ -13,13 +13,14 @@ HOMEPAGE = http://kibosh.org/pykaraoke/ # LGPL v2.1 or later PERMIT_PACKAGE_CDROM = Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += SDL pthread + MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pykaraoke/} EXTRACT_SUFX = .zip MODULES = lang/python -WANTLIB += SDL ${MODPY_WANTLIB} - BUILD_DEPENDS = x11/py-wxPython \ audio/py-mutagen>=1.9 \ devel/pygame diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile index fdd69a3d791..49331a212c0 100644 --- a/databases/py-cdb/Makefile +++ b/databases/py-cdb/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.12 2013/03/11 02:52:07 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2015/04/21 18:40:20 sthen Exp $ COMMENT= Python extension module for accessing cdb databases DISTNAME= python-cdb-0.32 PKGNAME= ${DISTNAME:S/python/py/} -REVISION = 8 +REVISION = 9 CATEGORIES= databases HOMEPAGE= http://pilcrow.madison.wi.us/ @@ -12,12 +12,13 @@ HOMEPAGE= http://pilcrow.madison.wi.us/ # GPL PERMIT_PACKAGE_CDROM= Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pthread + MASTER_SITES= ${HOMEPAGE}/python-cdb/ MODULES= lang/python -WANTLIB= ${MODPY_WANTLIB} - NO_TEST= Yes DOCSDIR= ${PREFIX}/share/doc/py-cdb diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile index 893d50f24a2..054e91534d3 100644 --- a/databases/py-odbc/Makefile +++ b/databases/py-odbc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2013/08/07 21:31:24 naddy Exp $ +# $OpenBSD: Makefile,v 1.11 2015/04/21 18:40:20 sthen 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 = 3 +REVISION = 4 PKGNAME = ${DISTNAME:S/py/py-/} CATEGORIES = databases @@ -16,7 +16,8 @@ HOMEPAGE = https://pyodbc.googlecode.com/ # MIT PERMIT_PACKAGE_CDROM = Yes -WANTLIB += m stdc++ ${MODPY_WANTLIB} +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += iodbc m pthread stdc++ MASTER_SITES = ${HOMEPAGE}files/ EXTRACT_SUFX = .zip @@ -24,7 +25,6 @@ EXTRACT_SUFX = .zip MODPY_SETUPTOOLS = Yes MODULES = lang/python LIB_DEPENDS = databases/iodbc -WANTLIB += iodbc CFLAGS += -fPIC -I${LOCALBASE}/include -L${LOCALBASE}/lib diff --git a/databases/py-pgsql/Makefile b/databases/py-pgsql/Makefile index 13b2649a7c7..9977ca1616c 100644 --- a/databases/py-pgsql/Makefile +++ b/databases/py-pgsql/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2014/10/22 14:10:46 pea Exp $ +# $OpenBSD: Makefile,v 1.14 2015/04/21 18:40:20 sthen 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 = 6 +REVISION = 7 CATEGORIES = databases HOMEPAGE = http://pypgsql.sourceforge.net/ @@ -15,6 +15,9 @@ MAINTAINER = Pierre-Emmanuel Andre # Python PERMIT_PACKAGE_CDROM = Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pq>=5 pthread + MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pypgsql/} MODULES = lang/python @@ -23,7 +26,6 @@ BUILD_DEPENDS = databases/postgresql RUN_DEPENDS = devel/py-mxDateTime LIB_DEPENDS = databases/postgresql TEST_DEPENDS = ${RUN_DEPENDS} -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 35c6399559b..15eba22ea7d 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.23 2015/04/02 14:21:13 jasper Exp $ +# $OpenBSD: Makefile,v 1.24 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY = Yes COMMENT = PostgreSQL database adapter for Python MODPY_EGG_VERSION = 2.5.2 -REVISION = 0 +REVISION = 1 DISTNAME = psycopg2-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = databases @@ -17,11 +17,13 @@ MAINTAINER = Martynas Venckus # GPLv2+ PERMIT_PACKAGE_CDROM = Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pq pthread + MODPY_PI = Yes MODULES = lang/python LIB_DEPENDS = databases/postgresql -WANTLIB += pq ${MODPY_WANTLIB} RUN_DEPENDS = databases/postgresql TEST_DEPENDS = ${RUN_DEPENDS} diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile index 54969c88f26..fcae3c3d542 100644 --- a/databases/py-sqlalchemy/Makefile +++ b/databases/py-sqlalchemy/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.26 2013/03/11 02:52:07 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2015/04/21 18:40:20 sthen 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 = 1 +REVISION = 2 CATEGORIES = databases @@ -16,18 +16,18 @@ MAINTAINER = Will Maier # MIT PERMIT_PACKAGE_CDROM = Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pthread + MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sqlalchemy/} MODULES = lang/python MODPY_SETUPTOOLS = Yes -PKG_ARCH = * - -WANTLIB+= ${MODPY_WANTLIB} MAKE_ENV += PYTHONPATH=. # Other DB connectors would work, too. -TEST_DEPENDS = databases/py-sqlite2 \ +TEST_DEPENDS = databases/py-sqlite2 \ devel/py-nose post-install: diff --git a/databases/py-sqlite/Makefile b/databases/py-sqlite/Makefile index f691fb75c69..576456205cd 100644 --- a/databases/py-sqlite/Makefile +++ b/databases/py-sqlite/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2013/05/30 10:51:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.23 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= SQLite adapter for Python VERSION= 1.0 DISTNAME= pysqlite-${VERSION} PKGNAME= py-sqlite-${VERSION} -REVISION = 7 +REVISION = 8 CATEGORIES= databases WRKDIST= ${WRKDIR}/pysqlite @@ -17,8 +17,10 @@ HOMEPAGE= http://pysqlite.org/ # BSD-like PERMIT_PACKAGE_CDROM= Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pthread sqlite>=8.6 + LIB_DEPENDS = databases/sqlite -WANTLIB += sqlite>=8.6 ${MODPY_WANTLIB} MODULES= lang/python diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile index 8f8a9d41d95..5f064187e6d 100644 --- a/databases/py-sqlite2/Makefile +++ b/databases/py-sqlite2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2013/08/07 21:31:26 naddy Exp $ +# $OpenBSD: Makefile,v 1.25 2015/04/21 18:40:20 sthen 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 = 4 +REVISION = 5 CATEGORIES = databases devel MAINTAINER = Eric Faurot @@ -18,7 +18,9 @@ MASTER_SITES = https://pysqlite.googlecode.com/files/ # BSD-like PERMIT_PACKAGE_CDROM = Yes -WANTLIB += sqlite3>=8.6 ${MODPY_WANTLIB} +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pthread sqlite3>=8.6 + BUILD_DEPENDS = textproc/py-sphinx MODULES = lang/python diff --git a/databases/py-storm/Makefile b/databases/py-storm/Makefile index 5ecdcf0e2c8..0133e7d4b08 100644 --- a/databases/py-storm/Makefile +++ b/databases/py-storm/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2013/03/11 02:52:08 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2015/04/21 18:40:20 sthen Exp $ COMMENT= generic object relational mapper for Python MODPY_EGG_VERSION= 0.19 DISTNAME= storm-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= databases @@ -15,11 +16,12 @@ MAINTAINER= Eric Faurot # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += pthread + MASTER_SITES= http://launchpad.net/storm/trunk/0.19/+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 b0ead508a00..215a2f88cf8 100644 --- a/databases/py-sybase/Makefile +++ b/databases/py-sybase/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2013/03/11 02:52:08 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2015/04/21 18:40:20 sthen 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 = 8 +REVISION = 9 CATEGORIES= databases HOMEPAGE= http://www.object-craft.com.au/projects/sybase/ @@ -15,6 +15,9 @@ MASTER_SITES= ${HOMEPAGE}download/ # BSD PERMIT_PACKAGE_CDROM= Yes +WANTLIB += ${MODPY_WANTLIB} +WANTLIB += ct>=1 pthread + MODULES= lang/python \ devel/gettext @@ -22,7 +25,6 @@ MODPY_DISTUTILS_BUILD= build_ext MODPY_DISTUTILS_BUILDARGS= -DHAVE_FREETDS=61 LIB_DEPENDS = databases/freetds -WANTLIB += ct>=1 ${MODPY_WANTLIB} MAKE_ENV+= SYBASE="${LOCALBASE}" NO_TEST= Yes diff --git a/databases/qt3-sqlite3-plugin/Makefile b/databases/qt3-sqlite3-plugin/Makefile index 57358e338ff..533dfc8054b 100644 --- a/databases/qt3-sqlite3-plugin/Makefile +++ b/databases/qt3-sqlite3-plugin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2013/03/11 02:52:08 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2015/04/21 18:40:20 sthen Exp $ SHARED_ONLY= Yes COMMENT= qt3 sqlite3 plugin @@ -10,17 +10,17 @@ MASTER_SITES= http://kde-apps.org/CONTENT/content-files/ V= 0.2 DISTNAME= 23011-qt-sqlite3-$V PKGNAME= qt3-sqlite3-$V -REVISION= 5 +REVISION= 6 WRKDIST= ${WRKDIR}/qt-sqlite3-${V} MODULES= x11/qt3 -WANTLIB += sqlite3 m stdc++ - # GPL PERMIT_PACKAGE_CDROM= Yes +WANTLIB += m pthread sqlite3 stdc++ + NO_TEST= Yes SUBST_VARS= MODQT_PLUGINS diff --git a/databases/repmgr/Makefile b/databases/repmgr/Makefile index e087255a55b..15021ee4945 100644 --- a/databases/repmgr/Makefile +++ b/databases/repmgr/Makefile @@ -1,15 +1,17 @@ -# $OpenBSD: Makefile,v 1.3 2014/04/21 15:37:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2015/04/21 18:40:21 sthen Exp $ COMMENT = HA and replication cluster management for PostgreSQL DISTNAME = repmgr-1.2.0 CATEGORIES = databases HOMEPAGE = http://www.repmgr.org/ -REVISION= 0 +REVISION= 1 # GPLv3 PERMIT_PACKAGE_CDROM = Yes +WANTLIB += c crypto m pq pthread readline ssl termcap xml2 z + MASTER_SITES = ${HOMEPAGE}download/ USE_GMAKE = Yes MAKE_FLAGS = USE_PGXS=1 @@ -20,7 +22,6 @@ LIB_DEPENDS = databases/postgresql RUN_DEPENDS = net/rsync NO_TEST = Yes -WANTLIB += c crypto m pq readline ssl termcap xml2 z post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/repmgr diff --git a/databases/soprano/Makefile b/databases/soprano/Makefile index 4d9aed6af6b..4a91206fa49 100644 --- a/databases/soprano/Makefile +++ b/databases/soprano/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2014/07/10 07:37:32 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2015/04/21 18:40:21 sthen Exp $ SHARED_ONLY = Yes COMMENT = RDF framework CATEGORIES = databases devel textproc sysutils HOMEPAGE = http://soprano.sourceforge.net/ DISTNAME = soprano-2.9.4 -REVISION = 0 +REVISION = 1 SHARED_LIBS = soprano 2.1 SHARED_LIBS += sopranoclient 2.1 @@ -18,6 +18,10 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=soprano/} # GPL/LGPL PERMIT_PACKAGE_CDROM = Yes +WANTLIB += c clucene-core clucene-shared iodbc lib/qt4/QtCore +WANTLIB += lib/qt4/QtDBus lib/qt4/QtNetwork lib/qt4/QtXml m pthread +WANTLIB += raptor2 rdf stdc++ + MODULES = x11/kde4 MODKDE4_USE = @@ -28,10 +32,6 @@ LIB_DEPENDS = textproc/clucene \ textproc/raptor \ textproc/redland -WANTLIB = c m stdc++ -WANTLIB += lib/qt4/QtCore lib/qt4/QtDBus lib/qt4/QtNetwork lib/qt4/QtXml -WANTLIB += clucene-core clucene-shared iodbc raptor2 rdf - # No Java, thanks CONFIGURE_ARGS = -DSOPRANO_DISABLE_SESAME2_BACKEND:Bool=Yes \ -DSOPRANO_BUILD_TESTS:Bool=Yes diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index bcc1470cece..9b9fe2d2974 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.20 2015/03/27 08:11:26 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2015/04/21 18:40:21 sthen Exp $ COMMENT = gui for sqlite CATEGORIES = databases x11 DISTNAME = sqliteman-1.2.2 -REVISION = 0 +REVISION = 1 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sqliteman/} HOMEPAGE = http://sourceforge.net/projects/sqliteman/ @@ -12,8 +12,8 @@ HOMEPAGE = http://sourceforge.net/projects/sqliteman/ # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += lib/qt4/QtCore lib/qt4/QtGui lib/qt4/QtSql lib/qt4/QtXml -WANTLIB += c m qscintilla2 stdc++ +WANTLIB += c lib/qt4/QtCore lib/qt4/QtGui lib/qt4/QtSql lib/qt4/QtXml m +WANTLIB += pthread qscintilla2 stdc++ MODULES = devel/cmake CONFIGURE_STYLE = cmake