Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Sep 2012 19:53:11 +0000 (UTC)
From:      Ruslan Mahmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305050 - in head/databases/py-hiredis: . files
Message-ID:  <201209291953.q8TJrBJh083904@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <koobs.freebsd at gmail dot com>
  Approved by:	Denis Generalov <gd at rambler-co dot ru> (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 <gd@rambler-co.ru>
-#
+# Created by: Denis Generalov <gd@rambler-co.ru>
 # $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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209291953.q8TJrBJh083904>