diff options
| author | jtb <jtb@pkgsrc.org> | 2003-02-18 00:35:50 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2003-02-18 00:35:50 +0000 |
| commit | 03c0fc77b5038d2f16caf72c11cdf3d439032eb8 (patch) | |
| tree | 473800435fc0d776e283eb165c16822dc782219a | |
| parent | 0caabb3407181dc45891c4c906ef34aac1325367 (diff) | |
| download | pkgsrc-03c0fc77b5038d2f16caf72c11cdf3d439032eb8.tar.gz | |
kdeutils install an efax program conflicting with comms/efax.
| -rw-r--r-- | comms/efax/Makefile | 4 | ||||
| -rw-r--r-- | misc/kdeutils2/Makefile | 4 | ||||
| -rw-r--r-- | misc/kdeutils3/Makefile | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/comms/efax/Makefile b/comms/efax/Makefile index 9ba83532a6d..62d9c3bef50 100644 --- a/comms/efax/Makefile +++ b/comms/efax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/11/14 23:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2003/02/18 00:35:50 jtb Exp $ DISTNAME= efax-0.9 CATEGORIES= comms @@ -8,6 +8,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cce.com/efax/ COMMENT= collection of small programs for sending and receiving faxes +CONFLICTS= kdeutils-[0-9]* + USE_BUILDLINK2= # defined post-patch: diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 0cc63b2e547..0e72f20062d 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.12 2002/09/20 08:58:58 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2003/02/18 00:35:51 jtb Exp $ DISTNAME= kdeutils-2.2.2 PKGREVISION= 1 COMMENT= Utilities for the KDE integrated X11 desktop +CONFLICTS= efax-[0-9]* + .include "../../x11/kde2/Makefile.kde2" BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 2bd343228d6..7d7391e2e18 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:44 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2003/02/18 00:35:51 jtb Exp $ DISTNAME= kdeutils-3.0.5a COMMENT= Utilities for the KDE integrated X11 desktop +CONFLICTS= efax-[0-9]* + .include "../../x11/kde3/Makefile.kde3" USE_BUILDLINK2= YES |