summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarved <arved@FreeBSD.org>2004-02-07 11:53:23 +0000
committerarved <arved@FreeBSD.org>2004-02-07 11:53:23 +0000
commit1f8f2f200aca15cd36c5c224f64eb75e20fc2fef (patch)
tree2e507a35574a79b9d80fa8b2f393b65716365aac
parent217b3db896703fa04887e6b8ff169af95d6dc4bd (diff)
downloadFreeBSD-ports-1f8f2f200aca15cd36c5c224f64eb75e20fc2fef.zip
FreeBSD-ports-1f8f2f200aca15cd36c5c224f64eb75e20fc2fef.tar.gz
Add conflicts to kdenetwork-3.1.* to help avoiding upgradeproblems.
kmail was moved from kdenetwork to kdepim, so kdenetwork needs to be upgraded before kdepim. Submitted by: Andy Fawcett
-rw-r--r--deskutils/kdepim3/Makefile2
-rw-r--r--deskutils/kdepim4/Makefile2
-rw-r--r--deskutils/kdepim44/Makefile2
3 files changed, 6 insertions, 0 deletions
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 8cd890f..755b6d1 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -16,6 +16,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Personal Information Management tools for KDE
+CONFLICTS= kdenetwork-3.1*
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 8cd890f..755b6d1 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -16,6 +16,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Personal Information Management tools for KDE
+CONFLICTS= kdenetwork-3.1*
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 8cd890f..755b6d1 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -16,6 +16,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Personal Information Management tools for KDE
+CONFLICTS= kdenetwork-3.1*
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
OpenPOWER on IntegriCloud