diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-04 16:26:52 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-04 16:26:52 +0000 |
| commit | 5fe074f21eddb86dbf038655fdd7bcb80373f0e0 (patch) | |
| tree | 2289aa9644e3677c23bdb5b3beb8c83893ff887a /converters | |
| parent | 71e0f5df9e12f82c8e41905538672dfe54651eb7 (diff) | |
| download | pkgsrc-5fe074f21eddb86dbf038655fdd7bcb80373f0e0.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 'converters')
| -rw-r--r-- | converters/php-iconv/Makefile | 4 | ||||
| -rw-r--r-- | converters/uulib/Makefile | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/converters/php-iconv/Makefile b/converters/php-iconv/Makefile index 92e3c5eeff9..6693bb6d54d 100644 --- a/converters/php-iconv/Makefile +++ b/converters/php-iconv/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:54 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/04 16:26:53 joerg Exp $ MODNAME= iconv CATEGORIES+= converters COMMENT= PHP extension for character set conversion -CONFLICTS= php-iconv-[0-9] +CONFLICTS= php-iconv-[0-9]* .include "../../converters/libiconv/buildlink3.mk" diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile index cabdb6c7df3..a74317ee587 100644 --- a/converters/uulib/Makefile +++ b/converters/uulib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/03/04 21:29:07 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2006/06/04 16:26:53 joerg Exp $ # DISTNAME= uudeview-0.5.20 @@ -11,9 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.fpx.de/fp/Software/UUDeview/ COMMENT= Library for uu/xx/Base64/BinHex de-/encoding -# "kdesupport-2.1b" included "uu" library. -CONFLICTS+= kdesupport-2.1b - GNU_CONFIGURE= yes CONFIGURE_DIRS= uulib BUILD_DIRS= uulib |