aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftp/proftpd-devel/Makefile2
-rw-r--r--ftp/proftpd/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 692ea24e7499..13fe10250b1c 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -59,6 +59,8 @@ USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:261
GNU_CONFIGURE= yes
+CONFLICTS= proftpd-1.[0-9].*
+
USE_RC_SUBR= proftpd.sh
CONFIGURE_ARGS= --localstatedir=/var/run \
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 08782b5a904c..0db0f44c30b1 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -56,6 +56,8 @@ USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:261
GNU_CONFIGURE= yes
+CONFLICTS= proftpd-devel-1.[0-9].*
+
USE_RC_SUBR= proftpd.sh
CONFIGURE_ARGS= --localstatedir=/var/run \