diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2009-02-01 07:07:46 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2009-02-01 07:07:46 +0000 |
| commit | 2235cb5daa6806319a64ceaff249623de1dff5a2 (patch) | |
| tree | a5c42dbb9ac7748f7f3cb1758f4d0b9d2a1cef59 /sysutils | |
| parent | - Update to 2.2 (diff) | |
Fix CONFLICTS in rdiff-backup, rdiff-backup-devel and rdiff-backup10.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/rdiff-backup-devel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/rdiff-backup/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/rdiff-backup10/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile index 9b34318d87ea..ee8eb51dd026 100644 --- a/sysutils/rdiff-backup-devel/Makefile +++ b/sysutils/rdiff-backup-devel/Makefile @@ -21,7 +21,7 @@ COMMENT= Local/remote mirroring+incremental backup LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync -CONFLICTS= rdiff-backup-[0-9]* rdiff-backup10-[0-9]* +CONFLICTS= rdiff-backup-[0-9]* USE_PYTHON= yes USE_PYDISTUTILS=yes diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile index 186240627984..18efba084647 100644 --- a/sysutils/rdiff-backup/Makefile +++ b/sysutils/rdiff-backup/Makefile @@ -21,7 +21,7 @@ COMMENT= Local/remote mirroring+incremental backup LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync -CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup10-[0-9]* +CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup-1.0* USE_PYTHON= yes USE_PYDISTUTILS=yes diff --git a/sysutils/rdiff-backup10/Makefile b/sysutils/rdiff-backup10/Makefile index 4baa0ed4c142..c42b4212c62f 100644 --- a/sysutils/rdiff-backup10/Makefile +++ b/sysutils/rdiff-backup10/Makefile @@ -22,7 +22,7 @@ COMMENT= Local/remote mirroring+incremental backup LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync -CONFLICTS= rdiff-backup-[0-9]* rdiff-backup-devel-[0-9]* +CONFLICTS= rdiff-backup-1.2* rdiff-backup-devel-[0-9]* USE_PYTHON= yes USE_PYDISTUTILS=yes |