cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update libpqxx to 4.0.1, allowing (to be finished) Calligra to use it.

Browse Source 
Tested by landry@, thanks!
This commit is contained in:
zhuk 2014-07-12 07:19:56 +00:00
parent 89e200c164
commit 69ae2fb28e
6 changed files with 123 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
databases/libpqxx/Makefile
View File

@ -1,29 +1,55 @@
# $OpenBSD: Makefile,v 1.15 2014/04/24 10:18:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2014/07/12 07:19:56 zhuk Exp $
COMMENT= C++ client API for PostgreSQL
DISTNAME= libpqxx-2.5.3
REVISION= 4
CATEGORIES= databases
SHARED_LIBS += pqxx 1.0 # .0.0
DISTNAME= libpqxx-4.0.1
CATEGORIES= databases devel
SHARED_LIBS = pqxx 2.0 # .0.0
HOMEPAGE= http://pqxx.org/development/libpqxx/
# BSD
# 3-clause BSDL
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += crypto m pq ssl stdc++
MASTER_SITES= http://pqxx.org/download/software/libpqxx/ \
ftp://pqxx.org/software/libpqxx/
MASTER_SITES= http://pqxx.org/download/software/libpqxx/
LIB_DEPENDS= databases/postgresql
MODULES= lang/python
MODPY_RUNDEP= No
MODPY_ADJ_FILES=tools/splitconfig \
tools/template2mak.py
# "Yes" breaks tests
SEPARATE_BUILD= No
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
# Regression tests connect to real database
NO_TEST= Yes
# Regression tests start up and use a real database
PGDATA = ${WRKDIR}/testdb
PGDATABASE = pqxx-test
TEST_ENV = PGDATABASE=${PGDATABASE} \
PGHOST=${WRKDIR}
ALL_TEST_ENV = ${MAKE_ENV} ${TEST_ENV}
# Make sure that server is always stopped after starting
do-test:
rm -Rf ${PGDATA}
${LOCALBASE}/bin/initdb -D ${PGDATA} -A trust --locale=C
${LOCALBASE}/bin/pg_ctl start -w -D ${PGDATA} -l ${WRKDIR}/pg.log \
-o "-F -h '' -k ${WRKDIR}"
${TEST_ENV} ${LOCALBASE}/bin/createdb ${PGDATABASE} || \
(${LOCALBASE}/bin/pg_ctl stop -D ${PGDATA} -m i; exit 1)
cd ${WRKBUILD}; \
set +e; \
${SETENV} ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \
-f ${MAKE_FILE} ${TEST_TARGET}; \
Q=$$?; \
${LOCALBASE}/bin/pg_ctl stop -D ${PGDATA} -m i; \
exit $$Q
.include <bsd.port.mk>

7
databases/libpqxx/distinfo
View File

@ -1,5 +1,2 @@
MD5 (libpqxx-2.5.3.tar.gz) = gy+E0TlfvzPmSxe4snstEQ==
RMD160 (libpqxx-2.5.3.tar.gz) = X3ASiIGfCRaVCfvrPEd31AArB4U=
SHA1 (libpqxx-2.5.3.tar.gz) = I87JNJ61LZGNL1GCltC6pwTRbN4=
SHA256 (libpqxx-2.5.3.tar.gz) = rUXHZ4tkdoNOHmhFp9d0AkI7GVSmxSEpG8ka80kjxYs=
SIZE (libpqxx-2.5.3.tar.gz) = 585467
SHA256 (libpqxx-4.0.1.tar.gz) = CXztonl3Yc5Rf6pb7hhsiD3xxAfLKq2mE6Fnc6/u3Dg=
SIZE (libpqxx-4.0.1.tar.gz) = 1582532

