diff options
| author | lofi <lofi@FreeBSD.org> | 2004-02-06 03:29:28 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2004-02-06 03:29:28 +0800 |
| commit | e78d1f3e414dd3eed817b52b940649330f702c6f (patch) | |
| tree | 4719ab9f998fcf9369ec824e1f9ed6b1eadf3580 | |
| parent | 2c05fbdd09e588b0ed8ab52ec395b57fe5eed722 (diff) | |
| download | freebsd-ports-gnome-e78d1f3e414dd3eed817b52b940649330f702c6f.tar.gz freebsd-ports-gnome-e78d1f3e414dd3eed817b52b940649330f702c6f.tar.zst freebsd-ports-gnome-e78d1f3e414dd3eed817b52b940649330f702c6f.zip | |
Some headers got moved from kdebase to kdelibs and now kdelibs-3.2.0
install files conflicting with files from kdebase-3.1.x. Declare CONFLICTS
as appropriate. This will not fix automatic portupgrading, but at least
things should go smoothly with the necessary manual intervention of pkg_
deleting kdebase-3.1.x. Sorry. :-(
| -rw-r--r-- | x11/kdelibs3/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdelibs4/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index e0b41995dea9..642b96f956c2 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -16,6 +16,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= This is the base set of libraries needed by KDE programs +CONFLICTS= kdebase-3.1.* + BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ artsc.0:${PORTSDIR}/audio/arts \ diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index e0b41995dea9..642b96f956c2 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -16,6 +16,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= This is the base set of libraries needed by KDE programs +CONFLICTS= kdebase-3.1.* + BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ artsc.0:${PORTSDIR}/audio/arts \ |