From owner-svn-ports-head@FreeBSD.ORG Sat Sep 29 19:53:12 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F397C1065670; Sat, 29 Sep 2012 19:53:11 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D53208FC12; Sat, 29 Sep 2012 19:53:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8TJrBXo083909; Sat, 29 Sep 2012 19:53:11 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8TJrBJh083904; Sat, 29 Sep 2012 19:53:11 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201209291953.q8TJrBJh083904@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Sat, 29 Sep 2012 19:53:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305050 - in head/databases/py-hiredis: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Sep 2012 19:53:12 -0000 Author: rm Date: Sat Sep 29 19:53:11 2012 New Revision: 305050 URL: http://svn.freebsd.org/changeset/ports/305050 Log: - make it build against system hiredis, instead of bundled one - bump PORTREVISION because of dependency change while here: - trim Makefile header - tab -> space change in pkg-descr:WWW PR: 172090 Submitted by: Kubilay Kocak Approved by: Denis Generalov (maintainer) Added: head/databases/py-hiredis/files/ head/databases/py-hiredis/files/patch-setup.py (contents, props changed) Modified: head/databases/py-hiredis/Makefile head/databases/py-hiredis/pkg-descr Modified: head/databases/py-hiredis/Makefile ============================================================================== --- head/databases/py-hiredis/Makefile Sat Sep 29 19:23:40 2012 (r305049) +++ head/databases/py-hiredis/Makefile Sat Sep 29 19:53:11 2012 (r305050) @@ -1,12 +1,9 @@ -# New ports collection makefile for: py-hiredis -# Date created: 2012-06-01 -# Whom: Denis Generalov -# +# Created by: Denis Generalov # $FreeBSD$ -# PORTNAME= hiredis PORTVERSION= 0.1.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -30,4 +27,7 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/hired %%PYTHON_SITELIBDIR%%/hiredis/version.pyo PLIST_DIRS= %%PYTHON_SITELIBDIR%%/hiredis +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/${PYSETUP} + .include Added: head/databases/py-hiredis/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py-hiredis/files/patch-setup.py Sat Sep 29 19:53:11 2012 (r305050) @@ -0,0 +1,26 @@ +--- ./setup.py.orig 2012-04-18 04:54:11.000000000 +1000 ++++ ./setup.py 2012-09-25 21:54:06.000000000 +1000 +@@ -20,13 +20,10 @@ + if self.distribution.has_ext_modules(): + self.run_command('build_ext') + +-lib = ("hiredis", { +- "sources": ["vendor/hiredis/%s.c" % src for src in ("hiredis", "net", "sds")], +- "include_dirs": ["vendor/hiredis"]}) +- + ext = Extension("hiredis.hiredis", + sources=glob.glob("src/*.c"), +- include_dirs=["src", "vendor"], ++ include_dirs=["src", "%%LOCALBASE%%/include"], ++ library_dirs=["%%LOCALBASE%%/lib"], + libraries=["hiredis"]) + + setup( +@@ -39,7 +36,6 @@ + keywords=["Redis"], + license="BSD", + packages=["hiredis"], +- libraries=[lib], + ext_modules=[ext], + + # Override "install_lib" command Modified: head/databases/py-hiredis/pkg-descr ============================================================================== --- head/databases/py-hiredis/pkg-descr Sat Sep 29 19:23:40 2012 (r305049) +++ head/databases/py-hiredis/pkg-descr Sat Sep 29 19:53:11 2012 (r305050) @@ -1,3 +1,3 @@ Python extension that wraps hiredis. -WWW: https://github.com/pietern/hiredis-py +WWW: https://github.com/pietern/hiredis-py