12
databases/libpqxx/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2011/07/11 21:10:33 sthen Exp $
--- configure.orig Mon Jul 11 21:48:55 2011
+++ configure Mon Jul 11 21:48:56 2011
@@ -24681,7 +24681,7 @@ for publication in $PUBLICATIONS ; do
for factor in $FACTORS ; do
CONFIGFILE="include/pqxx/config-$publication-$factor.h"
echo -n "Generating $CONFIGFILE: "
- if ! grep -w -h -F "`grep \"\<${publication}\>\" \"${srcdir}/configitems\" | grep \"\<${factor}\>\" | grep -v '^$' | cut -f 1`" include/pqxx/config.h >"$CONFIGFILE" ; then
+ if ! grep -w -h -F "`grep -w ${publication} \"${srcdir}/configitems\" | grep -w ${factor} | grep -v '^$' | cut -f 1`" include/pqxx/config.h >"$CONFIGFILE" ; then
rm -f -- "$CONFIGFILE"
echo "no items--deleting"
else

20
databases/libpqxx/patches/patch-src_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2006/01/08 22:02:20 aanriot Exp $
--- src/Makefile.in.orig Sun Jan 8 18:32:45 2006
+++ src/Makefile.in Sun Jan 8 18:33:09 2006
@@ -214,7 +214,7 @@ libpqxx_la_SOURCES = binarystring.cxx \
$OpenBSD: patch-src_Makefile_in,v 1.4 2014/07/12 07:19:56 zhuk Exp $
--- src/Makefile.in.orig Fri Jul 11 16:13:06 2014
+++ src/Makefile.in Fri Jul 11 16:13:22 2014
@@ -291,7 +291,7 @@ libpqxx_la_SOURCES = binarystring.cxx \
tuple.cxx \
util.cxx
# Uncomment to build an unversioned library (version in soname)
-libpqxx_version = -release $(PQXXVERSION)
+#libpqxx_version = -release $(PQXXVERSION)
# Uncomment to build a versioned library
#libpqxx_version = -version-info $(ABI_CURRENT):$(ABI_REVISION):$(ABI_AGE)
-libpqxx_version = -release $(PQXX_ABI)
+#libpqxx_version = -release $(PQXX_ABI)
libpqxx_la_LDFLAGS = $(libpqxx_version) \
-rpath $(libdir) \
${POSTGRES_LIB}

