CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2021/02/26 00:11:45 Modified files: audio/pulseaudio: Makefile audio/pulseaudio/files: module-sndio.c Log message: update and fix sndio module ok espie aja
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2020/04/11 10:01:46 Modified files: mail/opensmtpd-filters/rspamd: Makefile distinfo Log message: update to 0.1.6 from maintainer Gilles Chehade
Re: NEW/UPDATE: devel/py-twisted
On Mon, May 01, 2017 at 11:10:23PM +0300, Pavel Korovin wrote: > On 05/01, Landry Breuil wrote: > > > > So, in this maze of ports, which are the new ones that could be imported > > now (ie, that build/work with the current twisted or dont regress other > > ports), pending twisted review/update in the meantime ? That would move > > things forward... > > > > eric, are you still using twisted, or do you want to drop maintainership > > ? if so, pavel, do you want to take maintainership ? > > If Eric wants to transfer maintainership, I'm OK with taking py-twisted > and dependencies. Hi! I'm not using twisted anymore, and I'll be glad to pass maintainership to Pavel so that things can move forward. I suggest to remove the various subpackages (which were designed after the way twisted was distributed long ago) and have just one package, as I tried to do in the update attempt that Landry posted. As for the various divmod packages (py-epsilon, py-nevow, py-axiom) that depends on twisted, I think they are dead and they can be removed. Eric.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/09/03 10:27:51 Modified files: devel/py-zopeinterface: Makefile distinfo devel/py-zopeinterface/pkg: PLIST Log message: - update to zope.interfaqce 4.3.1 - add python3 flavor - drop maintainership ok ajacoutot@
update: devel/py-zopeinterface
Since they decided to make a new release (even two) before I could commit
the previous diff, here is a new update to zope.interface 4.3.1.
It still adds the python3 flavor and removes the unnecessary dependency on
py-zopeevent. I also took this opportunity to furtively drop maintainership.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-zopeinterface/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile8 Jan 2016 13:09:19 - 1.21
+++ Makefile2 Sep 2016 11:25:31 -
@@ -2,14 +2,11 @@
COMMENT= object interface infrastructure from Zope
-MODPY_EGG_VERSION= 4.1.3
+MODPY_EGG_VERSION= 4.3.1
DISTNAME= zope.interface-${MODPY_EGG_VERSION}
PKGNAME= py-zopeinterface-${MODPY_EGG_VERSION}
CATEGORIES=devel
-REVISION= 0
-
-MAINTAINER=Eric Faurot <e...@openbsd.org>
# Zope Public License
PERMIT_PACKAGE_CDROM= Yes
@@ -20,9 +17,11 @@ WANTLIB += pthread
MODPY_PI = Yes
MODULES= lang/python
-RUN_DEPENDS= devel/py-zopeevent
-TEST_DEPENDS= devel/py-zopeevent
+TEST_DEPENDS= devel/py-zopeevent${MODPY_FLAVOR}
MODPY_SETUPTOOLS= Yes
+
+FLAVORS= python3
+FLAVOR?=
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-zopeinterface/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo13 Nov 2015 14:24:37 - 1.8
+++ distinfo2 Sep 2016 11:25:31 -
@@ -1,2 +1,2 @@
-SHA256 (zope.interface-4.1.3.tar.gz) =
LiIanux8zFiImieOoT3P7V75OdgLB4Gamos8scaBSE8=
-SIZE (zope.interface-4.1.3.tar.gz) = 141561
+SHA256 (zope.interface-4.3.1.tar.gz) =
MgkgztsHZm/UAi9qD81KRFURM6hBXJjqwIc7dTu1pww=
+SIZE (zope.interface-4.3.1.tar.gz) = 147262
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-zopeinterface/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 13 Nov 2015 14:24:37 - 1.5
+++ pkg/PLIST 2 Sep 2016 11:25:31 -
@@ -7,100 +7,103 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/zope/interface/
lib/python${MODPY_VERSION}/site-packages/zope/interface/__init__.py
-lib/python${MODPY_VERSION}/site-packages/zope/interface/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}_flatten.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}adapter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}advice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}declarations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}document.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}ro.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}verify.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zope/interface/_compat.py
-lib/python${MODPY_VERSION}/site-packages/zope/interface/_compat.pyc
lib/python${MODPY_VERSION}/site-packages/zope/interface/_flatten.py
-lib/python${MODPY_VERSION}/site-packages/zope/interface/_flatten.pyc
lib/python${MODPY_VERSION}/site-packages/zope/interface/_zope_interface_coptimizations.c
lib/python${MODPY_VERSION
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/09/02 03:21:08 Modified files: devel : Makefile Log message: add py-zopeevent,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/09/02 03:18:20 Modified files: devel/py-zopeevent: Makefile distinfo devel/py-zopeevent/pkg: PLIST Log message: update to zope.event 4.2.0 add python3 flavor ok landry@
Re: Update devel/py-zopeinterface
On Tue, Aug 30, 2016 at 04:24:54PM +0200, Landry Breuil wrote: > On Tue, Aug 30, 2016 at 04:03:24PM +0200, Eric Faurot wrote: > > This diff update py-zopeinterface to 4.2.0 and adds the python3 flavor. > > The latter depends on the previous py-zopeevent update. > > But you remove the RUN_DEPENDS ? might aswell enforce the version in the > dependency too.. > There is actually no hard dependency on zope.event so I removed RUN_DEPENDS. Eric.
Update devel/py-zopeinterface
This diff update py-zopeinterface to 4.2.0 and adds the python3 flavor.
The latter depends on the previous py-zopeevent update.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-zopeinterface/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile8 Jan 2016 13:09:19 - 1.21
+++ Makefile30 Aug 2016 13:55:25 -
@@ -2,12 +2,11 @@
COMMENT= object interface infrastructure from Zope
-MODPY_EGG_VERSION= 4.1.3
+MODPY_EGG_VERSION= 4.2.0
DISTNAME= zope.interface-${MODPY_EGG_VERSION}
PKGNAME= py-zopeinterface-${MODPY_EGG_VERSION}
CATEGORIES=devel
-REVISION= 0
MAINTAINER=Eric Faurot <e...@openbsd.org>
@@ -20,9 +19,11 @@ WANTLIB += pthread
MODPY_PI = Yes
MODULES= lang/python
-RUN_DEPENDS= devel/py-zopeevent
-TEST_DEPENDS= devel/py-zopeevent
+TEST_DEPENDS= devel/py-zopeevent${MODPY_FLAVOR}
MODPY_SETUPTOOLS= Yes
+
+FLAVORS= python3
+FLAVOR?=
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-zopeinterface/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo13 Nov 2015 14:24:37 - 1.8
+++ distinfo30 Aug 2016 13:55:25 -
@@ -1,2 +1,2 @@
-SHA256 (zope.interface-4.1.3.tar.gz) =
LiIanux8zFiImieOoT3P7V75OdgLB4Gamos8scaBSE8=
-SIZE (zope.interface-4.1.3.tar.gz) = 141561
+SHA256 (zope.interface-4.2.0.tar.gz) =
NnYnQ5QKB1KD4fsiouyegjGHHaziqgBZlRHdxO3w+Pk=
+SIZE (zope.interface-4.2.0.tar.gz) = 146335
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-zopeinterface/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 13 Nov 2015 14:24:37 - 1.5
+++ pkg/PLIST 30 Aug 2016 13:55:25 -
@@ -7,100 +7,103 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/zope/interface/
lib/python${MODPY_VERSION}/site-packages/zope/interface/__init__.py
-lib/python${MODPY_VERSION}/site-packages/zope/interface/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}_flatten.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}adapter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}advice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}declarations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}document.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}ro.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/interface/${MODPY_PYCACHE}verify.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zope/interface/_compat.py
-lib/python${MODPY_VERSION}/site-packages/zope/interface/_compat.pyc
lib/python${MODPY_VERSION}/site-packages/zope/interface/_flatten.py
-lib/python${MODPY_VERSION}/site-packages/zope/interface/_flatten.pyc
lib/python${MODPY_VERSION}/site-packages/zope/interface/_zope_interface_coptimizations.c
lib/python${MODPY_VERSION}/site-packages/zope/interface/_zope_interface_coptimizations.so
lib/python${MODPY_VERSION}/site-packages/zope/interface/adapter.py
-lib/python${MODPY_VERSION}/site-packages/zope/interface/adapter.pyc
lib/
Update devel/py-zopeevent
This diff updates zope.event to 4.2.0 and adds the python3 flavor.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-zopeevent/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Jan 2016 13:17:15 - 1.3
+++ Makefile30 Aug 2016 13:56:21 -
@@ -2,12 +2,11 @@
COMMENT= very basic event publishing system from Zope
-MODPY_EGG_VERSION= 4.1.0
+MODPY_EGG_VERSION= 4.2.0
DISTNAME= zope.event-${MODPY_EGG_VERSION}
PKGNAME= py-zopeevent-${MODPY_EGG_VERSION}
CATEGORIES=devel
-REVISION= 0
# Zope Public License
PERMIT_PACKAGE_CDROM= Yes
@@ -15,6 +14,9 @@ PERMIT_PACKAGE_CDROM= Yes
MODPY_PI = Yes
MODULES= lang/python
+
+FLAVORS= python3
+FLAVOR?=
MODPY_SETUPTOOLS= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/py-zopeevent/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo13 Nov 2015 14:23:01 - 1.1.1.1
+++ distinfo30 Aug 2016 13:56:21 -
@@ -1,2 +1,2 @@
-SHA256 (zope.event-4.1.0.tar.gz) = 3HpZov2Rcw03kxMaXSYbKek+xOKpfxvEh86N7+4v54Y=
-SIZE (zope.event-4.1.0.tar.gz) = 476047
+SHA256 (zope.event-4.2.0.tar.gz) = zhEAQheGOkgn6hpnoxcwvdq5BzgyvbO5voWGklkRh1g=
+SIZE (zope.event-4.2.0.tar.gz) = 488532
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-zopeevent/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 13 Nov 2015 14:23:01 - 1.1.1.1
+++ pkg/PLIST 30 Aug 2016 13:56:21 -
@@ -11,12 +11,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zope.event-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/zope/event/
lib/python${MODPY_VERSION}/site-packages/zope/event/__init__.py
-lib/python${MODPY_VERSION}/site-packages/zope/event/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zope/event/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/zope/event/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/event/${MODPY_PYCACHE}classhandler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zope/event/${MODPY_PYCACHE}tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zope/event/classhandler.py
-lib/python${MODPY_VERSION}/site-packages/zope/event/classhandler.pyc
@comment lib/python${MODPY_VERSION}/site-packages/zope/event/classhandler.py~
@comment lib/python${MODPY_VERSION}/site-packages/zope/event/classhandler.rst~
@comment lib/python${MODPY_VERSION}/site-packages/zope/event/classhandlers.py~
lib/python${MODPY_VERSION}/site-packages/zope/event/tests.py
-lib/python${MODPY_VERSION}/site-packages/zope/event/tests.pyc
@comment lib/python${MODPY_VERSION}/site-packages/zope/event/tests.py~
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/29 03:22:44 Modified files: devel : Makefile Log message: +py-blist
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/29 03:06:01 Log message: import py-blist The blist is a drop-in replacement for the Python list the provides better performance when modifying large lists. The blist package also provides sortedlist, sortedset, weaksortedlist, weaksortedset, sorteddict, and btuple types. ok danj@ jca@ Status: Vendor Tag: eric Release Tags: eric_20160429 N ports/devel/py-blist/Makefile N ports/devel/py-blist/distinfo N ports/devel/py-blist/pkg/DESCR N ports/devel/py-blist/pkg/PLIST No conflicts created by this import
new: py-blist-1.3.6
The blist is a drop-in replacement for the Python list the provides better performance when modifying large lists. The blist package also provides sortedlist, sortedset, weaksortedlist, weaksortedset, sorteddict, and btuple types. Eric. py-blist.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/27 15:18:28 Modified files: multimedia/oggz: Makefile Log message: drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/27 15:07:40 Modified files: www/py-nevow : Makefile Log message: drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/27 15:06:11 Modified files: devel/py-epsilon: Makefile Log message: drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/27 14:57:44 Modified files: databases/py-axiom: Makefile Log message: drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/27 14:55:02 Modified files: audio/cmu-sphinx3: Makefile Log message: drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/04/27 14:53:34 Modified files: audio/cmu-sphinxbase: Makefile Log message: drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2015/03/30 01:12:15 Modified files: graphics/cairo : Makefile distinfo graphics/cairo/patches: patch-util_cairo-fdr_Makefile_in patch-util_cairo-sphinx_Makefile_in patch-util_cairo-trace_Makefile_in graphics/cairo/pkg: PLIST Removed files: graphics/cairo/patches: patch-src_cairo-cff-subset_c patch-src_cairo-image-compositor_c patch-src_cairo-image-info_c patch-src_cairo-tor-scan-converter_c patch-src_cairoint_h Log message: update to cairo 1.14.2 ok ajacoutot@
UPDATE: cairo-1.14.2
Hi,
This diff updates cairo to bugfix release 1.14.2.
Nice cleanup in patches/.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile5 Jan 2015 09:27:41 - 1.56
+++ Makefile17 Mar 2015 11:04:27 -
@@ -2,8 +2,7 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.14.0
-REVISION= 1
+DISTNAME= cairo-1.14.2
SHARED_LIBS+= cairo 12.3
SHARED_LIBS+= cairo-gobject 1.1
SHARED_LIBS+= cairo-script-interpreter 1.1
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo17 Nov 2014 12:50:14 - 1.23
+++ distinfo17 Mar 2015 11:04:27 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.14.0.tar.xz) = LPX4FDLnfqQ1mvnc0PT6830BWTRQE5HDEb/S0ZoBNLc=
-SIZE (cairo-1.14.0.tar.xz) = 36584076
+SHA256 (cairo-1.14.2.tar.xz) = yRnZmd2xu77NS75lKZyiq9IHnH4T0iRXeJWvpwBezOs=
+SIZE (cairo-1.14.2.tar.xz) = 35376404
Index: patches/patch-src_cairo-cff-subset_c
===
RCS file: patches/patch-src_cairo-cff-subset_c
diff -N patches/patch-src_cairo-cff-subset_c
--- patches/patch-src_cairo-cff-subset_c17 Nov 2014 12:50:14 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,128 +0,0 @@
-$OpenBSD: patch-src_cairo-cff-subset_c,v 1.1 2014/11/17 12:50:14 eric Exp $
-
-http://cgit.freedesktop.org/cairo/commit/?id=99a35dd273f3deb4ae54310f1ed1746bfd9fae70
-
-CFF: Fix unaligned access
-
src/cairo-cff-subset.c.origMon Oct 13 21:46:33 2014
-+++ src/cairo-cff-subset.c Fri Oct 31 02:05:05 2014
-@@ -433,7 +433,7 @@ cff_index_read (cairo_array_t *index, unsigned char **
- p = *ptr;
- if (p + 2 end_ptr)
- return CAIRO_INT_STATUS_UNSUPPORTED;
--count = be16_to_cpu( *((uint16_t *)p) );
-+count = get_unaligned_be16 (p);
- p += 2;
- if (count 0) {
- offset_size = *p++;
-@@ -984,14 +984,14 @@ cairo_cff_font_read_fdselect (cairo_cff_font_t *font,
- for (i = 0; i font-num_glyphs; i++)
- font-fdselect[i] = *p++;
- } else if (type == 3) {
--num_ranges = be16_to_cpu( *((uint16_t *)p) );
-+num_ranges = get_unaligned_be16 (p);
- p += 2;
- for (i = 0; i num_ranges; i++)
- {
--first = be16_to_cpu( *((uint16_t *)p) );
-+first = get_unaligned_be16 (p);
- p += 2;
- fd = *p++;
--last = be16_to_cpu( *((uint16_t *)p) );
-+last = get_unaligned_be16 (p);
- for (j = first; j last; j++)
- font-fdselect[j] = fd;
- }
-@@ -1722,7 +1722,7 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t *fon
- p = font-charset + 1;
- g = 1;
- while (g = (unsigned)font-num_glyphs p font-data_end) {
-- c = be16_to_cpu( *((uint16_t *)p) );
-+ c = get_unaligned_be16 (p);
- if (c == cid) {
- *gid = g;
- return CAIRO_STATUS_SUCCESS;
-@@ -1737,7 +1737,7 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t *fon
- first_gid = 1;
- p = font-charset + 1;
- while (first_gid = (unsigned)font-num_glyphs p + 2
font-data_end) {
-- first_cid = be16_to_cpu( *((uint16_t *)p) );
-+ first_cid = get_unaligned_be16 (p);
- num_left = p[2];
- if (cid = first_cid cid = first_cid + num_left) {
- *gid = first_gid + cid - first_cid;
-@@ -1753,8 +1753,8 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t *fon
- first_gid = 1;
- p = font-charset + 1;
- while (first_gid = (unsigned)font-num_glyphs p + 3
font-data_end) {
-- first_cid = be16_to_cpu( *((uint16_t *)p) );
-- num_left = be16_to_cpu( *((uint16_t *)(p+2)) );
-+ first_cid = get_unaligned_be16 (p);
-+ num_left = get_unaligned_be16 (p+2);
- if (cid = first_cid cid = first_cid + num_left) {
- *gid = first_gid + cid - first_cid;
- return CAIRO_STATUS_SUCCESS;
-@@ -2328,7 +2328,7 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *f
- unsigned int i;
- cairo_int_status_t status;
- unsigned int offset_array;
--uint32_t *offset_array_ptr;
-+unsigned char *offset_array_ptr;
- int offset_base;
- uint16_t count;
- uint8_t offset_size = 4;
-@@ -2349,7 +2349,7 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *f
- if (unlikely (status))
- return status;
- offset_base = _cairo_array_num_elements (font-output) - 1;
--*offset_array_ptr = cpu_to_be32(1);
-+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2014/11/17 05:50:14 Modified files: graphics/cairo : Makefile distinfo graphics/cairo/patches: patch-util_cairo-fdr_Makefile_in patch-util_cairo-sphinx_Makefile_in patch-util_cairo-trace_Makefile_in graphics/cairo/pkg: PLIST Added files: graphics/cairo/patches: patch-src_cairo-cff-subset_c patch-src_cairo-image-info_c patch-src_cairo-tor-scan-converter_c patch-src_cairoint_h Log message: update to 1.14.0 + post-release fixes (from Brad) please ajacoutot@ landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2013/05/28 09:03:20 Modified files: graphics/gifsicle: Makefile distinfo Log message: update to gifsicle 1.70 from Donovan Watteau
Re: p5-IO-Socket-INET6 fix raw sockets
On Sat, Mar 30, 2013 at 04:39:47PM +0100, Alexander Bluhm wrote:
On Sat, Mar 30, 2013 at 02:30:55PM +, Stuart Henderson wrote:
Most other OS are going to be using something closer to the libbind
(ISC) resolver which allows this so I think it would make more sense to
adjust getaddrinfo_async_run() to allow '0' for raw sockets, rather
than patch users.
Makes sense.
Thinking possibly something like this, but untested:
This fixes my problem.
This is a simpler diff. get_port() returns 0 if servname is NULL, and
the last argument is just a boolean.
Eric.
Index: getaddrinfo_async.c
===
RCS file: /cvs/src/lib/libc/asr/getaddrinfo_async.c,v
retrieving revision 1.12
diff -u -r1.12 getaddrinfo_async.c
--- getaddrinfo_async.c 28 Mar 2013 11:47:23 - 1.12
+++ getaddrinfo_async.c 30 Mar 2013 17:23:07 -
@@ -170,7 +170,7 @@
}
if (ai-ai_socktype == SOCK_RAW
- as-as.ai.servname != NULL) {
+ get_port(as-as.ai.servname, NULL, 1) != 0) {
ar-ar_gai_errno = EAI_SERVICE;
async_set_state(as, ASR_STATE_HALT);
break;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2013/03/04 13:40:19 Modified files: graphics/cairo : Makefile distinfo graphics/cairo/patches: patch-util_cairo-fdr_Makefile_in patch-util_cairo-trace_Makefile_in Log message: update to cairo 1.12.14 prodded by Brad ok aja@ naddy@
Re: UPDATE: graphics/cairo
On Sun, Feb 03, 2013 at 09:26:48AM +, Stuart Henderson wrote:
Cairo uses lzo2 now, check the changelog..also fixes a hardcoded
path to x11.
Diff looks good but I am a little twitchy about updating a widely used
library at this point, bearing in mind that if it causes problems there
might not be time to fix them, this at least needs some wide testing.
It's working ok for what I use on amd64 but could do with tests on
more arches..
So here is the diff I intend to commit.
Ok? Any strong objection? Should we wait post-5.3?
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile30 Jan 2013 13:17:51 - 1.45
+++ Makefile7 Feb 2013 11:02:56 -
@@ -2,11 +2,10 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.12.8
-REVISION= 1
-SHARED_LIBS+= cairo 12.1
+DISTNAME= cairo-1.12.12
+SHARED_LIBS+= cairo 12.2
SHARED_LIBS+= cairo-gobject 1.0
-SHARED_LIBS+= cairo-script-interpreter 1.0
+SHARED_LIBS+= cairo-script-interpreter 1.1
CATEGORIES=graphics
DPB_PROPERTIES=parallel
EXTRACT_SUFX= .tar.xz
@@ -16,7 +15,7 @@ HOMEPAGE= http://cairographics.org/
MAINTAINER=Eric Faurot e...@openbsd.org
WANTLIB += X11 Xau Xdmcp Xext Xrender expat ffi fontconfig freetype
-WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 png
+WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 lzo2 m pcre pixman-1 png
WANTLIB += pthread pthread-stubs xcb xcb-render xcb-shm z
# LGPLv2.1 / MPL 1.1
@@ -32,8 +31,9 @@ MODULES= devel/gettext
USE_LIBTOOL= Yes
USE_GMAKE= Yes
-LIB_DEPENDS= graphics/png \
- devel/glib2
+LIB_DEPENDS= archivers/lzo2 \
+ devel/glib2 \
+ graphics/png
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED} \
@@ -44,7 +44,9 @@ CONFIGURE_ARGS += --enable-tee
# If one of these tools is found at configure stage, it might be used,
# no matter whether we use --disable-gtk-doc or not.
-CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK= \
+CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib \
+ ac_cv_path_GTKDOC_CHECK= \
ac_cv_path_GTKDOC_REBASE= \
ac_cv_path_GTKDOC_MKPDF=
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo12 Nov 2012 12:29:07 - 1.20
+++ distinfo7 Feb 2013 11:02:56 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk=
-SIZE (cairo-1.12.8.tar.xz) = 42113752
+SHA256 (cairo-1.12.12.tar.xz) = FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo=
+SIZE (cairo-1.12.12.tar.xz) = 42139096
Index: patches/patch-util_cairo-fdr_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in
--- patches/patch-util_cairo-fdr_Makefile_in12 Nov 2012 12:29:07 -
1.2
+++ patches/patch-util_cairo-fdr_Makefile_in7 Feb 2013 11:02:56 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric Exp $
util/cairo-fdr/Makefile.in.origMon Oct 22 06:08:40 2012
-+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012
-@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+--- util/cairo-fdr/Makefile.in.origThu Jan 31 10:25:59 2013
util/cairo-fdr/Makefile.in Sat Feb 2 00:30:35 2013
+@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
Index: patches/patch-util_cairo-trace_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in
--- patches/patch-util_cairo-trace_Makefile_in 16 Jan 2013 14:29:15 -
1.4
+++ patches/patch-util_cairo-trace_Makefile_in 7 Feb 2013 11:02:56 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15
ajacoutot Exp $
util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012
-+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012
-@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
+--- util/cairo-trace/Makefile.in.orig Thu Jan 31 10:26:00 2013
util/cairo-trace/Makefile.in Sat Feb 2 00:30:35 2013
+@@ -400,7 +400,7
UPDATE: graphics/cairo
Hi,
This is an update to cairo 1.12.12.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile30 Jan 2013 13:17:51 - 1.45
+++ Makefile1 Feb 2013 17:44:05 -
@@ -2,9 +2,8 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.12.8
-REVISION= 1
-SHARED_LIBS+= cairo 12.1
+DISTNAME= cairo-1.12.12
+SHARED_LIBS+= cairo 12.2
SHARED_LIBS+= cairo-gobject 1.0
SHARED_LIBS+= cairo-script-interpreter 1.0
CATEGORIES=graphics
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo12 Nov 2012 12:29:07 - 1.20
+++ distinfo1 Feb 2013 17:44:05 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk=
-SIZE (cairo-1.12.8.tar.xz) = 42113752
+SHA256 (cairo-1.12.12.tar.xz) = FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo=
+SIZE (cairo-1.12.12.tar.xz) = 42139096
Index: patches/patch-src_cairo_pc_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_cairo_pc_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_cairo_pc_in
--- patches/patch-src_cairo_pc_in 30 Jan 2013 13:17:51 - 1.1
+++ patches/patch-src_cairo_pc_in 1 Feb 2013 17:44:05 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_cairo_pc_in,v 1.1 2013/01/30 13:17:51 brad Exp $
src/cairo.pc.in.orig Tue Jan 29 07:56:53 2013
-+++ src/cairo.pc.inTue Jan 29 08:22:13 2013
+--- src/cairo.pc.in.orig Sun Dec 6 09:29:25 2009
src/cairo.pc.inFri Feb 1 17:25:52 2013
@@ -8,6 +8,6 @@ Description: Multi-platform 2D graphics library
Version: @VERSION@
@PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
-Libs: -L${libdir} -lcairo
-+Libs: -L${libdir} -Wl,-rpath-link,${X11BASE}/lib -lcairo
++Libs: -L${libdir} -Wl,-rpath-link,/usr/X11R6/lib -lcairo
Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
Cflags: -I${includedir}/cairo
Index: patches/patch-util_cairo-fdr_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in
--- patches/patch-util_cairo-fdr_Makefile_in12 Nov 2012 12:29:07 -
1.2
+++ patches/patch-util_cairo-fdr_Makefile_in1 Feb 2013 17:44:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric Exp $
util/cairo-fdr/Makefile.in.origMon Oct 22 06:08:40 2012
-+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012
-@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+--- util/cairo-fdr/Makefile.in.origThu Jan 31 16:25:59 2013
util/cairo-fdr/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
Index: patches/patch-util_cairo-trace_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in
--- patches/patch-util_cairo-trace_Makefile_in 16 Jan 2013 14:29:15 -
1.4
+++ patches/patch-util_cairo-trace_Makefile_in 1 Feb 2013 17:44:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15
ajacoutot Exp $
util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012
-+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012
-@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
+--- util/cairo-trace/Makefile.in.orig Thu Jan 31 16:26:00 2013
util/cairo-trace/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -400,7 +400,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/11/12 05:27:00 Modified files: audio/pulseaudio: Makefile audio/pulseaudio/files: module-sndio.c Log message: fix sndio backend: make mio_open blocking. discussed with ratchov@ and armani@ ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/11/12 05:29:07 Modified files: graphics/cairo : Makefile distinfo graphics/cairo/patches: patch-configure patch-util_cairo-fdr_Makefile_in patch-util_cairo-trace_Makefile_in Removed files: graphics/cairo/patches: patch-src_cairo-polygon-reduce_c Log message: update to cairo 1.12.8 from Brad. ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/10/08 11:19:57 Modified files: audio/pulseaudio: Makefile audio/pulseaudio/files: module-sndio.c Added files: audio/pulseaudio/files: module-sndio-sysex.h Log message: make sndio backend control the sndiod master volume rather than its own channel. This makes pulseaudio mixers work for all audio. requested by and ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/09/28 11:09:03 Modified files: audio/pulseaudio: Makefile audio/pulseaudio/patches: patch-src_Makefile_in patch-src_daemon_default_pa_in patch-src_modules_oss_module-oss_c audio/pulseaudio/pkg: PLIST Added files: audio/pulseaudio/files: module-sndio-symdef.h module-sndio.c audio/pulseaudio/patches: patch-src_Makefile_am Log message: Add a sndio backend implementation. It certainly needs more work, but it should be functionnal for playback. Imported so that further testing and developement can happen in-tree. prodded by ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/08/26 11:22:27 Modified files: graphics/cairo : Makefile graphics/cairo/pkg: PFRAG.shared PLIST Added files: graphics/cairo/patches: patch-util_cairo-trace_Makefile_in Log message: - tweak WANTLIB - libcairo-trace is not a regular library - move cairo-trace to PRFAG.shared input from Brad and ajacoutot@ ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/08/16 11:03:18 Modified files: graphics/cairo : Makefile distinfo graphics/cairo/patches: patch-configure graphics/cairo/pkg: DESCR PFRAG.shared PLIST Added files: graphics/cairo/patches: patch-src_cairo-polygon-reduce_c patch-util_Makefile_in patch-util_cairo-fdr_Makefile_in Removed files: graphics/cairo/patches: gcc2-patch-src_cairo-gl-private_h patch-src_Makefile_in patch-src_cairo-xlib-display_c Log message: update to cairo 1.12.2. with input from Brad and ajacoutot@ ok ajacoutot@
Re: UPDATE: graphics/cairo
On Thu, Aug 09, 2012 at 02:41:12AM -0400, Brad Smith wrote:
Thanks for the patch.
RCS file: /home/cvs/ports/graphics/cairo/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.shared
--- pkg/PFRAG.shared 11 Oct 2010 08:09:44 - 1.4
+++ pkg/PFRAG.shared 30 Jul 2012 04:45:02 -
@@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2010/10/11 08:09:44 eric Exp $
+lib/cairo/cairo-fdr.so.0.0
This is not tracked by SHARED_LIBS and nothing uses that.
Do we really want/need this?
@lib lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
@lib lib/libcairo-gobject.so.${LIBcairo-gobject_VERSION}
@lib
lib/libcairo-script-interpreter.so.${LIBcairo-script-interpreter_VERSION}
UPDATE: graphics/cairo
Hi.
This diff updates cairo to 1.12.2 and integrates a bugfix. There is
a known text display problem on some radeon chipsets which is fixed
in an upcoming update of the ati driver.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.37
diff -u -p -u -r1.37 Makefile
--- Makefile1 Nov 2011 20:30:49 - 1.37
+++ Makefile8 Aug 2012 14:17:58 -
@@ -2,13 +2,14 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.10.2
-REVISION= 3
-SHARED_LIBS= cairo 11.1
-SHARED_LIBS+= cairo-trace 0.0
-SHARED_LIBS+= cairo-gobject 0.0
-SHARED_LIBS+= cairo-script-interpreter 0.0
+DISTNAME= cairo-1.12.2
+SHARED_LIBS= cairo 12.0
+SHARED_LIBS+= cairo-trace 1.0
+SHARED_LIBS+= cairo-gobject 1.0
+SHARED_LIBS+= cairo-script-interpreter 1.0
CATEGORIES=graphics
+
+EXTRACT_SUFX= .tar.xz
HOMEPAGE= http://cairographics.org/introduction
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- distinfo5 Jan 2011 13:26:05 - 1.18
+++ distinfo8 Aug 2012 14:17:58 -
@@ -1,5 +1,2 @@
-MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
-RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
-SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
-SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
-SIZE (cairo-1.10.2.tar.gz) = 23558405
+SHA256 (cairo-1.12.2.tar.xz) = t4a8SnBUK8sJ8tnRPl5qDIZAjL9tHt3l8N6Afuz5P5Y=
+SIZE (cairo-1.12.2.tar.xz) = 42051584
Index: patches/gcc2-patch-src_cairo-gl-private_h
===
RCS file: /cvs/ports/graphics/cairo/patches/gcc2-patch-src_cairo-gl-private_h,v
retrieving revision 1.1
diff -u -p -u -r1.1 gcc2-patch-src_cairo-gl-private_h
--- patches/gcc2-patch-src_cairo-gl-private_h 5 Jan 2011 13:26:05 -
1.1
+++ patches/gcc2-patch-src_cairo-gl-private_h 8 Aug 2012 14:17:58 -
@@ -1,9 +1,9 @@
remove unnamed union to please gcc-2.95
$OpenBSD: gcc2-patch-src_cairo-gl-private_h,v 1.1 2011/01/05 13:26:05 eric Exp
$
src/cairo-gl-private.h.origMon Jan 3 12:23:14 2011
-+++ src/cairo-gl-private.h Mon Jan 3 12:23:40 2011
-@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
+--- src/cairo-gl-private.h.origWed Apr 4 20:02:50 2012
src/cairo-gl-private.h Wed Apr 4 20:02:26 2012
+@@ -128,7 +128,6 @@ typedef enum cairo_gl_operand_type {
*/
typedef struct cairo_gl_operand {
cairo_gl_operand_type_t type;
@@ -11,10 +11,10 @@ $OpenBSD: gcc2-patch-src_cairo-gl-privat
struct {
GLuint tex;
cairo_gl_surface_t *surface;
-@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
- float radius_1;
- cairo_extend_t extend;
- } radial;
+@@ -145,7 +144,6 @@ typedef struct cairo_gl_operand {
+ double radius_0, a;
+ cairo_extend_t extend;
+ } gradient;
-};
unsigned int vertex_offset;
} cairo_gl_operand_t;
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-configure
--- patches/patch-configure 28 Jun 2011 11:04:40 - 1.9
+++ patches/patch-configure 8 Aug 2012 14:17:58 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-configure,v 1.9 2011/06/
Use `Requires', not `Requires.private', because otherwise libraries
required for linking aren't exposed.
configure.orig Sat Dec 25 15:22:57 2010
-+++ configure Tue Jun 28 12:27:44 2011
-@@ -16983,10 +16983,7 @@ if test x$PKG_CONFIG = x; then
+--- configure.orig Sun Apr 29 20:49:59 2012
configure Sun Aug 5 10:10:59 2012
+@@ -17696,10 +17696,7 @@ if test x$PKG_CONFIG = x; then
as_fn_error $? pkg-config = $PKGCONFIG_REQUIRED required but not
found (http://pkgconfig.freedesktop.org/) $LINENO 5
fi
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_Makefile_in,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 5 Jan 2011 13:26:05 - 1.6
+++ patches/patch-src_Makefile_in 8 Aug 2012 14:17:58 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.6 2011/01/05 13:26:05 eric Exp $
src/Makefile.in.orig Sat Dec 25 15:22:52 2010
-+++ src/Makefile.inMon Dec 27 10:07:21 2010
-@@ -2429,7 +2429,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
+--- src/Makefile.in.orig Sun Apr 29 20:49:55 2012
src/Makefile.inSun Aug 5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/06/24 03:34:03 Modified files: geo/geos : Makefile distinfo geo/geos/pkg : PLIST Added files: geo/geos/patches: patch-include_geos_platform_h_in patch-src_Makefile_in Removed files: geo/geos/patches: patch-source_Makefile_in Log message: update to 3.3.4 ok landry@
UPDATE: geo/geos
Hi, This is an update to 3.3.3 Eric. Index: Makefile === RCS file: /cvs/ports/geo/geos/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile17 Nov 2010 08:05:12 - 1.7 +++ Makefile20 Apr 2012 12:08:45 - @@ -1,11 +1,10 @@ # $OpenBSD: Makefile,v 1.7 2010/11/17 08:05:12 espie Exp $ COMMENT= 2d geometry and topology engine -DISTNAME= geos-3.2.2 -REVISION= 0 +DISTNAME= geos-3.3.3 CATEGORIES=geo -SHARED_LIBS= geos6.0 \ - geos_c 3.0 +SHARED_LIBS= geos7.0 \ + geos_c 4.0 MAINTAINER=Eric Faurot e...@openbsd.org Index: distinfo === RCS file: /cvs/ports/geo/geos/distinfo,v retrieving revision 1.5 diff -u -u -r1.5 distinfo --- distinfo1 Jul 2010 00:26:03 - 1.5 +++ distinfo20 Apr 2012 12:08:45 - @@ -1,5 +1,5 @@ -MD5 (geos-3.2.2.tar.bz2) = xdJkrKwi/ncg+F2twfwXxg== -RMD160 (geos-3.2.2.tar.bz2) = lTQr4IMXXzjIyHtWgicSUzIPPWA= -SHA1 (geos-3.2.2.tar.bz2) = aRfW0dTnn1jZ+TG/NRAkcJ+rvFo= -SHA256 (geos-3.2.2.tar.bz2) = JN98IRmTb+C8qmbgsFqiiodeNzCVzAXufv9AQzDjIRw= -SIZE (geos-3.2.2.tar.bz2) = 1664073 +MD5 (geos-3.3.3.tar.bz2) = hFTmU9fsykdRU8yI/R2qJg== +RMD160 (geos-3.3.3.tar.bz2) = QY7apUmL4JiqBFX9gj8BAJ64qqc= +SHA1 (geos-3.3.3.tar.bz2) = Ls0jw4105fBHV9xSjsMIWABvtqc= +SHA256 (geos-3.3.3.tar.bz2) = 389L1wqyEqW3utIdAbhHSPEBpUUJK1ba/cOILvO93sk= +SIZE (geos-3.3.3.tar.bz2) = 1852272 Index: patches/patch-include_geos_platform_h_in === RCS file: patches/patch-include_geos_platform_h_in diff -N patches/patch-include_geos_platform_h_in --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-include_geos_platform_h_in20 Apr 2012 12:08:45 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- include/geos/platform.h.in.origThu Apr 19 15:04:47 2012 include/geos/platform.h.in Thu Apr 19 15:05:07 2012 +@@ -91,7 +91,7 @@ extern C + # elif defined(__MINGW32__) + // sandro furieri: sanitizing MinGW32 + # define ISNAN(x) (std::isnan(x)) +-# elif defined(__OSX__) || defined(__APPLE__) ++# elif defined(__OSX__) || defined(__APPLE__) || defined(__OpenBSD__) +// Hack for OS/X cmath incorrectly re-defining isnan() into oblivion. +// It does leave a version in std. + # define ISNAN(x) (std::isnan(x)) Index: patches/patch-source_Makefile_in === RCS file: patches/patch-source_Makefile_in diff -N patches/patch-source_Makefile_in --- patches/patch-source_Makefile_in1 Jul 2010 00:26:03 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-source_Makefile_in,v 1.3 2010/07/01 00:26:03 eric Exp $ source/Makefile.in.origSun Apr 18 17:08:08 2010 -+++ source/Makefile.in Sun Jun 27 06:14:06 2010 -@@ -326,8 +326,7 @@ EXTRA_DIST = Makefile.vc dirlist.mk - INCLUDES = -I$(top_srcdir)/source/headers - lib_LTLIBRARIES = libgeos.la - libgeos_la_LDFLAGS = \ -- -release @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ \ -- -no-undefined -+ -no-undefined -lstdc++ -lm - - libgeos_la_SOURCES = \ - inlines.cpp Index: patches/patch-src_Makefile_in === RCS file: patches/patch-src_Makefile_in diff -N patches/patch-src_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_Makefile_in 20 Apr 2012 12:08:45 - @@ -0,0 +1,13 @@ +$OpenBSD$ +--- src/Makefile.in.orig Sun Apr 8 15:56:32 2012 src/Makefile.inSun Apr 8 15:56:21 2012 +@@ -343,8 +343,7 @@ EXTRA_DIST = Makefile.vc dirlist.mk CMakeLists.txt inf + INCLUDES = -I$(top_srcdir)/include + lib_LTLIBRARIES = libgeos.la + libgeos_la_LDFLAGS = \ +--release @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ \ +--no-undefined ++-no-undefined -lstdc++ -lm + + libgeos_la_SOURCES = \ + inlines.cpp Index: pkg/PLIST === RCS file: /cvs/ports/geo/geos/pkg/PLIST,v retrieving revision 1.5 diff -u -u -r1.5 PLIST --- pkg/PLIST 4 Nov 2010 20:14:30 - 1.5 +++ pkg/PLIST 20 Apr 2012 12:08:47 - @@ -63,7 +63,6 @@ include/geos/geom/Envelope.h include/geos/geom/Envelope.inl include/geos/geom/Geometry.h -include/geos/geom/Geometry.inl include/geos/geom/GeometryCollection.h include/geos/geom/GeometryCollection.inl include/geos/geom/GeometryComponentFilter.h @@ -75,6 +74,7 @@ include/geos/geom/LineSegment.h include/geos/geom/LineSegment.inl include/geos/geom/LineString.h +include/geos/geom/Lineal.h include/geos/geom/LinearRing.h include/geos/geom/Location.h include/geos/geom/MultiLineString.h @@ -84,8 +84,10 @@ include/geos/geom/MultiPolygon.inl include/geos/geom/Point.h include/geos/geom/Polygon.h +include/geos/geom/Polygonal.h include/geos/geom/PrecisionModel.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/03/27 00:30:40 Modified files: graphics/py-cairo: Makefile Log message: fix REGRESS_DEPENDS, no bump ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/03/26 12:26:18 Log message: py.test is a simple and popular testing tool for Python. ok mpi@ Status: Vendor Tag: eric Release Tags: eric_2012-mar-26 N ports/devel/py-test/Makefile N ports/devel/py-test/distinfo N ports/devel/py-test/pkg/DESCR N ports/devel/py-test/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/03/26 13:06:46 Modified files: devel : Makefile Log message: +py-test
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/03/24 10:39:42 Modified files: devel/py-py: Makefile distinfo devel/py-py/pkg: PLIST Removed files: devel/py-py/patches: patch-py_c-extension_greenlet_slp_platformselect_h Log message: - update to 1.4.7 - add python3 flavor - take maintainership ok martynas@ (maintainer)
NEW: devel/py-test
py.test is a simple and popular testing tool for Python. It has been split from py-py, and it is used for at least py-cairo regress. py-test.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/03/14 14:16:23 Modified files: textproc/py-MarkupSafe: Makefile Log message: add python flavor looks good fgsch@
Re: CVS: cvs.openbsd.org: ports
On Wed, Mar 14, 2012 at 02:16:23PM -0600, Eric Faurot wrote: CVSROOT: /cvs Module name: ports Changes by: e...@cvs.openbsd.org2012/03/14 14:16:23 Modified files: textproc/py-MarkupSafe: Makefile Log message: add python flavor I meant python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/03/13 06:23:53 Modified files: devel/py-nose : Makefile devel/py-nose/pkg: PLIST Log message: - update HOMEPAGE - add python3 FLAVOR ok martynas@ (maintainer)
UPDATE: textproc/py-MarkupSafe
Hi, This diff adds the python3 FLAVOR. Eric. Index: Makefile === RCS file: /cvs/ports/textproc/py-MarkupSafe/Makefile,v retrieving revision 1.6 diff -u -u -r1.6 Makefile --- Makefile6 Nov 2011 14:29:00 - 1.6 +++ Makefile12 Mar 2012 19:10:47 - @@ -24,4 +24,7 @@ MODPY_SETUPTOOLS= Yes +FLAVORS= python3 +FLAVOR?= + .include bsd.port.mk
UPDATE: www/py-beaker
This diffs adds the python3 flavor.
The regress dependencies would need to be updated.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/www/py-beaker/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- Makefile31 Dec 2011 15:10:35 - 1.8
+++ Makefile12 Mar 2012 20:10:44 -
@@ -20,13 +20,16 @@
MODULES = lang/python
-RUN_DEPENDS = security/py-crypto
-REGRESS_DEPENDS = databases/py-sqlalchemy \
- devel/py-coverage \
- devel/py-mock \
- devel/py-nose \
- misc/py-memcached \
- www/py-webtest \
+FLAVORS = python3
+FLAVOR ?=
+
+RUN_DEPENDS = security/py-crypto${MODPY_FLAVOR}
+REGRESS_DEPENDS = databases/py-sqlalchemy${MODPY_FLAVOR} \
+ devel/py-coverage${MODPY_FLAVOR} \
+ devel/py-mock${MODPY_FLAVOR} \
+ devel/py-nose${MODPY_FLAVOR} \
+ misc/py-memcached${MODPY_FLAVOR} \
+ www/py-webtest${MODPY_FLAVOR} \
${RUN_DEPENDS}
MODPY_SETUPTOOLS = Yes
UPDATE: www/py-mako
This diff updates py-mako to 0.6.2 and adds the python3 flavor.
I have just posted the run dependencies updates as well.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/www/py-mako/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile14 Oct 2011 05:25:03 - 1.10
+++ Makefile12 Mar 2012 20:13:31 -
@@ -2,7 +2,7 @@
COMMENT = super-fast templating language
-MODPY_EGG_VERSION = 0.5.0
+MODPY_EGG_VERSION = 0.6.2
DISTNAME = Mako-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
@@ -20,16 +20,23 @@
MODULES = lang/python
-RUN_DEPENDS = textproc/py-MarkupSafe=0.9.2 \
- www/py-beaker=1.1
-REGRESS_DEPENDS = devel/py-nose=0.11 \
- devel/py-babel \
+FLAVORS = python3
+FLAVOR ?=
+
+RUN_DEPENDS = textproc/py-MarkupSafe${MODPY_FLAVOR}=0.9.2 \
+ www/py-beaker${MODPY_FLAVOR}=1.1
+REGRESS_DEPENDS = devel/py-nose${MODPY_FLAVOR}=0.11 \
+ devel/py-babel${MODPY_FLAVOR} \
${RUN_DEPENDS}
MODPY_SETUPTOOLS = Yes
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-mako
- cd ${WRKSRC}/doc pax -rw *.html _static ${PREFIX}/share/doc/py-mako
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}mako
+ cd ${WRKSRC}/doc pax -rw *.html _static \
+ ${PREFIX}/share/doc/${MODPY_PY_PREFIX}mako
+.if ${FLAVOR:L:Mpython3}
+ mv ${PREFIX}/bin/mako-render
${PREFIX}/bin/mako-render${MODPY_BIN_SUFFIX}
+.endif
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/www/py-mako/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- distinfo13 Oct 2011 21:09:52 - 1.4
+++ distinfo12 Mar 2012 20:13:31 -
@@ -1,5 +1,5 @@
-MD5 (Mako-0.5.0.tar.gz) = Uy16p/+/0oc8FGGjBDE2ag==
-RMD160 (Mako-0.5.0.tar.gz) = z2OES75ksCXD8ml1+tFzS9phVfs=
-SHA1 (Mako-0.5.0.tar.gz) = S7hbWMz5R85oQYpEajinU+kM6SM=
-SHA256 (Mako-0.5.0.tar.gz) = xR+qpA96A6Gca92b0fqUlfbdQBQSlOCC1CZ/zLVOoa0=
-SIZE (Mako-0.5.0.tar.gz) = 318696
+MD5 (Mako-0.6.2.tar.gz) = V+03IAeJi1QUIVVoGjjY0A==
+RMD160 (Mako-0.6.2.tar.gz) = 6uUo8J2Rclj80NMu9GdNug40jtI=
+SHA1 (Mako-0.6.2.tar.gz) = zZFb8b8rbG9JtDAwMAFru65p5mw=
+SHA256 (Mako-0.6.2.tar.gz) = 9H25nLexpD563ZTf+UTZ0yKYI+6pHplWwzXuk98Ss/M=
+SIZE (Mako-0.6.2.tar.gz) = 384871
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-mako/pkg/PLIST,v
retrieving revision 1.3
diff -u -u -r1.3 PLIST
--- pkg/PLIST 27 May 2011 16:10:00 - 1.3
+++ pkg/PLIST 12 Mar 2012 20:13:31 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2011/05/27 16:10:00 fgsch Exp $
-bin/mako-render
+bin/mako-render${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/Mako-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Mako-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Mako-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -28,6 +28,8 @@
lib/python${MODPY_VERSION}/site-packages/mako/ext/autohandler.pyc
lib/python${MODPY_VERSION}/site-packages/mako/ext/babelplugin.py
lib/python${MODPY_VERSION}/site-packages/mako/ext/babelplugin.pyc
+lib/python${MODPY_VERSION}/site-packages/mako/ext/beaker_cache.py
+lib/python${MODPY_VERSION}/site-packages/mako/ext/beaker_cache.pyc
lib/python${MODPY_VERSION}/site-packages/mako/ext/preprocessors.py
lib/python${MODPY_VERSION}/site-packages/mako/ext/preprocessors.pyc
lib/python${MODPY_VERSION}/site-packages/mako/ext/pygmentplugin.py
@@ -52,29 +54,39 @@
lib/python${MODPY_VERSION}/site-packages/mako/template.pyc
lib/python${MODPY_VERSION}/site-packages/mako/util.py
lib/python${MODPY_VERSION}/site-packages/mako/util.pyc
-share/doc/py-mako/
-share/doc/py-mako/_static/
-share/doc/py-mako/_static/basic.css
-share/doc/py-mako/_static/default.css
-share/doc/py-mako/_static/docs.css
-share/doc/py-mako/_static/doctools.js
-share/doc/py-mako/_static/file.png
-share/doc/py-mako/_static/jquery.js
-share/doc/py-mako/_static/minus.png
-share/doc/py-mako/_static/plus.png
-share/doc/py-mako/_static/pygments.css
-share/doc/py-mako/_static/searchtools.js
-share/doc/py-mako/_static/sidebar.js
-share/doc/py-mako/_static/underscore.js
-share/doc/py-mako/caching.html
-share/doc/py-mako/defs.html
-share/doc/py-mako/filtering.html
-share/doc/py-mako/genindex.html
-share/doc/py-mako/index.html
-share/doc/py-mako/inheritance.html
-share/doc/py-mako/namespaces.html
-share/doc/py-mako/runtime.html
-share/doc/py-mako/search.html
-share/doc/py-mako/syntax.html
-share/doc/py-mako/unicode.html
-share/doc/py-mako/usage.html
+share/doc/${MODPY_PY_PREFIX}mako/
+share/doc/${MODPY_PY_PREFIX}mako/_static/
+share/doc/${MODPY_PY_PREFIX}mako/_static/basic.css
+share/doc/${MODPY_PY_PREFIX}mako/_static/comment-bright.png
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2012/01/08 04:05:54 Modified files: news/hellanzb : Makefile news/hellanzb/patches: patch-Hellanzb_HellaReactor_py Log message: fix hellanzb after py-twisted update reported by Didier Wiroth
Re: hellanzb broken on current (amd64)
On Tue, Dec 27, 2011 at 04:53:55PM +0100, David Coppa wrote: It's a known bug caused by newer twisted: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573221 http://pastie.org/877271 http://pastie.org/877281 Cheers! David I'll post a fix asap. Eric.
Re: hellanzb broken on current (amd64)
On Tue, Dec 27, 2011 at 04:36:41PM +0100, Didier Wiroth wrote: hello, running latest current amd64 (build 23.12.2011). sorry I'm not programmer so I can't provide a patch but I thought I let you know that hellanzb is broken on current (at least on amd64): $ hellanzb.py Traceback (most recent call last): File /usr/local/bin/hellanzb.py, line 14, in module from Hellanzb.Core import main File /usr/local/lib/python2.7/site-packages/Hellanzb/Core.py, line 9, in module from Hellanzb.HellaReactor import HellaReactor File /usr/local/lib/python2.7/site-packages/Hellanzb/HellaReactor.py, line 14, in module from twisted.internet.selectreactor import _NO_FILENO ImportError: cannot import name _NO_FILENO kind regards, d. This should fix the issue. Could you please give it a try? Thanks. Eric. Index: Makefile === RCS file: /cvs/ports/news/hellanzb/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile16 Sep 2011 11:13:41 - 1.11 +++ Makefile27 Dec 2011 16:56:46 - @@ -3,7 +3,7 @@ COMMENT= retrieve and process nzb-files DISTNAME= hellanzb-0.13 -REVISION = 7 +REVISION = 8 CATEGORIES=news HOMEPAGE= http://www.hellanzb.com/trac/ Index: patches/patch-Hellanzb_HellaReactor_py === RCS file: /cvs/ports/news/hellanzb/patches/patch-Hellanzb_HellaReactor_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-Hellanzb_HellaReactor_py --- patches/patch-Hellanzb_HellaReactor_py 23 Aug 2010 07:02:06 - 1.1 +++ patches/patch-Hellanzb_HellaReactor_py 27 Dec 2011 16:56:46 - @@ -1,11 +1,15 @@ $OpenBSD: patch-Hellanzb_HellaReactor_py,v 1.1 2010/08/23 07:02:06 giovanni Exp $ Hellanzb/HellaReactor.py.orig Fri Aug 13 17:17:25 2010 -+++ Hellanzb/HellaReactor.py Fri Aug 13 17:17:38 2010 -@@ -9,7 +9,7 @@ reactor system so it can catch signals, and shutdown h +--- Hellanzb/HellaReactor.py.orig Tue Mar 27 06:20:43 2007 Hellanzb/HellaReactor.py Tue Dec 27 17:55:22 2011 +@@ -9,7 +9,11 @@ reactor system so it can catch signals, and shutdown h import Hellanzb, sys, time import twisted.copyright -if twisted.copyright.version = '2.0.0': ++if twisted.copyright.version = '11.1.0': ++from twisted.internet.selectreactor import SelectReactor ++from twisted.internet.posixbase import _NO_FILENO ++from twisted.internet.posixbase import _NO_FILEDESC +if twisted.copyright.version = '2.0.0' or twisted.copyright.version = '10.0.0': from twisted.internet.selectreactor import SelectReactor from twisted.internet.selectreactor import _NO_FILENO
Re: hellanzb broken on current (amd64)
On Tue, Dec 27, 2011 at 07:40:20PM +0100, Didier Wiroth wrote: Hello, Thank you all for helping! No, unfortunately it didn't help, it still crashes. I applied the patch and recompile the hellanzb port, but it still crashes. Oops. This should be better. Eric. Index: Makefile === RCS file: /cvs/ports/news/hellanzb/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile16 Sep 2011 11:13:41 - 1.11 +++ Makefile27 Dec 2011 19:54:12 - @@ -3,7 +3,7 @@ COMMENT= retrieve and process nzb-files DISTNAME= hellanzb-0.13 -REVISION = 7 +REVISION = 8 CATEGORIES=news HOMEPAGE= http://www.hellanzb.com/trac/ Index: patches/patch-Hellanzb_HellaReactor_py === RCS file: /cvs/ports/news/hellanzb/patches/patch-Hellanzb_HellaReactor_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-Hellanzb_HellaReactor_py --- patches/patch-Hellanzb_HellaReactor_py 23 Aug 2010 07:02:06 - 1.1 +++ patches/patch-Hellanzb_HellaReactor_py 27 Dec 2011 19:54:12 - @@ -1,12 +1,16 @@ $OpenBSD: patch-Hellanzb_HellaReactor_py,v 1.1 2010/08/23 07:02:06 giovanni Exp $ Hellanzb/HellaReactor.py.orig Fri Aug 13 17:17:25 2010 -+++ Hellanzb/HellaReactor.py Fri Aug 13 17:17:38 2010 -@@ -9,7 +9,7 @@ reactor system so it can catch signals, and shutdown h +--- Hellanzb/HellaReactor.py.orig Tue Mar 27 06:20:43 2007 Hellanzb/HellaReactor.py Tue Dec 27 20:53:16 2011 +@@ -9,7 +9,11 @@ reactor system so it can catch signals, and shutdown h import Hellanzb, sys, time import twisted.copyright -if twisted.copyright.version = '2.0.0': -+if twisted.copyright.version = '2.0.0' or twisted.copyright.version = '10.0.0': ++if twisted.copyright.version = '11.1.0': ++from twisted.internet.selectreactor import SelectReactor ++from twisted.internet.posixbase import _NO_FILENO ++from twisted.internet.posixbase import _NO_FILEDESC ++elif twisted.copyright.version = '2.0.0' or twisted.copyright.version = '10.0.0': from twisted.internet.selectreactor import SelectReactor from twisted.internet.selectreactor import _NO_FILENO from twisted.internet.selectreactor import _NO_FILEDESC
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/12/23 10:12:04 Modified files: devel/bzr : Makefile distinfo devel/bzr/patches: patch-bzr patch-bzrlib_diff_py patch-bzrlib_tests_test_diff_py devel/bzr/pkg : PLIST Removed files: devel/bzr/patches: patch-bzrlib_transport_http__urllib2_wrappers_py patch-setup_py Log message: update to bzr 2.4.2 ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/12/23 10:12:40 Modified files: devel/bzr-svn : Makefile distinfo devel/bzr-svn/pkg: PLIST Log message: update to bzr-svn 1.1.2 ok ajacoutot@
UPDATE: devel/bzr
update to bzr 2.4.2
Index: Makefile
===
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile3 Nov 2011 22:13:23 - 1.19
+++ Makefile22 Dec 2011 16:19:19 -
@@ -2,9 +2,8 @@
COMMENT = distributed version control system by Canonical
-MODPY_EGG_VERSION = 2.2.2
+MODPY_EGG_VERSION = 2.4.2
DISTNAME = bzr-${MODPY_EGG_VERSION}
-REVISION = 3
CATEGORIES = devel
HOMEPAGE = http://bazaar-vcs.org/
Index: distinfo
===
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo10 Jan 2011 20:18:09 - 1.7
+++ distinfo22 Dec 2011 16:19:19 -
@@ -1,5 +1,5 @@
-MD5 (bzr-2.2.2.tar.gz) = 0b+i/RqtKCxCPHjWLrrLIQ==
-RMD160 (bzr-2.2.2.tar.gz) = iI4PWciOD94mrfaXqUIu1zLMMyk=
-SHA1 (bzr-2.2.2.tar.gz) = nbjwYdlLo/C0jc1iPEc8botXC2o=
-SHA256 (bzr-2.2.2.tar.gz) = c07gw6ZOe4INZjKuDipL+RrdkI/evlyChlYYw4F1yOM=
-SIZE (bzr-2.2.2.tar.gz) = 6897175
+MD5 (bzr-2.4.2.tar.gz) = z8Bv3dNIRFxlokfAszoF2w==
+RMD160 (bzr-2.4.2.tar.gz) = R+z9FlHRCu6ijA3/MSTGN9u7k6s=
+SHA1 (bzr-2.4.2.tar.gz) = NmO4YtyPuXKfmq4kJ8urKvnJAa0=
+SHA256 (bzr-2.4.2.tar.gz) = pbjbd8YeVEUGgL79u0eV+Kly+loWcSN4Y2DYmLdSZW8=
+SIZE (bzr-2.4.2.tar.gz) = 7528721
Index: patches/patch-bzr
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.4
diff -u -r1.4 patch-bzr
--- patches/patch-bzr 10 Jan 2011 20:18:09 - 1.4
+++ patches/patch-bzr 22 Dec 2011 16:19:19 -
@@ -1,9 +1,9 @@
$OpenBSD: patch-bzr,v 1.4 2011/01/10 20:18:09 eric Exp $
bzr.orig Mon Dec 6 17:49:57 2010
-+++ bzrMon Dec 6 17:50:14 2010
+--- bzr.orig Thu Oct 27 15:21:20 2011
bzrThu Dec 22 17:15:46 2011
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! ${MODPY_BIN}
- # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+ # Copyright (C) 2005-2011 Canonical Ltd
#
Index: patches/patch-bzrlib_diff_py
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.4
diff -u -r1.4 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py10 Jan 2011 20:18:09 - 1.4
+++ patches/patch-bzrlib_diff_py22 Dec 2011 16:19:19 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-bzrlib_diff_py,v 1.4 2011/01/10 20:18:09 eric Exp $
bzrlib/diff.py.origMon Dec 6 17:51:40 2010
-+++ bzrlib/diff.py Mon Dec 6 17:51:33 2010
-@@ -189,7 +189,7 @@ def external_diff(old_filename, oldlines, new_filename
+--- bzrlib/diff.py.origThu Oct 27 15:21:20 2011
bzrlib/diff.py Thu Dec 22 17:15:46 2011
+@@ -187,7 +187,7 @@ def external_diff(old_filename, oldlines, new_filename
# Since we are dealing with an ANSI api, use mbcs encoding
old_filename = old_filename.encode('mbcs')
new_filename = new_filename.encode('mbcs')
Index: patches/patch-bzrlib_tests_test_diff_py
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_tests_test_diff_py,v
retrieving revision 1.3
diff -u -r1.3 patch-bzrlib_tests_test_diff_py
--- patches/patch-bzrlib_tests_test_diff_py 10 Jan 2011 20:18:09 -
1.3
+++ patches/patch-bzrlib_tests_test_diff_py 22 Dec 2011 16:19:19 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-bzrlib_tests_test_diff_py,v 1.3 2011/01/10 20:18:09 eric Exp $
bzrlib/tests/test_diff.py.orig Mon Dec 6 17:54:43 2010
-+++ bzrlib/tests/test_diff.py Mon Dec 6 17:54:32 2010
-@@ -246,7 +246,7 @@ class TestDiffFiles(tests.TestCaseInTempDir):
+--- bzrlib/tests/test_diff.py.orig Thu Oct 27 15:21:20 2011
bzrlib/tests/test_diff.py Thu Dec 22 17:15:46 2011
+@@ -237,7 +237,7 @@ class TestDiffFiles(tests.TestCaseInTempDir):
# Make sure external_diff doesn't fail in the current LANG
lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
@@ -10,7 +10,7 @@
open('old', 'wb').write('\x00foobar\n')
open('new', 'wb').write('foo\x00bar\n')
pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-@@ -1352,7 +1352,7 @@ class TestDiffFromTool(tests.TestCaseWithTransport):
+@@ -1339,7 +1339,7 @@ class TestDiffFromTool(tests.TestCaseWithTransport):
def test_execute(self):
output = StringIO()
Index: patches/patch-bzrlib_transport_http__urllib2_wrappers_py
===
RCS file: patches/patch-bzrlib_transport_http__urllib2_wrappers_py
diff -N patches/patch-bzrlib_transport_http__urllib2_wrappers_py
--- patches/patch-bzrlib_transport_http__urllib2_wrappers_py3 Aug 2011
13:20:50 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,43 +0,0 @@
-$OpenBSD:
UPDATE: devel/bzr-svn
Update to bzr-svn 1.1.2
Index: Makefile
===
RCS file: /cvs/ports/devel/bzr-svn/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile16 Sep 2011 09:24:49 - 1.3
+++ Makefile22 Dec 2011 16:41:42 -
@@ -2,9 +2,8 @@
COMMENT= bzr plugin that adds support for foreign svn repositories
-MODPY_EGG_VERSION= 1.0.4
+MODPY_EGG_VERSION= 1.1.2
DISTNAME= bzr-svn-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES=devel
HOMEPAGE= http://launchpad.net/bzr-svn
Index: distinfo
===
RCS file: /cvs/ports/devel/bzr-svn/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo10 Jan 2011 20:27:52 - 1.1.1.1
+++ distinfo22 Dec 2011 16:41:42 -
@@ -1,5 +1,5 @@
-MD5 (bzr-svn-1.0.4.tar.gz) = reUVcFP7FF9dLtQXHmuUyg==
-RMD160 (bzr-svn-1.0.4.tar.gz) = 0WBLpeHAGNPSz0r9+/AXEu0jepc=
-SHA1 (bzr-svn-1.0.4.tar.gz) = UVlSohSOlXLnjF0iTYQDcwAh1pE=
-SHA256 (bzr-svn-1.0.4.tar.gz) = y+D0FP6ZSXkf1NkCGR2A/mwgof7zOH0sieFsUzZm7/A=
-SIZE (bzr-svn-1.0.4.tar.gz) = 263012
+MD5 (bzr-svn-1.1.2.tar.gz) = SJ7Ql2SAsSZl6MEgCHXD6A==
+RMD160 (bzr-svn-1.1.2.tar.gz) = ccX3c7RvOatWeKM9sqYrQB3fhMs=
+SHA1 (bzr-svn-1.1.2.tar.gz) = T/ICpw1xWF6ykCiAkT80WnS2PUs=
+SHA256 (bzr-svn-1.1.2.tar.gz) = lz4Te7wh0WbvGBLiHJuWU2t2gKpLOasXenDsbMADz/o=
+SIZE (bzr-svn-1.1.2.tar.gz) = 295828
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/bzr-svn/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 10 Jan 2011 20:27:52 - 1.1.1.1
+++ pkg/PLIST 22 Dec 2011 16:41:42 -
@@ -32,10 +32,12 @@
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/errors.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/fetch.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/fetch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/filegraph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/filegraph.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/fileids.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/fileids.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/format.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/format.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/graph.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/info.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/info.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/keywords.py
@@ -43,8 +45,6 @@
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/__init__.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/custom.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/custom.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/guess.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/guess.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/layout/standard.py
@@ -66,12 +66,12 @@
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/mapping3/scheme.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/mapping4.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/mapping4.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/metagraph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/metagraph.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/parents.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/parents.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/push.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/push.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/pycompat.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/pycompat.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/reconcile.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/reconcile.pyc
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/remote.py
@@ -95,6 +95,13 @@
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/tests/
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/tests/__init__.py
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/tests/layout/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/tests/layout/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/svn/tests/layout/__init__.pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/12/08 13:15:40 Modified files: devel/py-twisted/conch: Makefile distinfo devel/py-twisted/conch/pkg: PLIST devel/py-twisted/core: Makefile distinfo devel/py-twisted/core/patches: patch-twisted_internet_process_py patch-twisted_python_test_test_release_py devel/py-twisted/core/pkg: PLIST devel/py-twisted/lore: Makefile distinfo devel/py-twisted/lore/pkg: PLIST devel/py-twisted/mail: Makefile distinfo devel/py-twisted/mail/pkg: PLIST devel/py-twisted/names: Makefile distinfo devel/py-twisted/names/pkg: PLIST devel/py-twisted/news: Makefile distinfo devel/py-twisted/pair: Makefile distinfo devel/py-twisted/runner: Makefile distinfo devel/py-twisted/runner/pkg: PLIST devel/py-twisted/web: Makefile distinfo devel/py-twisted/words: Makefile distinfo devel/py-twisted/words/pkg: PLIST Removed files: devel/py-twisted/core/patches: patch-twisted_internet_test_test_process_py patch-twisted_trial_test_test_util_py Log message: update to twisted 11.1.0 no problem ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/11/25 13:19:30 Modified files: security/py-openssl: Makefile distinfo security/py-openssl/pkg: PLIST Added files: security/py-openssl/patches: patch-OpenSSL_test_test_ssl_py Removed files: security/py-openssl/patches: patch-test_test_ssl_py Log message: upgrade to 0.13 prodded by and ok rpointel@
[UPDATE] devel/py-twisted
This is an update to Twisted 11.1.0
Eric.
Index: conch/Makefile
===
RCS file: /cvs/ports/devel/py-twisted/conch/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- conch/Makefile 16 Sep 2011 09:24:56 - 1.16
+++ conch/Makefile 24 Nov 2011 11:49:48 -
@@ -4,10 +4,9 @@
CATEGORIES=net
-VERSION= 11.0.0
+VERSION= 11.1.0
DISTNAME= TwistedConch-${VERSION}
PKGNAME= py-twisted-conch-${VERSION}
-REVISION= 0
HOMEPAGE= http://twistedmatrix.com/trac/wiki/TwistedConch
Index: conch/distinfo
===
RCS file: /cvs/ports/devel/py-twisted/conch/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- conch/distinfo 20 Jun 2011 10:25:32 - 1.8
+++ conch/distinfo 24 Nov 2011 11:49:48 -
@@ -1,5 +1,5 @@
-MD5 (TwistedConch-11.0.0.tar.bz2) = OC170kYJ8VKlit+3JEsW5A==
-RMD160 (TwistedConch-11.0.0.tar.bz2) = QHLaZiR9biv74oUoBPl/bwdj+T0=
-SHA1 (TwistedConch-11.0.0.tar.bz2) = WoJMk5azftoOvAIJm5xbail96LE=
-SHA256 (TwistedConch-11.0.0.tar.bz2) =
o70AmSi4OIkosk+7sp4drm6gkvOjeAAfQmxvYwLyVQQ=
-SIZE (TwistedConch-11.0.0.tar.bz2) = 209673
+MD5 (TwistedConch-11.1.0.tar.bz2) = TfJY0WvfgzmTTE/l4sTjcQ==
+RMD160 (TwistedConch-11.1.0.tar.bz2) = f894M7uerwQqW1mZm9oL1olFf5s=
+SHA1 (TwistedConch-11.1.0.tar.bz2) = RRO/AdES50C6CRxEx805idodyEU=
+SHA256 (TwistedConch-11.1.0.tar.bz2) =
+gFEfUJcetl4WfWCR3WoQfJ55LKx+vbaptW28ONdobU=
+SIZE (TwistedConch-11.1.0.tar.bz2) = 211556
Index: conch/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-twisted/conch/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- conch/pkg/PLIST 20 Jun 2011 10:25:32 - 1.7
+++ conch/pkg/PLIST 24 Nov 2011 11:49:48 -
@@ -152,6 +152,8 @@
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_openssh_compat.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_recvline.py
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_recvline.pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_scripts.py
+lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_scripts.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_session.py
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_session.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/test_ssh.py
Index: core/Makefile
===
RCS file: /cvs/ports/devel/py-twisted/core/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- core/Makefile 16 Sep 2011 09:24:56 - 1.21
+++ core/Makefile 24 Nov 2011 11:49:48 -
@@ -2,10 +2,9 @@
COMMENT= event-based Python framework (core module)
-VERSION= 11.0.0
+VERSION= 11.1.0
DISTNAME= TwistedCore-${VERSION}
PKGNAME= py-twisted-core-${VERSION}
-REVISION= 0
HOMEPAGE= http://twistedmatrix.com/trac/wiki/TwistedCore
@@ -35,7 +34,8 @@
twisted.internet.test \
twisted.protocols.test \
twisted.python.test \
- twisted.scripts.test\
+ twisted.persisted.test \
+ twisted.manhole.test\
twisted.test\
twisted.trial.test
Index: core/distinfo
===
RCS file: /cvs/ports/devel/py-twisted/core/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- core/distinfo 20 Jun 2011 10:25:32 - 1.8
+++ core/distinfo 24 Nov 2011 11:49:48 -
@@ -1,5 +1,5 @@
-MD5 (TwistedCore-11.0.0.tar.bz2) = yw8cWBWNowVu19hCSDAoCQ==
-RMD160 (TwistedCore-11.0.0.tar.bz2) = psT81wRyJmz9odiUeMAqr67DjsQ=
-SHA1 (TwistedCore-11.0.0.tar.bz2) = FMFeTqx4d0SQfCwxkq9xDU/+ik4=
-SHA256 (TwistedCore-11.0.0.tar.bz2) =
Ruo9k5DslKMjRYlUT8FUxI+1cUEhNipYLbYs2HMTPy8=
-SIZE (TwistedCore-11.0.0.tar.bz2) = 1396224
+MD5 (TwistedCore-11.1.0.tar.bz2) = mHDVTcnxfUUYxSSIkc0Ihw==
+RMD160 (TwistedCore-11.1.0.tar.bz2) = COBW+Gp7kiXENhL8yC4yDEROf/w=
+SHA1 (TwistedCore-11.1.0.tar.bz2) = 22Lj3x+HCBJ95Ne6XyyBaLJKI4g=
+SHA256 (TwistedCore-11.1.0.tar.bz2) =
AEG1w4zXxABD9kxKrrX8xGMcIpd2yJbPoYj9K1Z/120=
+SIZE (TwistedCore-11.1.0.tar.bz2) = 1455613
Index: core/patches/patch-twisted_internet_process_py
===
RCS file:
/cvs/ports/devel/py-twisted/core/patches/patch-twisted_internet_process_py,v
retrieving revision 1.1
diff -u -r1.1 patch-twisted_internet_process_py
--- core/patches/patch-twisted_internet_process_py 20 Jun 2011 10:25:32
- 1.1
+++ core/patches/patch-twisted_internet_process_py 24 Nov 2011 11:49:48
-
@@ -1,73 +1,29 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/11/14 09:20:43 Modified files: databases/py-storm: Makefile distinfo databases/py-storm/pkg: PLIST Log message: update to storm-0.19 increase verbosity in regress ok ajacoutot@
[UPDATE] databases/py-storm
update py-storm to 0.19
increase verbosity in regress
ok?
Eric.
Index: Makefile
===
RCS file: /cvs/ports/databases/py-storm/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile4 Nov 2011 08:16:24 - 1.15
+++ Makefile14 Nov 2011 15:38:10 -
@@ -2,9 +2,8 @@
COMMENT= generic object relational mapper for Python
-MODPY_EGG_VERSION= 0.18
+MODPY_EGG_VERSION= 0.19
DISTNAME= storm-${MODPY_EGG_VERSION}
-REVISION = 2
PKGNAME= py-${DISTNAME}
CATEGORIES=databases
@@ -19,7 +18,7 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://launchpad.net/storm/trunk/0.18/+download/
+MASTER_SITES= http://launchpad.net/storm/trunk/0.19/+download/
EXTRACT_SUFX= .tar.bz2
WANTLIB= ${MODPY_WANTLIB}
@@ -30,6 +29,6 @@
REGRESS_DEPENDS= databases/py-sqlite2
do-regress:
- @cd ${WRKSRC} ${MODPY_BIN} ./test
+ @cd ${WRKSRC} ${MODPY_BIN} ./test --verbose
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/databases/py-storm/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo10 Nov 2010 13:24:41 - 1.7
+++ distinfo14 Nov 2011 15:38:10 -
@@ -1,5 +1,5 @@
-MD5 (storm-0.18.tar.bz2) = +/zUExvDK+4iGdSCh+DLXw==
-RMD160 (storm-0.18.tar.bz2) = 5meqR0poWCtxBkIE/Ku31ErfBZw=
-SHA1 (storm-0.18.tar.bz2) = QlsAx1T1yahdOFocPmI4jGYLdvM=
-SHA256 (storm-0.18.tar.bz2) = 58Cqq+Y++xEHCB4BqPz11RhA/3JhAd+cuwjG6I0d7gY=
-SIZE (storm-0.18.tar.bz2) = 186569
+MD5 (storm-0.19.tar.bz2) = VzX6/jGsifn7IDqSv8HU+A==
+RMD160 (storm-0.19.tar.bz2) = pGEGLrxZjOu0t1DSnO9tJMmu6Yc=
+SHA1 (storm-0.19.tar.bz2) = 1UR3qocQkfukn9lgzYdCEE80wTU=
+SHA256 (storm-0.19.tar.bz2) = TPuiMlbRQ+I/dkbTDKg9nlbyKANmNIJLEoVKff2M5Ck=
+SIZE (storm-0.19.tar.bz2) = 198190
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-storm/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST 10 Nov 2010 13:24:41 - 1.8
+++ pkg/PLIST 14 Nov 2011 15:38:10 -
@@ -14,6 +14,8 @@
lib/python${MODPY_VERSION}/site-packages/storm/cache.pyc
lib/python${MODPY_VERSION}/site-packages/storm/cextensions.c
lib/python${MODPY_VERSION}/site-packages/storm/cextensions.so
+lib/python${MODPY_VERSION}/site-packages/storm/compat.py
+lib/python${MODPY_VERSION}/site-packages/storm/compat.pyc
lib/python${MODPY_VERSION}/site-packages/storm/database.py
lib/python${MODPY_VERSION}/site-packages/storm/database.pyc
lib/python${MODPY_VERSION}/site-packages/storm/databases/
@@ -64,12 +66,21 @@
lib/python${MODPY_VERSION}/site-packages/storm/store.pyc
lib/python${MODPY_VERSION}/site-packages/storm/tracer.py
lib/python${MODPY_VERSION}/site-packages/storm/tracer.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/twisted/
+lib/python${MODPY_VERSION}/site-packages/storm/twisted/__init__.py
+lib/python${MODPY_VERSION}/site-packages/storm/twisted/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/twisted/testing.py
+lib/python${MODPY_VERSION}/site-packages/storm/twisted/testing.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/twisted/transact.py
+lib/python${MODPY_VERSION}/site-packages/storm/twisted/transact.pyc
lib/python${MODPY_VERSION}/site-packages/storm/tz.py
lib/python${MODPY_VERSION}/site-packages/storm/tz.pyc
lib/python${MODPY_VERSION}/site-packages/storm/uri.py
lib/python${MODPY_VERSION}/site-packages/storm/uri.pyc
lib/python${MODPY_VERSION}/site-packages/storm/variables.py
lib/python${MODPY_VERSION}/site-packages/storm/variables.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/wsgi.py
+lib/python${MODPY_VERSION}/site-packages/storm/wsgi.pyc
lib/python${MODPY_VERSION}/site-packages/storm/zope/
lib/python${MODPY_VERSION}/site-packages/storm/zope/__init__.py
lib/python${MODPY_VERSION}/site-packages/storm/zope/__init__.pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/06/20 04:25:33 Modified files: devel/py-twisted: Makefile.inc devel/py-twisted/conch: Makefile distinfo devel/py-twisted/conch/pkg: PLIST devel/py-twisted/core: Makefile distinfo devel/py-twisted/core/pkg: PLIST devel/py-twisted/lore: Makefile distinfo devel/py-twisted/mail: Makefile distinfo devel/py-twisted/names: Makefile distinfo devel/py-twisted/news: Makefile distinfo devel/py-twisted/news/pkg: PLIST devel/py-twisted/pair: Makefile distinfo devel/py-twisted/runner: Makefile distinfo devel/py-twisted/runner/pkg: PLIST devel/py-twisted/web: Makefile distinfo devel/py-twisted/web/pkg: PLIST devel/py-twisted/web2: Makefile devel/py-twisted/words: Makefile distinfo devel/py-twisted/words/pkg: PLIST Added files: devel/py-twisted/core/patches: patch-twisted_internet_process_py patch-twisted_internet_test_test_process_py patch-twisted_python_test_test_release_py patch-twisted_trial_test_test_loader_py patch-twisted_trial_test_test_util_py Removed files: devel/py-twisted/core/patches: patch-twisted_internet_test_test_fdset_py Log message: update to twisted 11.0.0 ok landry@
Re: UPDATE: devel/py-twisted
On Wed, Jun 15, 2011 at 09:54:34PM +0200, Landry Breuil wrote:
On Tue, Jun 14, 2011 at 02:11:44PM +0200, Eric Faurot wrote:
Hi,
This patch updates Twisted to 11.0.0.
There are still some known issues in the regression suite. I am working
on that with upstream.
Please test if you use apps depending on Twisted.
Distfiles are not on MASTER_SITES.. http://twistedmatrix.com/Releases/
has them.
oh, right. here is a new diff
Eric.
Index: Makefile.inc
===
RCS file: /cvs/ports/devel/py-twisted/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- Makefile.inc15 Nov 2010 19:46:08 - 1.6
+++ Makefile.inc16 Jun 2011 07:21:26 -
@@ -24,7 +24,17 @@
BUILD_DEPENDS= ${RUN_DEPENDS}
REGRESS_DEPENDS+=${RUN_DEPENDS}
+TRIAL_PYTHONPATH= ${WRKBUILD}/trial-packages
+TRIAL_ENV?=TRIAL_PYTHONPATH=${TRIAL_PYTHONPATH}
PYTHONPATH=${TRIAL_PYTHONPATH}
+
do-regress:
ulimit -n 512 -p 512 \
- ${LOCALBASE}/bin/trial --temp-directory=${WRKBUILD}/trial.wrkdir \
+ mkdir ${TRIAL_PYTHONPATH} \
+ ${TRIAL_ENV} ${LOCALBASE}/bin/trial \
+ --temp-directory=${WRKBUILD}/trial.wrkdir \
${TRIAL_TARGET}
+
+clean-regress:
+ rm -rf ${TRIAL_PYTHONPATH}
+ rm -rf ${WRKBUILD}/trial.wrkdir
+ rm -f ${WRKDIR}/.regress_done
Index: conch/Makefile
===
RCS file: /cvs/ports/devel/py-twisted/conch/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- conch/Makefile 8 Jun 2011 17:39:26 - 1.14
+++ conch/Makefile 16 Jun 2011 07:21:26 -
@@ -4,14 +4,13 @@
CATEGORIES=net
-VERSION= 10.0.0
+VERSION= 11.0.0
DISTNAME= TwistedConch-${VERSION}
PKGNAME= py-twisted-conch-${VERSION}
-REVISION = 1
HOMEPAGE= http://twistedmatrix.com/trac/wiki/TwistedConch
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Conch/${VERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Conch/${VERSION:R}/
REGRESS_DEPENDS=devel/py-twisted/conch
RUN_DEPENDS= security/py-crypto
Index: conch/distinfo
===
RCS file: /cvs/ports/devel/py-twisted/conch/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- conch/distinfo 5 Jul 2010 13:37:02 - 1.7
+++ conch/distinfo 16 Jun 2011 07:21:26 -
@@ -1,5 +1,5 @@
-MD5 (TwistedConch-10.0.0.tar.bz2) = GlX3iU4QnErwHbFKIuA4HQ==
-RMD160 (TwistedConch-10.0.0.tar.bz2) = PQWoWIffFB48jXydPgGl/mNmfQg=
-SHA1 (TwistedConch-10.0.0.tar.bz2) = PbuhBrklFVMNQAtY7IdJlieAWzc=
-SHA256 (TwistedConch-10.0.0.tar.bz2) =
88iV5bgsvBLd9WV1EuNGa1P6ZIbhwOrD8KHnwpu0bOE=
-SIZE (TwistedConch-10.0.0.tar.bz2) = 206855
+MD5 (TwistedConch-11.0.0.tar.bz2) = OC170kYJ8VKlit+3JEsW5A==
+RMD160 (TwistedConch-11.0.0.tar.bz2) = QHLaZiR9biv74oUoBPl/bwdj+T0=
+SHA1 (TwistedConch-11.0.0.tar.bz2) = WoJMk5azftoOvAIJm5xbail96LE=
+SHA256 (TwistedConch-11.0.0.tar.bz2) =
o70AmSi4OIkosk+7sp4drm6gkvOjeAAfQmxvYwLyVQQ=
+SIZE (TwistedConch-11.0.0.tar.bz2) = 209673
Index: conch/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-twisted/conch/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- conch/pkg/PLIST 5 Jul 2010 13:37:02 - 1.6
+++ conch/pkg/PLIST 16 Jun 2011 07:21:26 -
@@ -83,8 +83,6 @@
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/agent.py
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/agent.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/asn1.py
-lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/asn1.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/channel.py
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/channel.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/common.py
Index: core/Makefile
===
RCS file: /cvs/ports/devel/py-twisted/core/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- core/Makefile 8 Jun 2011 17:39:26 - 1.19
+++ core/Makefile 16 Jun 2011 07:21:26 -
@@ -2,14 +2,13 @@
COMMENT= event-based Python framework (core module)
-VERSION= 10.0.0
+VERSION= 11.0.0
DISTNAME= TwistedCore-${VERSION}
PKGNAME= py-twisted-core-${VERSION}
-REVISION = 2
HOMEPAGE= http://twistedmatrix.com/trac/wiki/TwistedCore
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Core/${VERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Core/${VERSION:R}/
RUN_DEPENDS= devel/py-zopeinterface \
security/py-openssl
@@ -31,7 +30,12 @@
cd ${PREFIX} find . -name *.orig -exec rm {} \;
-TRIAL_TARGET=twisted.test twisted.trial.test
UPDATE: devel/py-twisted
Hi,
This patch updates Twisted to 11.0.0.
There are still some known issues in the regression suite. I am working
on that with upstream.
Please test if you use apps depending on Twisted.
Eric.
Index: Makefile.inc
===
RCS file: /cvs/ports/devel/py-twisted/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- Makefile.inc15 Nov 2010 19:46:08 - 1.6
+++ Makefile.inc14 Jun 2011 12:02:54 -
@@ -24,7 +24,17 @@
BUILD_DEPENDS= ${RUN_DEPENDS}
REGRESS_DEPENDS+=${RUN_DEPENDS}
+TRIAL_PYTHONPATH= ${WRKBUILD}/trial-packages
+TRIAL_ENV?=TRIAL_PYTHONPATH=${TRIAL_PYTHONPATH}
PYTHONPATH=${TRIAL_PYTHONPATH}
+
do-regress:
ulimit -n 512 -p 512 \
- ${LOCALBASE}/bin/trial --temp-directory=${WRKBUILD}/trial.wrkdir \
+ mkdir ${TRIAL_PYTHONPATH} \
+ ${TRIAL_ENV} ${LOCALBASE}/bin/trial \
+ --temp-directory=${WRKBUILD}/trial.wrkdir \
${TRIAL_TARGET}
+
+clean-regress:
+ rm -rf ${TRIAL_PYTHONPATH}
+ rm -rf ${WRKBUILD}/trial.wrkdir
+ rm -f ${WRKDIR}/.regress_done
Index: conch/Makefile
===
RCS file: /cvs/ports/devel/py-twisted/conch/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- conch/Makefile 8 Jun 2011 17:39:26 - 1.14
+++ conch/Makefile 14 Jun 2011 12:02:54 -
@@ -4,10 +4,9 @@
CATEGORIES=net
-VERSION= 10.0.0
+VERSION= 11.0.0
DISTNAME= TwistedConch-${VERSION}
PKGNAME= py-twisted-conch-${VERSION}
-REVISION = 1
HOMEPAGE= http://twistedmatrix.com/trac/wiki/TwistedConch
Index: conch/distinfo
===
RCS file: /cvs/ports/devel/py-twisted/conch/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- conch/distinfo 5 Jul 2010 13:37:02 - 1.7
+++ conch/distinfo 14 Jun 2011 12:02:54 -
@@ -1,5 +1,5 @@
-MD5 (TwistedConch-10.0.0.tar.bz2) = GlX3iU4QnErwHbFKIuA4HQ==
-RMD160 (TwistedConch-10.0.0.tar.bz2) = PQWoWIffFB48jXydPgGl/mNmfQg=
-SHA1 (TwistedConch-10.0.0.tar.bz2) = PbuhBrklFVMNQAtY7IdJlieAWzc=
-SHA256 (TwistedConch-10.0.0.tar.bz2) =
88iV5bgsvBLd9WV1EuNGa1P6ZIbhwOrD8KHnwpu0bOE=
-SIZE (TwistedConch-10.0.0.tar.bz2) = 206855
+MD5 (TwistedConch-11.0.0.tar.bz2) = OC170kYJ8VKlit+3JEsW5A==
+RMD160 (TwistedConch-11.0.0.tar.bz2) = QHLaZiR9biv74oUoBPl/bwdj+T0=
+SHA1 (TwistedConch-11.0.0.tar.bz2) = WoJMk5azftoOvAIJm5xbail96LE=
+SHA256 (TwistedConch-11.0.0.tar.bz2) =
o70AmSi4OIkosk+7sp4drm6gkvOjeAAfQmxvYwLyVQQ=
+SIZE (TwistedConch-11.0.0.tar.bz2) = 209673
Index: conch/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-twisted/conch/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- conch/pkg/PLIST 5 Jul 2010 13:37:02 - 1.6
+++ conch/pkg/PLIST 14 Jun 2011 12:02:54 -
@@ -83,8 +83,6 @@
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/agent.py
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/agent.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/asn1.py
-lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/asn1.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/channel.py
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/channel.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/common.py
Index: core/Makefile
===
RCS file: /cvs/ports/devel/py-twisted/core/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- core/Makefile 8 Jun 2011 17:39:26 - 1.19
+++ core/Makefile 14 Jun 2011 12:02:54 -
@@ -2,10 +2,9 @@
COMMENT= event-based Python framework (core module)
-VERSION= 10.0.0
+VERSION= 11.0.0
DISTNAME= TwistedCore-${VERSION}
PKGNAME= py-twisted-core-${VERSION}
-REVISION = 2
HOMEPAGE= http://twistedmatrix.com/trac/wiki/TwistedCore
@@ -31,7 +30,12 @@
cd ${PREFIX} find . -name *.orig -exec rm {} \;
-TRIAL_TARGET=twisted.test twisted.trial.test twisted.python.test \
- twisted.internet.test twisted.protocols
+TRIAL_TARGET?= twisted.application.test\
+ twisted.internet.test \
+ twisted.protocols.test \
+ twisted.python.test \
+ twisted.scripts.test\
+ twisted.test\
+ twisted.trial.test
.include bsd.port.mk
Index: core/distinfo
===
RCS file: /cvs/ports/devel/py-twisted/core/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- core/distinfo 5 Jul 2010 13:37:02 - 1.7
+++ core/distinfo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/05/27 04:06:12 Modified files: math/py-numpy : Makefile distinfo math/py-numpy/patches: patch-numpy_core_include_numpy_npy_common_h powerpc-patch-numpy_distutils_fcompiler_gnu_py math/py-numpy/pkg: PLIST Added files: math/py-numpy/patches: patch-numpy_distutils_command_build_src_py Removed files: math/py-numpy/patches: patch-numpy_core_include_numpy_npy_cpu_h patch-numpy_core_include_numpy_npy_endian_h patch-numpy_distutils_ccompiler_py Log message: - update to 1.6.0 - tweak distutils to fix py-scipy build noticed by landry@ ok djm@ (maintainer) rpointel@ landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/05/27 04:10:19 Modified files: math/py-scipy : Makefile distinfo math/py-scipy/pkg: PLIST Log message: update to 0.9.0 ok rpointel@ landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/05/11 10:13:08 Modified files: devel/py-subvertpy: Makefile distinfo Log message: update to 0.8.0 ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/04/26 02:51:45 Modified files: multimedia : Makefile Log message: build the no_x11 flavor too ok benoit@ jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/04/21 04:20:43 Modified files: devel/py-buildbot: Makefile distinfo devel/py-buildbot/pkg: PLIST Added files: devel/py-buildbot/patches: patch-buildbot_process_builder_py devel/py-buildbot/pkg: README buildbot.rc Log message: - update to 0.8.3p1 - add a new _buildbot user - add a rc script - add a README - update HOMEPAGE - change MAINTAINER (per his request) from Piotr Sikora (new MAINTAINER) ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/04/21 04:22:38 Modified files: devel/py-buildslave: Makefile distinfo devel/py-buildslave/pkg: PLIST Added files: devel/py-buildslave/pkg: README buildslave.rc Removed files: devel/py-buildslave/patches: patch-setup_py Log message: - update to 0.8.3 - add a new _buildslave user - add a rc script - add a README - update HOMEPAGE - change MAINTAINER from Piotr Sikora (new MAINTAINER) ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/04/21 04:26:15 Modified files: infrastructure/db: user.list Log message: reserve 673 for devel/py-buildbot and 674 for devel/py-buildslave
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/04/18 09:10:14 Log message: mock is a Python module that provides a core Mock class. It removes the need to create a host of stubs throughout your test suite. After performing an action, you can make assertions about which methods / attributes were used and arguments they were called with. You can also specify return values and set needed attributes in the normal way. The mock module also provides utility functions / objects to assist with testing, particularly monkey patching. ok ajacoutot@ Status: Vendor Tag: eric Release Tags: eric_2011-Apr-18 N ports/devel/py-mock/Makefile N ports/devel/py-mock/distinfo N ports/devel/py-mock/pkg/DESCR N ports/devel/py-mock/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/04/18 09:12:05 Modified files: devel : Makefile Log message: add py-mock
UPDATE: devel/py-buildbot
Hi,
This diff updates py-buildbot to 0.8.3p1. While there,
add a _buildbot user and a rc.d startup script.
Tweaked from a diff by Piotr Sikora
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/py-buildbot/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile15 Nov 2010 19:46:07 - 1.10
+++ Makefile17 Apr 2011 07:36:11 -
@@ -1,39 +1,44 @@
# $OpenBSD: Makefile,v 1.10 2010/11/15 19:46:07 espie Exp $
-COMMENT = system to automate the compile/test cycle
+COMMENT = system to automate the compile/test cycle
-MODPY_EGG_VERSION =0.8.2
-DISTNAME = buildbot-${MODPY_EGG_VERSION}
-PKGNAME = py-${DISTNAME}
-REVISION = 0
+MODPY_EGG_VERSION =0.8.3p1
+DISTNAME = buildbot-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME:S/p/./}
-CATEGORIES = devel
+CATEGORIES = devel
-HOMEPAGE = http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
-MAINTAINER = Will Maier wcma...@openbsd.org
+MAINTAINER = Will Maier wcma...@openbsd.org
# GPLv2
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES = lang/python
-
-MODPY_SETUPTOOLS = Yes
-MODPY_BADEGGS =buildbot
-
-RUN_DEPENDS = devel/py-twisted/core \
- devel/py-twisted/conch \
- devel/py-twisted/mail \
- devel/py-twisted/web \
- devel/py-twisted/words \
- www/py-jinja2 \
- ${MODPY_JSON}
-REGRESS_DEPENDS = ${RUN_DEPENDS}
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES = lang/python
+
+MODPY_SETUPTOOLS = Yes
+MODPY_BADEGGS =buildbot
+
+RUN_DEPENDS = devel/py-twisted/core \
+ devel/py-twisted/conch \
+ devel/py-twisted/mail \
+ devel/py-twisted/web \
+ devel/py-twisted/words \
+ www/py-jinja2 \
+ ${MODPY_JSON}
+
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-mock
+
+HOMEDIR = /var/buildbot
+
+SUBST_VARS += HOMEDIR
post-configure:
@cd ${WRKSRC}/docs makeinfo --no-split --html buildbot
Index: distinfo
===
RCS file: /cvs/ports/devel/py-buildbot/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo7 Nov 2010 17:17:42 - 1.6
+++ distinfo17 Apr 2011 07:36:11 -
@@ -1,5 +1,5 @@
-MD5 (buildbot-0.8.2.tar.gz) = o3f3m45ZwpiRiG65gNyHAw==
-RMD160 (buildbot-0.8.2.tar.gz) = E5o+czDOFyMw/at9tSXU2HF0Buc=
-SHA1 (buildbot-0.8.2.tar.gz) = gosPApita2xnt92Xib5vusbH4p8=
-SHA256 (buildbot-0.8.2.tar.gz) = RY5VPjphWLhIH+mfarRwnKkfc6JNtTwkiVoGViGCkEM=
-SIZE (buildbot-0.8.2.tar.gz) = 4054183
+MD5 (buildbot-0.8.3p1.tar.gz) = kZq2YJC8rdErTbMZhRHpSw==
+RMD160 (buildbot-0.8.3p1.tar.gz) = c35IY8Nx0+nTAGNWSuYuNetwqFY=
+SHA1 (buildbot-0.8.3p1.tar.gz) = ewwtOnwqzGbDyV/HqSrLK8JidAk=
+SHA256 (buildbot-0.8.3p1.tar.gz) = CknTWnVSSlTbu4dXMP33q9i5bK4WCvBFe09SObH++jc=
+SIZE (buildbot-0.8.3p1.tar.gz) = 4068355
Index: patches/patch-buildbot_process_builder_py
===
RCS file: patches/patch-buildbot_process_builder_py
diff -N patches/patch-buildbot_process_builder_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-buildbot_process_builder_py 17 Apr 2011 07:36:11 -
@@ -0,0 +1,14 @@
+Backported from upstream: ef106f36ec8fd1bf2be36da5b6db754c36e2c122
+--- buildbot/process/builder.py.orig
buildbot/process/builder.py
+@@ -472,8 +472,8 @@ class Builder(pb.Referenceable, service.MultiService):
+ diffs.append('logHorizon changed from %s to %s' %
(self.logHorizon, setup['logHorizon']))
+ if setup['eventHorizon'] != self.eventHorizon:
+ diffs.append('eventHorizon changed from %s to %s' %
(self.eventHorizon, setup['eventHorizon']))
+-if setup['category'] != self.category:
+-diffs.append('category changed from %r to %r' % (self.category,
setup['category']))
++if setup.get('category', None) != self.category:
++diffs.append('category changed from %r to %r' % (self.category,
setup.get('category', None)))
+
+ return diffs
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildbot/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 8 Nov 2010 01:20:06 - 1.7
+++ pkg/PLIST 17 Apr 2011 07:36:11 -
@@ -1,4 +1,6 @@
@comment $OpenBSD:
UPDATE: devel/py-buildslave
Hi again,
This diff updates py-buildslave to 0.8.3p1, and adds
a _buildslave user as well as a rc.d startup script.
Tweaked from a diff by Piotr Sikora again
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/py-buildslave/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile30 Nov 2010 10:59:01 - 1.1.1.1
+++ Makefile16 Apr 2011 12:31:40 -
@@ -1,34 +1,37 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
-COMMENT= buildslave implementation for the buildot system
+COMMENT = buildslave implementation for the buildot system
-MODPY_EGG_VERSION= 0.8.2
-DISTNAME= buildbot-slave-${MODPY_EGG_VERSION}
-PKGNAME= py-buildslave-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =0.8.3
+DISTNAME = buildbot-slave-${MODPY_EGG_VERSION}
+PKGNAME = py-buildslave-${MODPY_EGG_VERSION}
-CATEGORIES=devel
+CATEGORIES = devel
-HOMEPAGE= http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
-MAINTAINER=Eric Faurot e...@openbsd.org
+MAINTAINER = Eric Faurot e...@openbsd.org
# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP= Yes
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES= lang/python
-
-RUN_DEPENDS= devel/py-twisted/core \
- devel/py-twisted/conch \
- devel/py-twisted/mail \
- devel/py-twisted/web \
- devel/py-twisted/words
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
-REGRESS_DEPENDS= ${RUN_DEPENDS}
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES = lang/python
+
+MODPY_SETUPTOOLS = Yes
+
+RUN_DEPENDS = devel/py-twisted/core
+
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-mock
+
+HOMEDIR = /var/buildslave
+
+SUBST_VARS += HOMEDIR
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-buildslave
Index: distinfo
===
RCS file: /cvs/ports/devel/py-buildslave/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo30 Nov 2010 10:59:01 - 1.1.1.1
+++ distinfo16 Apr 2011 12:31:40 -
@@ -1,5 +1,5 @@
-MD5 (buildbot-slave-0.8.2.tar.gz) = p2v8E4BiEilYJcldaJWrTg==
-RMD160 (buildbot-slave-0.8.2.tar.gz) = E4wsBdd/kVkN5lL6rmcEX86HPXU=
-SHA1 (buildbot-slave-0.8.2.tar.gz) = V0nJ4iugM2sjn9tt/go5J4V5Iwo=
-SHA256 (buildbot-slave-0.8.2.tar.gz) =
e97Lli8r2HfhsGvDNiiUnhVAAQY06s/DePaPDbQH+wc=
-SIZE (buildbot-slave-0.8.2.tar.gz) = 79997
+MD5 (buildbot-slave-0.8.3.tar.gz) = y52dDC2SXlG7PI1iCD13pw==
+RMD160 (buildbot-slave-0.8.3.tar.gz) = 1Vas02TpjYZ3xIRykhGUfDCHhw8=
+SHA1 (buildbot-slave-0.8.3.tar.gz) = 9C0prA09Yw8nfxPjkpZXirsdFqw=
+SHA256 (buildbot-slave-0.8.3.tar.gz) =
4Ng8WJRJW4LAtwJIBlPqcS5SiPZEoPBmEJnma6ZO1Ww=
+SIZE (buildbot-slave-0.8.3.tar.gz) = 86438
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 30 Nov 2010 10:59:01 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
setup.py.orig Fri Oct 29 02:33:35 2010
-+++ setup.py Tue Nov 30 11:03:13 2010
-@@ -93,11 +93,7 @@ setup_args = {
- if sys.platform == win32:
- setup_args['zip_safe'] = False
-
--try:
--# If setuptools is installed, then we'll add setuptools-specific arguments
--# to the setup args.
--import setuptools #@UnusedImport
--except ImportError:
-+if True:
- setup_args['scripts'] = [
- 'bin/buildslave'
- ]
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildslave/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 30 Nov 2010 10:59:01 - 1.1.1.1
+++ pkg/PLIST 16 Apr 2011 12:31:40 -
@@ -1,6 +1,13 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
+@newgroup _buildslave:674
+@newuser _buildslave:674:_buildslave:daemon:Buildslave
daemon:${HOMEDIR}:/sbin/nologin
bin/buildslave
-lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages
Re: UPDATE: devel/py-buildbot
New version with new maintainer, updated rc script and improved README
file.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-buildbot/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile15 Nov 2010 19:46:07 - 1.10
+++ Makefile18 Apr 2011 20:35:11 -
@@ -1,39 +1,44 @@
# $OpenBSD: Makefile,v 1.10 2010/11/15 19:46:07 espie Exp $
-COMMENT = system to automate the compile/test cycle
+COMMENT = system to automate the compile/test cycle
-MODPY_EGG_VERSION =0.8.2
-DISTNAME = buildbot-${MODPY_EGG_VERSION}
-PKGNAME = py-${DISTNAME}
-REVISION = 0
+MODPY_EGG_VERSION =0.8.3p1
+DISTNAME = buildbot-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME:S/p/./}
-CATEGORIES = devel
+CATEGORIES = devel
-HOMEPAGE = http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
-MAINTAINER = Will Maier wcma...@openbsd.org
+MAINTAINER = Piotr Sikora piotr.sik...@frickle.com
# GPLv2
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES = lang/python
-
-MODPY_SETUPTOOLS = Yes
-MODPY_BADEGGS =buildbot
-
-RUN_DEPENDS = devel/py-twisted/core \
- devel/py-twisted/conch \
- devel/py-twisted/mail \
- devel/py-twisted/web \
- devel/py-twisted/words \
- www/py-jinja2 \
- ${MODPY_JSON}
-REGRESS_DEPENDS = ${RUN_DEPENDS}
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES = lang/python
+
+MODPY_SETUPTOOLS = Yes
+MODPY_BADEGGS =buildbot
+
+RUN_DEPENDS = devel/py-twisted/core \
+ devel/py-twisted/conch \
+ devel/py-twisted/mail \
+ devel/py-twisted/web \
+ devel/py-twisted/words \
+ www/py-jinja2 \
+ ${MODPY_JSON}
+
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-mock
+
+HOMEDIR = /var/buildbot
+
+SUBST_VARS += HOMEDIR
post-configure:
@cd ${WRKSRC}/docs makeinfo --no-split --html buildbot
Index: distinfo
===
RCS file: /cvs/ports/devel/py-buildbot/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo7 Nov 2010 17:17:42 - 1.6
+++ distinfo18 Apr 2011 20:35:11 -
@@ -1,5 +1,5 @@
-MD5 (buildbot-0.8.2.tar.gz) = o3f3m45ZwpiRiG65gNyHAw==
-RMD160 (buildbot-0.8.2.tar.gz) = E5o+czDOFyMw/at9tSXU2HF0Buc=
-SHA1 (buildbot-0.8.2.tar.gz) = gosPApita2xnt92Xib5vusbH4p8=
-SHA256 (buildbot-0.8.2.tar.gz) = RY5VPjphWLhIH+mfarRwnKkfc6JNtTwkiVoGViGCkEM=
-SIZE (buildbot-0.8.2.tar.gz) = 4054183
+MD5 (buildbot-0.8.3p1.tar.gz) = kZq2YJC8rdErTbMZhRHpSw==
+RMD160 (buildbot-0.8.3p1.tar.gz) = c35IY8Nx0+nTAGNWSuYuNetwqFY=
+SHA1 (buildbot-0.8.3p1.tar.gz) = ewwtOnwqzGbDyV/HqSrLK8JidAk=
+SHA256 (buildbot-0.8.3p1.tar.gz) = CknTWnVSSlTbu4dXMP33q9i5bK4WCvBFe09SObH++jc=
+SIZE (buildbot-0.8.3p1.tar.gz) = 4068355
Index: patches/patch-buildbot_process_builder_py
===
RCS file: patches/patch-buildbot_process_builder_py
diff -N patches/patch-buildbot_process_builder_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-buildbot_process_builder_py 18 Apr 2011 20:35:11 -
@@ -0,0 +1,14 @@
+Backported from upstream: ef106f36ec8fd1bf2be36da5b6db754c36e2c122
+--- buildbot/process/builder.py.orig
buildbot/process/builder.py
+@@ -472,8 +472,8 @@ class Builder(pb.Referenceable, service.MultiService):
+ diffs.append('logHorizon changed from %s to %s' %
(self.logHorizon, setup['logHorizon']))
+ if setup['eventHorizon'] != self.eventHorizon:
+ diffs.append('eventHorizon changed from %s to %s' %
(self.eventHorizon, setup['eventHorizon']))
+-if setup['category'] != self.category:
+-diffs.append('category changed from %r to %r' % (self.category,
setup['category']))
++if setup.get('category', None) != self.category:
++diffs.append('category changed from %r to %r' % (self.category,
setup.get('category', None)))
+
+ return diffs
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildbot/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 8 Nov 2010 01:20:06 - 1.7
+++ pkg/PLIST 18 Apr 2011 20:35:12 -
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2010/11/08 01:20:06 fgsch Exp $
+@newgroup
NEW: devel/py-mock
mock is a Python module that provides a core Mock class. It removes the need to create a host of stubs throughout your test suite. After performing an action, you can make assertions about which methods / attributes were used and arguments they were called with. You can also specify return values and set needed attributes in the normal way. The mock module also provides utility functions / objects to assist with testing, particularly monkey patching. ok? Eric. py-mock.tgz Description: application/tar-gz
Re: mplayer crashes with some filters
However, can you try the following patch which brings mplayer to today's snapshot. I'm attaching the distfile, as my website is dead for some reason. This is not a good excuse for posting 12M on a mailing-list. Eric.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/14 02:53:24 Modified files: net/ipcalc : Makefile Added files: net/ipcalc/patches: patch-ipcalc_c Log message: fix alloc size ok pyr@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/10 13:18:09 Modified files: devel/bzr : Makefile distinfo devel/bzr/patches: patch-bzr patch-bzrlib_diff_py patch-bzrlib_patch_py patch-bzrlib_tests_test_diff_py devel/bzr/pkg : PLIST Added files: devel/bzr/patches: patch-bzrlib_python-compat_h patch-setup_py Log message: update to 2.2.2 ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/10 13:20:50 Log message: Subvertpy provides alternative Python bindings for Subversion. The goal is to have complete, portable and Pythonic Python bindings. ok jasper@ Status: Vendor Tag: eric Release Tags: eric_10-Jan-2011 N ports/devel/py-subvertpy/Makefile N ports/devel/py-subvertpy/distinfo N ports/devel/py-subvertpy/pkg/DESCR N ports/devel/py-subvertpy/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/10 13:22:12 Modified files: devel : Makefile Log message: +py-subvertpy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/10 13:27:52 Log message: bzr-svn is a plugin that allows Bazaar direct access to Subversion repositories. It allows most bzr commands to work directly against Subversion repositories, as if you were using bzr with a native bzr repository. The plugin can at the moment be used to commit to, pull from, merge from, push to and view logs of Subversion branches from Bazaar. ok jasper@ Status: Vendor Tag: eric Release Tags: eric_10-Jan-2011 N ports/devel/bzr-svn/Makefile N ports/devel/bzr-svn/distinfo N ports/devel/bzr-svn/pkg/DESCR N ports/devel/bzr-svn/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/10 13:28:39 Modified files: devel : Makefile Log message: +bzr-svn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/09 05:19:28 Log message: This package provides some extensions to the Python standard library unit testing framework. It is needed by some ports to run their regression tests. ok benoit@ Status: Vendor Tag: eric Release Tags: eric_2011-Jan-09 N ports/devel/py-testtools/Makefile N ports/devel/py-testtools/distinfo N ports/devel/py-testtools/pkg/DESCR N ports/devel/py-testtools/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/09 05:22:44 Modified files: devel : Makefile Log message: +py-testtools
NEW: devel/py-testtools
This package provides some extensions to the Python standard library unit testing framework. It is needed by some ports to run their regression tests. py-testtools.tgz Description: application/tar-gz
NEW: devel/py-subvertpy
Subvertpy provides alternative Python bindings for Subversion. The goal is to have complete, portable and Pythonic Python bindings. py-subvertpy.tgz Description: application/tar-gz
UPDATE: devel/bzr
This is an update to bzr 2.2.2.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile15 Nov 2010 19:45:56 - 1.14
+++ Makefile8 Jan 2011 21:09:47 -
@@ -4,9 +4,8 @@
COMMENT = distributed version control system by Canonical
-MODPY_EGG_VERSION = 2.0.3
+MODPY_EGG_VERSION = 2.2.2
DISTNAME = bzr-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES = devel
HOMEPAGE = http://bazaar-vcs.org/
@@ -27,7 +26,8 @@
RUN_DEPENDS += net/py-curl \
security/py-paramiko \
textproc/gdiff
-REGRESS_DEPENDS = ${RUN_DEPENDS}
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-testtools
pre-configure:
${SUBST_CMD} ${WRKSRC}/bzr ${WRKSRC}/bzrlib/tests/test_diff.py
Index: distinfo
===
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo9 Jan 2010 00:21:30 - 1.6
+++ distinfo8 Jan 2011 21:09:47 -
@@ -1,5 +1,5 @@
-MD5 (bzr-2.0.3.tar.gz) = YHWOYbP9NoaWbXqw6hf6ZA==
-RMD160 (bzr-2.0.3.tar.gz) = OzPlFI/0fmawMV6WTSuOVl0FZnU=
-SHA1 (bzr-2.0.3.tar.gz) = F4/mVG0yoXUqnpq8pX2xKEY7seY=
-SHA256 (bzr-2.0.3.tar.gz) = dXlpuL+XwEkpe9BBt4PBl7s5g7BWKaT7B891wt73eAs=
-SIZE (bzr-2.0.3.tar.gz) = 6616470
+MD5 (bzr-2.2.2.tar.gz) = 0b+i/RqtKCxCPHjWLrrLIQ==
+RMD160 (bzr-2.2.2.tar.gz) = iI4PWciOD94mrfaXqUIu1zLMMyk=
+SHA1 (bzr-2.2.2.tar.gz) = nbjwYdlLo/C0jc1iPEc8botXC2o=
+SHA256 (bzr-2.2.2.tar.gz) = c07gw6ZOe4INZjKuDipL+RrdkI/evlyChlYYw4F1yOM=
+SIZE (bzr-2.2.2.tar.gz) = 6897175
Index: patches/patch-bzr
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.3
diff -u -r1.3 patch-bzr
--- patches/patch-bzr 19 Sep 2009 22:08:52 - 1.3
+++ patches/patch-bzr 8 Jan 2011 21:09:47 -
@@ -1,9 +1,9 @@
-$OpenBSD: patch-bzr,v 1.3 2009/09/19 22:08:52 fgsch Exp $
bzr.orig Thu Aug 20 09:41:03 2009
-+++ bzrMon Sep 14 23:10:15 2009
+$OpenBSD$
+--- bzr.orig Mon Dec 6 17:49:57 2010
bzrMon Dec 6 17:50:14 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! ${MODPY_BIN}
- # Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+ # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
#
Index: patches/patch-bzrlib_diff_py
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.3
diff -u -r1.3 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py19 Sep 2009 22:08:52 - 1.3
+++ patches/patch-bzrlib_diff_py8 Jan 2011 21:09:47 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bzrlib_diff_py,v 1.3 2009/09/19 22:08:52 fgsch Exp $
bzrlib/diff.py.origMon Sep 14 23:11:06 2009
-+++ bzrlib/diff.py Mon Sep 14 23:11:13 2009
-@@ -176,7 +176,7 @@ def external_diff(old_filename, oldlines, new_filename
+$OpenBSD$
+--- bzrlib/diff.py.origMon Dec 6 17:51:40 2010
bzrlib/diff.py Mon Dec 6 17:51:33 2010
+@@ -189,7 +189,7 @@ def external_diff(old_filename, oldlines, new_filename
# Since we are dealing with an ANSI api, use mbcs encoding
old_filename = old_filename.encode('mbcs')
new_filename = new_filename.encode('mbcs')
Index: patches/patch-bzrlib_patch_py
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_patch_py,v
retrieving revision 1.1
diff -u -r1.1 patch-bzrlib_patch_py
--- patches/patch-bzrlib_patch_py 21 Apr 2008 19:00:56 - 1.1
+++ patches/patch-bzrlib_patch_py 8 Jan 2011 21:09:47 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bzrlib_patch_py,v 1.1 2008/04/21 19:00:56 okan Exp $
bzrlib/patch.py.orig Thu Mar 20 03:12:09 2008
-+++ bzrlib/patch.pyWed Apr 2 23:11:25 2008
+$OpenBSD$
+--- bzrlib/patch.py.orig Mon Dec 6 17:52:07 2010
bzrlib/patch.pyMon Dec 6 17:52:44 2010
@@ -65,7 +65,7 @@ def patch(patch_contents, filename, output_filename=No
:type reverse: bool
:return: 0 on success, 1 if some hunks failed
Index: patches/patch-bzrlib_python-compat_h
===
RCS file: patches/patch-bzrlib_python-compat_h
diff -N patches/patch-bzrlib_python-compat_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-bzrlib_python-compat_h8 Jan 2011 21:09:47 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- bzrlib/python-compat.h.origTue Dec 7 11:03:32 2010
bzrlib/python-compat.h Tue Dec 7 11:03:44 2010
+@@ -67,6 +67,7 @@
+ #endif
+ #else /* Not win32 */
+ /* For htonl */
++#include netinet/in.h
+ #include arpa/inet.h
+ #endif
+
Index: patches/patch-bzrlib_tests_test_diff_py
NEW: devel/bzr-svn
bzr-svn is a plugin that allows Bazaar direct access to Subversion repositories. It allows most bzr commands to work directly against Subversion repositories, as if you were using bzr with a native bzr repository. The plugin can at the moment be used to commit to, pull from, merge from, push to and view logs of Subversion branches from Bazaar. bzr-svn.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2011/01/05 06:26:06 Modified files: graphics/cairo : Makefile distinfo graphics/cairo/patches: patch-src_Makefile_in graphics/cairo/pkg: PLIST Added files: graphics/cairo/patches: gcc2-patch-src_cairo-gl-private_h Removed files: graphics/cairo/patches: patch-src_cairo_h Log message: - update to 1.10.2 (from Brad) - build on gcc2 archs (from and tested by sebastiap@) ok ajacoutot@ dcoppa@
UPDATE: graphics/cairo
This is an update to cairo 1.10.2, with a patch to help it build on gcc2
archs.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile17 Nov 2010 08:05:13 - 1.31
+++ Makefile3 Jan 2011 13:02:44 -
@@ -2,8 +2,7 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.10.0
-REVISION= 0
+DISTNAME= cairo-1.10.2
SHARED_LIBS= cairo 11.0
SHARED_LIBS+= cairo-trace 0.0
SHARED_LIBS+= cairo-gobject 0.0
@@ -45,3 +44,9 @@
REGRESS_DEPENDS= print/ghostscript/gnu
.include bsd.port.mk
+
+.for i in ${GCC2_ARCHS}
+. if ${MACHINE_ARCH} == $i
+PATCH_LIST=patch-* gcc2-patch-*
+. endif
+.endfor
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo11 Oct 2010 08:09:44 - 1.17
+++ distinfo3 Jan 2011 13:02:44 -
@@ -1,5 +1,5 @@
-MD5 (cairo-1.10.0.tar.gz) = cKLs5mz0c9l24tsPdb8Zng==
-RMD160 (cairo-1.10.0.tar.gz) = +mXU85JjCIV9E/PtDBAPifB13AE=
-SHA1 (cairo-1.10.0.tar.gz) = 7+fkdAjVGIaQIozK3IUjZS9r9wI=
-SHA256 (cairo-1.10.0.tar.gz) = DyzkzEYVWUCI1064tTYLrXw8w8Pam2Gvm/2XntHtlLI=
-SIZE (cairo-1.10.0.tar.gz) = 24022822
+MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
+RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
+SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
+SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
+SIZE (cairo-1.10.2.tar.gz) = 23558405
Index: patches/gcc2-patch-src_cairo-gl-private_h
===
RCS file: patches/gcc2-patch-src_cairo-gl-private_h
diff -N patches/gcc2-patch-src_cairo-gl-private_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/gcc2-patch-src_cairo-gl-private_h 3 Jan 2011 13:02:44 -
@@ -0,0 +1,21 @@
+remove unnamed union to please gcc-2.95
+
+$OpenBSD$
+--- src/cairo-gl-private.h.origMon Jan 3 12:23:14 2011
src/cairo-gl-private.h Mon Jan 3 12:23:40 2011
+@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
+ */
+ typedef struct cairo_gl_operand {
+ cairo_gl_operand_type_t type;
+-union {
+ struct {
+ GLuint tex;
+ cairo_gl_surface_t *surface;
+@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
+ float radius_1;
+ cairo_extend_t extend;
+ } radial;
+-};
+ unsigned int vertex_offset;
+ } cairo_gl_operand_t;
+
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_Makefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 11 Oct 2010 08:09:44 - 1.5
+++ patches/patch-src_Makefile_in 3 Jan 2011 13:02:44 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.5 2010/10/11 08:09:44 eric Exp $
src/Makefile.in.orig Mon Sep 6 18:16:41 2010
-+++ src/Makefile.inMon Sep 13 17:44:05 2010
-@@ -2425,7 +2425,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
+--- src/Makefile.in.orig Sat Dec 25 15:22:52 2010
src/Makefile.inMon Dec 27 10:07:21 2010
+@@ -2429,7 +2429,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
) $@
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
Index: patches/patch-src_cairo_h
===
RCS file: patches/patch-src_cairo_h
diff -N patches/patch-src_cairo_h
--- patches/patch-src_cairo_h 11 Oct 2010 08:09:44 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_cairo_h,v 1.1 2010/10/11 08:09:44 eric Exp $
src/cairo.h.orig Sat Oct 9 10:54:20 2010
-+++ src/cairo.hSat Oct 9 10:54:10 2010
-@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
- CAIRO_DEVICE_TYPE_SCRIPT,
- CAIRO_DEVICE_TYPE_XCB,
- CAIRO_DEVICE_TYPE_XLIB,
--CAIRO_DEVICE_TYPE_XML,
-+CAIRO_DEVICE_TYPE_XML
- } cairo_device_type_t;
-
- cairo_public cairo_device_type_t
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 17 Oct 2010 12:50:53 - 1.9
+++ pkg/PLIST 3 Jan 2011 13:02:44 -
@@ -63,6 +63,7 @@
share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
share/gtk-doc/html/cairo/cairo-Regions.html
share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
share/gtk-doc/html/cairo/cairo-Transformations.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2010/11/30 03:53:51 Modified files: devel/py-zopeinterface: Makefile distinfo devel/py-zopeinterface/patches: patch-setup_py Log message: update to zope.interface 3.6.1 ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2010/11/30 03:59:01 Log message: Standalone buildslave implementation for the buildbot system. ok landry@ Status: Vendor Tag: eric Release Tags: eric_2010-Nov-30 N ports/devel/py-buildslave/Makefile N ports/devel/py-buildslave/distinfo N ports/devel/py-buildslave/pkg/DESCR N ports/devel/py-buildslave/pkg/PLIST N ports/devel/py-buildslave/patches/patch-setup_py No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2010/11/30 04:09:07 Modified files: devel : Makefile Log message: +py-buildslave
NEW: devel/py-buildslave
Hi, This is a port of the standalone buildslave daemon for the buildbot system. Comments? ok? Eric. py-buildslave.tgz Description: application/tar-gz
UPDATE: devel/py-zopeinterface
Hi,
This is an update to py-zopeinterface 3.6.1
The failing test case is actually normal (read the comment around it).
Please test and ok
Eric.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-zopeinterface/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile15 Nov 2010 19:46:08 - 1.10
+++ Makefile23 Nov 2010 10:38:38 -
@@ -2,11 +2,10 @@
COMMENT= object interface infrastructure from Zope 3
-MODPY_EGG_VERSION= 3.5.1
+MODPY_EGG_VERSION= 3.6.1
DISTNAME= zope.interface-${MODPY_EGG_VERSION}
PKGNAME= py-zopeinterface-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES=devel
HOMEPAGE= http://pypi.python.org/pypi/zope.interface
@@ -25,12 +24,9 @@
MODPY_SETUPTOOLS= Yes
-REGRESS_DEPENDS= devel/py-zopetesting
-
-do-regress:
- cd ${WRKSRC} \
- ${MODPY_BIN} bootstrap.py \
- ./bin/buildout \
- ./bin/test
+do-regress: install
+ for f in `ls ${WRKSRC}/src/zope/interface/tests/test_*.py`; do \
+ ${MODPY_BIN} -m zope.interface.tests.`basename $$f .py` || true; \
+ done
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/py-zopeinterface/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo1 Jun 2009 21:18:20 - 1.5
+++ distinfo23 Nov 2010 10:38:38 -
@@ -1,5 +1,5 @@
-MD5 (zope.interface-3.5.1.tar.gz) = aF/FMlUKuwfMphkMnNK5AQ==
-RMD160 (zope.interface-3.5.1.tar.gz) = ddS8KepvX9Q07exG+aCRSzAySx0=
-SHA1 (zope.interface-3.5.1.tar.gz) = bbDvORra9397ZLeSKh6zEJVLdVg=
-SHA256 (zope.interface-3.5.1.tar.gz) =
uB2JhTLEf3NHXC0MI1gOKJ7tJZI9AH7KjmJ1DAmYu6A=
-SIZE (zope.interface-3.5.1.tar.gz) = 113618
+MD5 (zope.interface-3.6.1.tar.gz) = eolRgbjRC+Sn6aOvoTzTvg==
+RMD160 (zope.interface-3.6.1.tar.gz) = nt6RywR9ZHNIm040VTbtZOVdV74=
+SHA1 (zope.interface-3.6.1.tar.gz) = O9xESYgGTQNfsaMZXjNt5rRG8Po=
+SHA256 (zope.interface-3.6.1.tar.gz) =
KUw8BSnoQWkXe8541hbHaPocAoovvBhU9hXTLtiNvGw=
+SIZE (zope.interface-3.6.1.tar.gz) = 125264
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/devel/py-zopeinterface/patches/patch-setup_py,v
retrieving revision 1.3
diff -u -r1.3 patch-setup_py
--- patches/patch-setup_py 1 Jun 2009 21:18:20 - 1.3
+++ patches/patch-setup_py 23 Nov 2010 10:38:38 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.3 2009/06/01 21:18:20 eric Exp $
setup.py.orig Fri Mar 13 11:23:55 2009
-+++ setup.py Sun May 31 05:30:13 2009
+--- setup.py.orig Mon May 3 15:12:52 2010
setup.py Mon Nov 15 15:22:54 2010
@@ -52,7 +52,6 @@ else:
)]
)])
@@ -8,4 +8,4 @@
-namespace_packages=[zope],
include_package_data = True,
zip_safe = False,
- tests_require = ['zope.testing'],
+ tests_require = [],
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2010/11/10 06:24:41 Modified files: databases/py-storm: Makefile distinfo databases/py-storm/pkg: PLIST Log message: - update to 0.18 - take maintainership ok wcmaier@ (former maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2010/11/08 07:32:56 Modified files: geo/postgis: Makefile Log message: bump after postgresql update. suggested by and ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2010/11/05 06:54:51 Log message: Oggz comprises liboggz and the tool oggz, which provides commands to inspect, edit and validate Ogg files. The oggz-chop tool can also be used to serve time ranges of Ogg media over HTTP by any web server that supports CGI. liboggz is a C library for reading and writing Ogg files and streams. It offers various features over the reference libogg, including support for seeking, validation and timestamp interpretation. Ogg is an interleaving data container developed by Monty at Xiph.org, originally to support the Ogg Vorbis audio format but now used for many free codecs including Dirac, FLAC, Speex and Theora. ok pea@ Status: Vendor Tag: eric Release Tags: eric_2010_11_05 N ports/multimedia/oggz/Makefile N ports/multimedia/oggz/distinfo N ports/multimedia/oggz/pkg/DESCR N ports/multimedia/oggz/pkg/PLIST N ports/multimedia/oggz/pkg/PFRAG.shared N ports/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_c N ports/multimedia/oggz/patches/patch-src_tools_oggz-chop_httpdate_test_c N ports/multimedia/oggz/patches/patch-doc_Makefile_in No conflicts created by this import
