diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-04 16:26:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-04 16:26:54 +0000 |
| commit | 8572e2517c9d359fa0575baf432af6b50a175a18 (patch) | |
| tree | 1c794d0297d16ff2a589f73e4b2528ed5e788bd5 /misc | |
| parent | a3a510958e5bb012c89d6e9759ac3312faf174eb (diff) | |
| download | pkgsrc-8572e2517c9d359fa0575baf432af6b50a175a18.tar.gz | |
Fix CONFLICTS of php/pear packages, the asterix was missing (thanks tv).
While going through the tree, fix some more packages which had similiar
issues with too strict conflicts, bump the revisions of those.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bbdb/Makefile | 6 | ||||
| -rw-r--r-- | misc/php-calendar/Makefile | 4 | ||||
| -rw-r--r-- | misc/php-mbstring/Makefile | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile index 55785cfa13d..7213cb4fec6 100644 --- a/misc/bbdb/Makefile +++ b/misc/bbdb/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2006/05/19 09:24:31 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/06/04 16:26:54 joerg Exp $ # DISTNAME= bbdb-2.34 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail misc news MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbdb/} @@ -13,7 +13,7 @@ COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program # bbdb is included in xemacs-packages EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 -CONFLICTS+= xemacs-packages +CONFLICTS+= xemacs-packages-[0-9]* BROKEN_IN= pkgsrc-2006Q1 diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile index 1a54a5858c1..547562a38fa 100644 --- a/misc/php-calendar/Makefile +++ b/misc/php-calendar/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:54 joerg Exp $ MODNAME= calendar CATEGORIES+= misc COMMENT= PHP extension for calendar conversion support -CONFLICTS= php-calendar-[0-9] +CONFLICTS= php-calendar-[0-9]* CONFIGURE_ARGS+= --enable-${MODNAME} diff --git a/misc/php-mbstring/Makefile b/misc/php-mbstring/Makefile index c526dbd027e..79dbf8a6151 100644 --- a/misc/php-mbstring/Makefile +++ b/misc/php-mbstring/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:54 joerg Exp $ MODNAME= mbstring CATEGORIES+= misc COMMENT= PHP extension for multibyte characters support (currently, Japanese only) -CONFLICTS= php-mbstring-[0-9] +CONFLICTS= php-mbstring-[0-9]* USE_PHP_EXT_PATCHES= yes |