diff options
| -rw-r--r-- | misc/koffice3/Makefile | 5 | ||||
| -rw-r--r-- | x11/kdelibs3/Makefile | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/misc/koffice3/Makefile b/misc/koffice3/Makefile index 3a63ebb16f7..7cc55b0cc80 100644 --- a/misc/koffice3/Makefile +++ b/misc/koffice3/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2002/10/06 03:36:19 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/10/06 03:38:58 jlam Exp $ .include "../koffice/Makefile.common" DISTNAME= koffice-${VERSION} PKGNAME= ${DISTNAME:S/^koffice/koffice3/} +PKGREVISION= 1 MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.1.1-kde3/src/ \ ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.1.1-kde3/src/ \ ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.1.1-kde3/src/ @@ -11,6 +12,8 @@ DISTFILES= ${DISTNAME}-kde3.tar.bz2 .include "../../x11/kde3/Makefile.kde3" +CONFLICTS+= kdelibs<=3.0.3nb1 + MAINTAINER= jschauma@netbsd.org USE_BUILDLINK2= # defined diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 590a65b3d99..7378743c02e 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.9 2002/10/01 19:28:34 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/06 03:38:58 jlam Exp $ DISTNAME= kdelibs-3.0.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop .include "../../x11/kde3/Makefile.kde3" +CONFLICTS+= koffice3<=1.1.1 + BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9 BUILDLINK_DEPENDS.qt3-libs= qt3-libs>=3.0.3 |