diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2008-04-18 09:38:32 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2008-04-18 09:38:32 +0000 |
| commit | 37feb685b1f3ebdbb470537d7128c908ce5e05c6 (patch) | |
| tree | 396cd6a94b97d85f2f8d4c2e558a93288f2f3b77 /ftp | |
| parent | Update to 2.71 (diff) | |
- Add conflicts
Notes
Notes:
svn path=/head/; revision=211523
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 2 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 2 |
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 \ |