pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix CONFLICTS of php/pear packages, the asterix was mi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/421b9b35c8d0
branches: trunk
changeset: 513850:421b9b35c8d0
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Jun 04 16:26:54 2006 +0000
description:
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:
mail/pear-Mail/Makefile | 4 ++--
mail/pear-Mail_Mime/Makefile | 4 ++--
mail/php-imap/Makefile | 4 ++--
math/pear-Numbers_Roman/Makefile | 4 ++--
math/pear-Numbers_Words/Makefile | 4 ++--
math/php-bcmath/Makefile | 4 ++--
misc/bbdb/Makefile | 6 +++---
misc/php-calendar/Makefile | 4 ++--
misc/php-mbstring/Makefile | 4 ++--
multimedia/php-ming/Makefile | 4 ++--
net/pear-Net_DIME/Makefile | 4 ++--
net/pear-Net_SMTP/Makefile | 4 ++--
net/pear-Net_Sieve/Makefile | 4 ++--
net/pear-Net_Socket/Makefile | 4 ++--
net/pear-Net_URL/Makefile | 4 ++--
net/pear-SOAP/Makefile | 4 ++--
net/php-ftp/Makefile | 4 ++--
net/php-snmp/Makefile | 4 ++--
net/php-sockets/Makefile | 4 ++--
net/php-xmlrpc/Makefile | 4 ++--
net/php-yp/Makefile | 4 ++--
net/php5-soap/Makefile | 4 ++--
print/foomatic-filters/Makefile | 6 +++---
print/php-pdflib/Makefile | 4 ++--
security/php-mcrypt/Makefile | 4 ++--
security/php-mhash/Makefile | 4 ++--
textproc/php-pspell/Makefile | 4 ++--
textproc/php-wddx/Makefile | 4 ++--
textproc/php4-domxml/Makefile | 4 ++--
textproc/php4-xslt/Makefile | 4 ++--
textproc/php5-dom/Makefile | 4 ++--
textproc/php5-xsl/Makefile | 4 ++--
textproc/texi2html/Makefile | 4 ++--
time/pear-Date/Makefile | 4 ++--
www/pear-HTML_Common/Makefile | 4 ++--
www/pear-HTML_Select/Makefile | 4 ++--
www/pear-HTTP_Request/Makefile | 4 ++--
www/php-FastTemplate/Makefile | 4 ++--
www/php-apc/Makefile | 4 ++--
www/php-curl/Makefile | 4 ++--
www/php-eaccelerator/Makefile | 4 ++--
www/php4-apc/Makefile | 4 ++--
x11/qwspritefield/Makefile | 6 +++---
43 files changed, 89 insertions(+), 89 deletions(-)
diffs (truncated from 752 to 300 lines):
diff -r e9cdf56471ab -r 421b9b35c8d0 mail/pear-Mail/Makefile
--- a/mail/pear-Mail/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/mail/pear-Mail/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Mail-1.1.4
CATEGORIES= mail
-CONFLICTS= php-pear-Mail-[0-9]
+CONFLICTS= php-pear-Mail-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
diff -r e9cdf56471ab -r 421b9b35c8d0 mail/pear-Mail_Mime/Makefile
--- a/mail/pear-Mail_Mime/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/mail/pear-Mail_Mime/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Mail_Mime-1.2.1
CATEGORIES+= mail
@@ -6,7 +6,7 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= PHP classes to create and decode mime messages
-CONFLICTS= php-pear-Mail_Mime-[0-9]
+CONFLICTS= php-pear-Mail_Mime-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9cdf56471ab -r 421b9b35c8d0 mail/php-imap/Makefile
--- a/mail/php-imap/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/mail/php-imap/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:54 joerg Exp $
MODNAME= imap
CATEGORIES+= mail
COMMENT= PHP extension for IMAP (Internet Mailbox Access Protocol)
-CONFLICTS= php-imap-[0-9]
+CONFLICTS= php-imap-[0-9]*
USE_PHP_EXT_PATCHES= yes
diff -r e9cdf56471ab -r 421b9b35c8d0 math/pear-Numbers_Roman/Makefile
--- a/math/pear-Numbers_Roman/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/math/pear-Numbers_Roman/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Numbers_Roman-0.2.0
CATEGORIES= math
@@ -7,7 +7,7 @@
HOMEPAGE= http://pear.php.net/package/Numbers_Roman/
COMMENT= Provides methods for converting to and from Roman Numerals
-CONFLICTS= php-pear-Numbers_Roman-[0-9]
+CONFLICTS= php-pear-Numbers_Roman-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9cdf56471ab -r 421b9b35c8d0 math/pear-Numbers_Words/Makefile
--- a/math/pear-Numbers_Words/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/math/pear-Numbers_Words/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Numbers_Words-0.14.0
CATEGORIES= math
@@ -7,7 +7,7 @@
HOMEPAGE= http://pear.php.net/package/Numbers_Words/
COMMENT= Provides methods for spelling numerals in words
-CONFLICTS= php-pear-Numbers_Words-[0-9]
+CONFLICTS= php-pear-Numbers_Words-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9cdf56471ab -r 421b9b35c8d0 math/php-bcmath/Makefile
--- a/math/php-bcmath/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/math/php-bcmath/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:54 joerg Exp $
MODNAME= bcmath
CATEGORIES+= math
COMMENT= PHP extension for bc-style arbitrary precision math
-CONFLICTS= php-bcmath-[0-9]
+CONFLICTS= php-bcmath-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
diff -r e9cdf56471ab -r 421b9b35c8d0 misc/bbdb/Makefile
--- a/misc/bbdb/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/misc/bbdb/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -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 @@
# 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 -r e9cdf56471ab -r 421b9b35c8d0 misc/php-calendar/Makefile
--- a/misc/php-calendar/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/misc/php-calendar/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -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 -r e9cdf56471ab -r 421b9b35c8d0 misc/php-mbstring/Makefile
--- a/misc/php-mbstring/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/misc/php-mbstring/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -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
diff -r e9cdf56471ab -r 421b9b35c8d0 multimedia/php-ming/Makefile
--- a/multimedia/php-ming/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/multimedia/php-ming/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
MODNAME= ming
CATEGORIES+= multimedia
@@ -6,7 +6,7 @@
MAINTAINER= obata%lins.jp@localhost
COMMENT= PHP extension for Ming library
-CONFLICTS= php-ming-[0-9]
+CONFLICTS= php-ming-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.ming}
diff -r e9cdf56471ab -r 421b9b35c8d0 net/pear-Net_DIME/Makefile
--- a/net/pear-Net_DIME/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/net/pear-Net_DIME/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_DIME-0.3
CATEGORIES+= net
@@ -6,7 +6,7 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= PHP classes that implements DIME encoding
-CONFLICTS= php-pear-Net_DIME-[0-9]
+CONFLICTS= php-pear-Net_DIME-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9cdf56471ab -r 421b9b35c8d0 net/pear-Net_SMTP/Makefile
--- a/net/pear-Net_SMTP/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/net/pear-Net_SMTP/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_SMTP-1.2.6
CATEGORIES+= net mail
@@ -6,7 +6,7 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= PHP classes to provide SMTP Interface
-CONFLICTS= php-pear-Net_SMTP-[0-9]
+CONFLICTS= php-pear-Net_SMTP-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
diff -r e9cdf56471ab -r 421b9b35c8d0 net/pear-Net_Sieve/Makefile
--- a/net/pear-Net_Sieve/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/net/pear-Net_Sieve/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_Sieve-1.1.1
CATEGORIES+= net
@@ -7,7 +7,7 @@
HOMEPAGE= http://pear.php.net/package/Net_Sieve/
COMMENT= PHP classes that handles talking to timsieved
-CONFLICTS= php-pear-Net_Sieve-[0-9]
+CONFLICTS= php-pear-Net_Sieve-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.0:../../net/pear-Net_Socket
diff -r e9cdf56471ab -r 421b9b35c8d0 net/pear-Net_Socket/Makefile
--- a/net/pear-Net_Socket/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/net/pear-Net_Socket/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:54 joerg Exp $
DISTNAME= Net_Socket-1.0.2
CATEGORIES+= net
@@ -6,7 +6,7 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= PHP classes to provide Network Socket Interface
-CONFLICTS= php-pear-Net_Socket-[0-9]
+CONFLICTS= php-pear-Net_Socket-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9cdf56471ab -r 421b9b35c8d0 net/pear-Net_URL/Makefile
--- a/net/pear-Net_URL/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/net/pear-Net_URL/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $
DISTNAME= Net_URL-1.0.14
CATEGORIES+= net
@@ -6,7 +6,7 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= PHP classes to easy parsing of URLs
-CONFLICTS= php-pear-Net_URL-[0-9]
+CONFLICTS= php-pear-Net_URL-[0-9]*
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9cdf56471ab -r 421b9b35c8d0 net/pear-SOAP/Makefile
--- a/net/pear-SOAP/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/net/pear-SOAP/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $
DISTNAME= SOAP-0.8.1
CATEGORIES+= net
@@ -6,7 +6,7 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= SOAP Client/Server for PHP
-CONFLICTS= php-pear-SOAP-[0-9]
+CONFLICTS= php-pear-SOAP-[0-9]*
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.2:../../mail/pear-Mail_Mime
DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request>=1.2:../../www/pear-HTTP_Request
diff -r e9cdf56471ab -r 421b9b35c8d0 net/php-ftp/Makefile
--- a/net/php-ftp/Makefile Sun Jun 04 16:26:53 2006 +0000
+++ b/net/php-ftp/Makefile Sun Jun 04 16:26:54 2006 +0000
@@ -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:55 joerg Exp $
MODNAME= ftp
CATEGORIES+= net
COMMENT= PHP extension for FTP access
-CONFLICTS= php-ftp-[0-9]
+CONFLICTS= php-ftp-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
diff -r e9cdf56471ab -r 421b9b35c8d0 net/php-snmp/Makefile
Home |
Main Index |
Thread Index |
Old Index