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

Use new shiny postgresql.port.mk.

Browse Source 
Input for pgrouting part and okay for it from landry@
This commit is contained in:
zhuk 2015-01-12 20:57:55 +00:00
parent 2ae5b98b96
commit e938ade264
3 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
databases/libpqxx/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2014/10/02 10:16:34 zhuk Exp $
# $OpenBSD: Makefile,v 1.19 2015/01/12 20:57:55 zhuk Exp $
COMMENT= C++ client API for PostgreSQL
@ -18,7 +18,7 @@ MASTER_SITES= http://pqxx.org/download/software/libpqxx/
LIB_DEPENDS= databases/postgresql
MODULES= lang/python
MODULES= databases/postgresql lang/python
MODPY_RUNDEP= No
MODPY_ADJ_FILES=tools/splitconfig \
tools/template2mak.py
@ -29,27 +29,6 @@ SEPARATE_BUILD= No
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
# Regression tests start up and use a real database
TEST_DEPENDS = databases/postgresql,-server
PGDATA = ${WRKDIR}/testdb
PGDATABASE = pqxx-test
TEST_ENV = PGDATABASE=${PGDATABASE} \
PGHOST=${WRKDIR}
# 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
MODPOSTGRESQL_TEST_DBNAME = pqxx-test
.include <bsd.port.mk>

19
geo/pgrouting/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2014/12/19 21:16:55 landry Exp $
# $OpenBSD: Makefile,v 1.3 2015/01/12 20:57:55 zhuk Exp $
SHARED_ONLY = Yes
@ -20,20 +20,21 @@ MAINTAINER = Landry Breuil <landry@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
MODULES = devel/cmake
MODULES = databases/postgresql devel/cmake
LIB_DEPENDS = math/cgal
RUN_DEPENDS = geo/postgis
BUILD_DEPENDS = databases/postgresql,-server
TEST_DEPENDS = ${BUILD_PKGPATH}
TEST_ENV = LD_PRELOAD=libpthread.so
WANTLIB += CGAL boost_system-mt boost_thread-mt gmp m stdc++
do-test:
regdir=$$(mktemp -t -d pgrouting-regress.XXXXXX) && \
LC_CTYPE=C initdb -D $${regdir} && \
LD_PRELOAD=libpthread.so pg_ctl -D $${regdir} -o '-p 12341' -l $${regdir}/log start && \
cd ${WRKSRC} && perl tools/test-runner.pl -pgport 12341 || \
pg_ctl -D $${regdir} -o '-p 12341' stop -m fast
#not all tests pass - ensure we stop the server
MODPOSTGRESQL_TEST_CMD = \
cd ${WRKSRC}; \
./tools/test-runner.pl
SUBST_VARS += MODPOSTGRESQL_TEST_PGHOST
pre-configure:
${SUBST_CMD} ${WRKSRC}/tools/test-runner.pl
.include <bsd.port.mk>

17
geo/pgrouting/patches/patch-tools_test-runner_pl
View File

@ -1,13 +1,16 @@
$OpenBSD: patch-tools_test-runner_pl,v 1.1 2014/12/19 21:16:55 landry Exp $
--- tools/test-runner.pl.orig Fri Dec 19 21:33:45 2014
+++ tools/test-runner.pl Fri Dec 19 21:55:37 2014
@@ -20,7 +20,8 @@ my $DRYRUN = 0;
$OpenBSD: patch-tools_test-runner_pl,v 1.2 2015/01/12 20:57:55 zhuk Exp $
Allow tests to run.
See also: https://github.com/pgRouting/pgrouting/pull/284
--- tools/test-runner.pl.orig Wed Sep 25 00:38:31 2013
+++ tools/test-runner.pl Sat Jan 10 19:07:01 2015
@@ -20,8 +20,9 @@ my $DRYRUN = 0;
my $DEBUG = 0;
my $DBNAME = "pgr_test__db__test";
-my $DBUSER = 'postgres';
+my $DBUSER = `whoami`;
+chomp $DBUSER;
my $DBHOST = 'localhost';
-my $DBHOST = 'localhost';
+my $DBUSER = getlogin || getpwuid($<) || "postgres";
+my $DBHOST = '${MODPOSTGRESQL_TEST_PGHOST}';
my $DBPORT = '5432';
sub Usage {