From ea67a9cb534df86687243bfc8e43a861bdc362d5 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 17 Mar 2009 19:32:44 +0000
Subject: [PATCH] fix depends, bump

---
 mail/mailcrypt/Makefile        | 12 ++++++------
 mail/postfix/Makefile.inc      |  4 ++--
 mail/postfix/snapshot/Makefile |  4 ++--
 mail/postfix/stable/Makefile   |  4 ++--
 print/auctex/Makefile          |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index b671ae9f599..b60006831c5 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/06 19:15:13 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2009/03/17 19:32:44 sthen Exp $
 
 COMMENT=	emacs interface to PGP and GnuPG
 
 DISTNAME=	mailcrypt-3.5.7
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=     mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailcrypt/}
 
@@ -19,21 +19,21 @@ CONFIGURE_STYLE= gnu dest
 FLAVORS=	gnupg pgp pgp5 
 FLAVOR?=	gnupg
 
-BUILD_DEPENDS=	:emacs-21.*:editors/emacs21
+BUILD_DEPENDS=	:emacs->=21,<22:editors/emacs21
 
 .if ${FLAVOR:L:Mgnupg}
 RUN_DEPENDS=	:gnupg-*:security/gnupg
 .endif
 
 .if ${FLAVOR:L:Mpgp}
-RUN_DEPENDS=	:pgp-2.*:security/pgp
+RUN_DEPENDS=	:pgp->=2,<3:security/pgp
 .endif
 
 .if ${FLAVOR:L:Mpgp5}
-RUN_DEPENDS=	:pgp-5.*:security/pgp5
+RUN_DEPENDS=	:pgp->=5,<6:security/pgp5
 .endif
 
-REGRESS_DEPENDS=	:python-2.3*:lang/python/2.3
+REGRESS_DEPENDS=	:python->=2.3,<2.4:lang/python/2.3
 
 pre-regress:
 	@perl -i -pe 's:%%LOCALBASE%%:${LOCALBASE}:' \
diff --git a/mail/postfix/Makefile.inc b/mail/postfix/Makefile.inc
index df2dd141f0a..275a743f8e0 100644
--- a/mail/postfix/Makefile.inc
+++ b/mail/postfix/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.68 2008/02/29 12:25:22 jakob Exp $
+# $OpenBSD: Makefile.inc,v 1.69 2009/03/17 19:32:44 sthen Exp $
 
 COMMENT=	fast, secure sendmail replacement
 
@@ -59,7 +59,7 @@ MAKE_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2
 .endif
 
 .if ${FLAVOR:L:Mldap}
-LIB_DEPENDS+=	ldap.>=2,lber:openldap-client-2.*:databases/openldap
+LIB_DEPENDS+=	ldap.>=2,lber:openldap-client->=2,<3:databases/openldap
 MAKE_CCARGS+=	-I${LOCALBASE}/include -DHAS_LDAP
 MAKE_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
 .endif
diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile
index 9579732a727..73c9198fedf 100644
--- a/mail/postfix/snapshot/Makefile
+++ b/mail/postfix/snapshot/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.189 2009/03/15 19:38:05 jakob Exp $
+# $OpenBSD: Makefile,v 1.190 2009/03/17 19:32:44 sthen Exp $
 
 VERSION=	2.6-20090125
-PATCHLEVEL=	0
+PATCHLEVEL=	1
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=experimental/}
 
diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile
index 96f8978cf20..494030a5073 100644
--- a/mail/postfix/stable/Makefile
+++ b/mail/postfix/stable/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.118 2009/03/15 19:38:05 jakob Exp $
+# $OpenBSD: Makefile,v 1.119 2009/03/17 19:32:44 sthen Exp $
 
 VERSION=	2.5.6
-PATCHLEVEL=	0
+PATCHLEVEL=	1
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=official/}
 
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index b9236b4385d..53d6eed5aa1 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2008/05/07 05:10:30 steven Exp $
+# $OpenBSD: Makefile,v 1.8 2009/03/17 19:32:44 sthen Exp $
 
 COMMENT=	extensible emacs interface for TeX
 
 DISTNAME=	auctex-11.14
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	print
 
 HOMEPAGE=	http://www.gnu.org/software/auctex/
@@ -20,9 +20,9 @@ MASTER_SITES=	${MASTER_SITE_GNU:=auctex/11.14/}
 
 FAKE_FLAGS=	lispdir=${DESTDIR}${PREFIX}/share/emacs/site-lisp
 
-RUN_DEPENDS=	:emacs-21.*:editors/emacs21 \
+RUN_DEPENDS=	:emacs->=21,<22:editors/emacs21 \
 		::print/texlive/base
-BUILD_DEPENDS=	:emacs-21.*:editors/emacs21
+BUILD_DEPENDS=	:emacs->=21,<22:editors/emacs21
 
 post-install:
 	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs/site-lisp/auctex