From e0e1b0457018e63aaaab51db367130b75247dc05 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 14 Mar 2009 23:13:33 +0000
Subject: [PATCH] fix a few depends (python mostly)

---
 devel/avr/gcc/Makefile     | 4 ++--
 devel/bzr/Makefile         | 4 ++--
 devel/cvs20hg/Makefile     | 4 ++--
 devel/flawfinder/Makefile  | 4 ++--
 devel/gconfmm/Makefile     | 5 +++--
 devel/goopy/Makefile       | 4 ++--
 devel/ipython/Makefile     | 3 ++-
 devel/py-rcsparse/Makefile | 4 ++--
 8 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/devel/avr/gcc/Makefile b/devel/avr/gcc/Makefile
index 15319f6a823..f20d0019a00 100644
--- a/devel/avr/gcc/Makefile
+++ b/devel/avr/gcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2008/10/01 04:52:19 ckuethe Exp $
+# $OpenBSD: Makefile,v 1.10 2009/03/14 23:13:33 espie Exp $
 
 COMMENT=	Atmel AVR 8-bit RISC microcontrollers' XGCC
 
@@ -26,7 +26,7 @@ MASTER_SITES= 		${MASTER_SITE_GNU:=gcc/gcc-$(V)/}
 LIB_DEPENDS+=		gmp:gmp->=4.2:devel/gmp \
 			mpfr::devel/mpfr
 
-BUILD_DEPENDS+=		:autoconf-2.13*:devel/autoconf/2.13 \
+BUILD_DEPENDS+=		:autoconf-2.13:devel/autoconf/2.13 \
 			:bison-*:devel/bison		\
 			::devel/metaauto		\
 			::devel/avr/binutils
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 2ac06c89ede..8b47ddcbf06 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2009/01/02 13:07:37 djm Exp $
+# $OpenBSD: Makefile,v 1.7 2009/03/14 23:13:34 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	distributed version control system by Canonical
 
 MODPY_EGG_VERSION=1.3
 DISTNAME=	bzr-${MODPY_EGG_VERSION}
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	devel
 
 HOMEPAGE=	http://bazaar-vcs.org/
diff --git a/devel/cvs20hg/Makefile b/devel/cvs20hg/Makefile
index 861f4cf1c40..7c03c8e0704 100644
--- a/devel/cvs20hg/Makefile
+++ b/devel/cvs20hg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/10/08 08:22:39 steven Exp $
+# $OpenBSD: Makefile,v 1.4 2009/03/14 23:13:34 espie Exp $
 
 COMMENT=		fast, incremental CVS to Mercurial conversion
 
@@ -8,7 +8,7 @@ VERSION=		20060714
 
 DISTNAME=		cvs20hg-${CHANGESET}
 EXTRACT_SUFX=		.tar.bz2
-PKGNAME=		cvs20hg-${VERSION}p0
+PKGNAME=		cvs20hg-${VERSION}p1
 CATEGORIES=     	devel
 
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/devel/flawfinder/Makefile b/devel/flawfinder/Makefile
index 31544efc64b..5f6fdd9031f 100644
--- a/devel/flawfinder/Makefile
+++ b/devel/flawfinder/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2007/10/08 08:22:39 steven Exp $
+# $OpenBSD: Makefile,v 1.30 2009/03/14 23:13:34 espie Exp $
 
 COMMENT=		C/C++ source code auditing tool
 
 DISTNAME=		flawfinder-1.27
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		devel security
 
 HOMEPAGE=		http://www.dwheeler.com/flawfinder/
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index d0b691db724..fbeda663855 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2009/01/14 10:38:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2009/03/14 23:13:34 espie Exp $
 
 COMMENT=		C++ interface to GConf
 
@@ -6,6 +6,7 @@ GNOME_PROJECT=		gconfmm
 GNOME_VERSION=		2.24.0
 SHARED_LIBS +=		gconfmm-2.6	0.1	# .1.6
 CATEGORIES=		devel
+PKGNAME=		${DISTNAME}p0
 
 HOMEPAGE=		http://www.gtkmm.org/
 
@@ -23,7 +24,7 @@ MODULES=		devel/gettext \
 
 LIB_DEPENDS=		ORBit-2::devel/ORBit2 \
 			gconf-2.>=5::devel/gconf2 \
-			sigc-2.0:libsigc++-2.*:devel/libsigc++-2 \
+			sigc-2.0:libsigc++->=2,<3:devel/libsigc++-2 \
 			glibmm-2.4:glib2mm->=2.8:devel/glib2mm
 
 CONFIGURE_STYLE=	gnu
diff --git a/devel/goopy/Makefile b/devel/goopy/Makefile
index 2e5d717a793..f467a76407a 100644
--- a/devel/goopy/Makefile
+++ b/devel/goopy/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2007/10/08 08:22:39 steven Exp $
+# $OpenBSD: Makefile,v 1.7 2009/03/14 23:13:34 espie Exp $
 
 COMMENT=	Google utilities written in Python
 
 DISTNAME=	goopy-0.1
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	devel
 HOMEPAGE=	http://goog-goopy.sourceforge.net/
 
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index a7e815cd766..d75483a9e46 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2008/12/27 15:29:54 fgsch Exp $
+# $OpenBSD: Makefile,v 1.12 2009/03/14 23:13:34 espie Exp $
 
 COMMENT=		enhanced interactive Python shell
 
 MODPY_EGG_VERSION=	0.9.1
 DISTNAME=		ipython-${MODPY_EGG_VERSION}
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://ipython.scipy.org/moin/
diff --git a/devel/py-rcsparse/Makefile b/devel/py-rcsparse/Makefile
index c66528e3553..24bb058fd65 100644
--- a/devel/py-rcsparse/Makefile
+++ b/devel/py-rcsparse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/10/08 08:22:40 steven Exp $
+# $OpenBSD: Makefile,v 1.4 2009/03/14 23:13:34 espie Exp $
 
 COMMENT=		RCS parsing library for Python
 
@@ -7,7 +7,7 @@ CHANGESET=		40d822c6febd
 VERSION=		20060714
 DISTNAME=		rcsparse-${CHANGESET}
 EXTRACT_SUFX=		.tar.bz2
-PKGNAME=		rcsparse-${VERSION}p0
+PKGNAME=		rcsparse-${VERSION}p1
 CATEGORIES=     	devel
 
 PERMIT_PACKAGE_CDROM=	Yes