22
databases/libpqxx/patches/patch-tools_lint Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-tools_lint,v 1.1 2014/07/12 07:19:56 zhuk Exp $
Unbreak tests.
--- tools/lint.orig Fri Jul 11 17:40:03 2014
+++ tools/lint Fri Jul 11 17:41:43 2014
@@ -18,7 +18,7 @@ EOF
# This version must be at the top of the Debian changelog.
check_debian_changelog() {
- if ! head -n1 debian/changelog | grep -q "^libpqxx ($PQXXVERSION\\>"
+ if ! head -n1 debian/changelog | grep -q "^libpqxx ($PQXXVERSION[^[:digit:]]"
then
cat <<EOF >&2
Version $PQXXVERSION is not at the top of debian/changelog.
@@ -42,7 +42,7 @@ count_includes() {
# Any file that includes compiler-internal-pre.hxx must also include
# compiler-internal-post.hxx, and vice versa.
check_compiler_internal_headers() {
- TEMPDIR="`mktemp --tmpdir -d pqxx-pre-release-check.XXXX`"
+ TEMPDIR="`mktemp -t -d pqxx-pre-release-check.XXXXXX`"
if test -z "$TEMPDIR"
then
cat <<EOF >&2

79
databases/libpqxx/pkg/PLIST
View File

@ -1,74 +1,101 @@
@comment $OpenBSD: PLIST,v 1.2 2014/04/24 10:18:51 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2014/07/12 07:19:56 zhuk Exp $
bin/pqxx-config
include/pqxx/
include/pqxx/all.h
include/pqxx/basic_connection
include/pqxx/basic_connection.hxx
include/pqxx/binarystring
include/pqxx/binarystring.hxx
include/pqxx/cachedresult.h
include/pqxx/compiler-internal-post.hxx
include/pqxx/compiler-internal-pre.hxx
include/pqxx/compiler-public.hxx
include/pqxx/config-public-compiler.h
include/pqxx/connection
include/pqxx/connection.h
include/pqxx/connection.hxx
include/pqxx/connection_base
include/pqxx/connection_base.h
include/pqxx/connection_base.hxx
include/pqxx/connectionitf.h
include/pqxx/connectionpolicy
include/pqxx/connectionpolicy.hxx
include/pqxx/cursor
include/pqxx/cursor.h
include/pqxx/cursor.hxx
include/pqxx/dbtransaction
include/pqxx/dbtransaction.h
include/pqxx/dbtransaction.hxx
include/pqxx/errorhandler
include/pqxx/errorhandler.hxx
include/pqxx/except
include/pqxx/except.h
include/pqxx/except.hxx
include/pqxx/field
include/pqxx/field.hxx
include/pqxx/internal/
include/pqxx/internal/callgate.hxx
include/pqxx/internal/gates/
include/pqxx/internal/gates/connection-dbtransaction.hxx
include/pqxx/internal/gates/connection-errorhandler.hxx
include/pqxx/internal/gates/connection-largeobject.hxx
include/pqxx/internal/gates/connection-notification_receiver.hxx
include/pqxx/internal/gates/connection-parameterized_invocation.hxx
include/pqxx/internal/gates/connection-pipeline.hxx
include/pqxx/internal/gates/connection-prepare-invocation.hxx
include/pqxx/internal/gates/connection-reactivation_avoidance_exemption.hxx
include/pqxx/internal/gates/connection-sql_cursor.hxx
include/pqxx/internal/gates/connection-transaction.hxx
include/pqxx/internal/gates/errorhandler-connection.hxx
include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
include/pqxx/internal/gates/result-connection.hxx
include/pqxx/internal/gates/result-creation.hxx
include/pqxx/internal/gates/result-sql_cursor.hxx
include/pqxx/internal/gates/transaction-subtransaction.hxx
include/pqxx/internal/gates/transaction-tablereader.hxx
include/pqxx/internal/gates/transaction-tablewriter.hxx
include/pqxx/internal/gates/transaction-transactionfocus.hxx
include/pqxx/internal/libpq-forward.hxx
include/pqxx/internal/result_data.hxx
include/pqxx/internal/statement_parameters.hxx
include/pqxx/isolation
include/pqxx/isolation.h
include/pqxx/isolation.hxx
include/pqxx/largeobject
include/pqxx/largeobject.h
include/pqxx/largeobject.hxx
include/pqxx/libcompiler.h
include/pqxx/libpq-forward.hxx
include/pqxx/nontransaction
include/pqxx/nontransaction.h
include/pqxx/nontransaction.hxx
include/pqxx/notification
include/pqxx/notification.hxx
include/pqxx/notify-listen
include/pqxx/notify-listen.hxx
include/pqxx/performance.hxx
include/pqxx/pipeline
include/pqxx/pipeline.hxx
include/pqxx/pqxx
include/pqxx/prepared_statement
include/pqxx/prepared_statement.hxx
include/pqxx/result
include/pqxx/result.h
include/pqxx/result.hxx
include/pqxx/robusttransaction
include/pqxx/robusttransaction.h
include/pqxx/robusttransaction.hxx
include/pqxx/strconv
include/pqxx/strconv.hxx
include/pqxx/subtransaction
include/pqxx/subtransaction.hxx
include/pqxx/tablereader
include/pqxx/tablereader.h
include/pqxx/tablereader.hxx
include/pqxx/tablestream
include/pqxx/tablestream.h
include/pqxx/tablestream.hxx
include/pqxx/tablewriter
include/pqxx/tablewriter.h
include/pqxx/tablewriter.hxx
include/pqxx/transaction
include/pqxx/transaction.h
include/pqxx/transaction.hxx
include/pqxx/transaction_base
include/pqxx/transaction_base.h
include/pqxx/transaction_base.hxx
include/pqxx/transactionitf.h
include/pqxx/transactor
include/pqxx/transactor.h
include/pqxx/transactor.hxx
include/pqxx/trigger
include/pqxx/trigger.h
include/pqxx/trigger.hxx
include/pqxx/tuple
include/pqxx/tuple.hxx
include/pqxx/util
include/pqxx/util.h
include/pqxx/util.hxx
include/pqxx/version
include/pqxx/version.hxx
lib/libpqxx.a
lib/libpqxx.la
@lib lib/libpqxx.so.${LIBpqxx_VERSION}
lib/pkgconfig/
lib/pkgconfig/libpqxx.pc