diff options
| author | vd <vd@FreeBSD.org> | 2009-02-01 15:07:46 +0800 |
|---|---|---|
| committer | vd <vd@FreeBSD.org> | 2009-02-01 15:07:46 +0800 |
| commit | dc7b3932a14a66bd9f558c8d8c066b0e4a19fb7a (patch) | |
| tree | ce132a27e541e5b5476f3d0a3f98b9cbdc337363 /sysutils | |
| parent | f800ffc54c6278c61f9c21ab35241154118a129b (diff) | |
| download | freebsd-ports-gnome-dc7b3932a14a66bd9f558c8d8c066b0e4a19fb7a.tar.gz freebsd-ports-gnome-dc7b3932a14a66bd9f558c8d8c066b0e4a19fb7a.tar.zst freebsd-ports-gnome-dc7b3932a14a66bd9f558c8d8c066b0e4a19fb7a.zip | |
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 |