kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/skytools: Restrict to postgresql 9.1 and earlier

Browse source 
This version of skytools fails to build with postgresql 9.2
This port had complex logic to change pkg-plist with pgsql > 8.2, but
now all versions meet this criteria.  Remove the logic and trim the
pkg-plist as well as the header.  Also convert USE_GMAKE to USES+=gmake.

PR:		ports/179957
submitted by:	marino
Approved by:	bapt (mentor), maintainer timeout
This commit is contained in:
John Marino 2013-07-22 06:48:27 +00:00
parent 91a730b6f1
commit 443820fee9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=323429
2 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
databases/skytools/Makefile
View file

@ -1,9 +1,5 @@
# Ports collection makefile for: skytools
# Date created: 27 July 2007
# Whom: Sergey Skvortsov <skv@protey.ru>
#
# Created by: Sergey Skvortsov <skv@protey.ru>
# $FreeBSD$
#
PORTNAME= skytools
PORTVERSION= 2.1.12
@ -15,9 +11,10 @@ MAINTAINER= kheechin@gmail.com
COMMENT= PostgreSQL tools from Skype: walshipping, queueing, replication
GNU_CONFIGURE= yes
USE_GMAKE= yes
USES= gmake
USE_PGSQL= yes
WANT_PGSQL_VER= 91-
USE_PYTHON= 2.5+
INSTALLS_EGGINFO= yes
@ -30,26 +27,7 @@ CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
--docdir=${EXAMPLESDIR} \
--with-pgconfig=${LOCALBASE}/bin/pg_config
.include <bsd.port.pre.mk>
# Setting/finding PostgreSQL version we want.
.if exists(${LOCALBASE}/bin/postmaster)
PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \
${SED} -En 's/.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p'
.elif exists(${LOCALBASE}/bin/pg_config)
PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | \
${SED} -En 's/PostgreSQL[^0-9]*([0-9]*)\.([0-9]+)\..*/\1\2/p'
.else
PGSQL_VER= ${DEFAULT_PGSQL_VER}
.endif
.if ${PGSQL_VER} > 82
PLIST_SUB+= TXID="@comment "
.else
PLIST_SUB+= TXID=""
.endif
post-patch:
@${REINPLACE_CMD} -e 's=share/doc=share/examples=' ${WRKSRC}/setup.py
.include <bsd.port.post.mk>
.include <bsd.port.mk>

5
databases/skytools/pkg-plist
View file

@ -81,11 +81,9 @@ bin/walmgr.py
lib/postgresql/logtriga.so
lib/postgresql/pgq_lowlevel.so
lib/postgresql/pgq_triggers.so
%%TXID%%lib/postgresql/txid.so
share/doc/postgresql/contrib/README.londiste
share/doc/postgresql/contrib/README.pgq
share/doc/postgresql/contrib/README.pgq_ext
%%TXID%%share/doc/postgresql/contrib/README.txid
share/postgresql/contrib/logtriga.sql
share/postgresql/contrib/londiste.sql
share/postgresql/contrib/londiste.upgrade.sql
@ -95,8 +93,6 @@ share/postgresql/contrib/pgq_ext.sql
share/postgresql/contrib/pgq_lowlevel.sql
share/postgresql/contrib/pgq_triggers.sql
share/postgresql/contrib/uninstall_pgq.sql
%%TXID%%share/postgresql/contrib/uninstall_txid.sql
%%TXID%%share/postgresql/contrib/txid.sql
@dirrmtry lib/postgresql
@dirrmtry share/doc/postgresql/contrib
@dirrmtry share/doc/postgresql
@ -106,7 +102,6 @@ share/postgresql/contrib/uninstall_pgq.sql
%%DATADIR%%/londiste.sql
%%DATADIR%%/pgq.sql
%%DATADIR%%/pgq_ext.sql
%%TXID%%%%DATADIR%%/txid.sql
%%DATADIR%%/upgrade/final/v2.1.5_londiste.sql
%%DATADIR%%/upgrade/final/v2.1.5_pgq_core.sql
%%DATADIR%%/upgrade/final/v2.1.5_pgq_ext.sql