From ef8a4adcd396cb44bdcffd9880de30b5258bb2f8 Mon Sep 17 00:00:00 2001 From: Sam Lawrance Date: Sat, 8 Oct 2005 07:09:49 +0000 Subject: - Upgrade rdiff-backup to 1.0.1, which is the logical next version for both rdiff-backup and rdiff-backup-devel. - Remove rdiff-backup-devel and add an entry to MOVED to migrate users to rdiff-backup. - Add an UPDATING to notify users about the incompatibility between the last version of rdiff-backup and version 1.0.1 PR: ports/86108 Submitted by: Vasil Dimov Approved by: Steve Clement (maintainer, rdiff-backup) Peter Schuller (maintainer, rdiff-backup-devel) Discussed with: submitter and a couple of other rdiff-backup users --- MOVED | 1 + UPDATING | 12 +++ sysutils/Makefile | 1 - sysutils/rdiff-backup-devel/Makefile | 39 ---------- sysutils/rdiff-backup-devel/distinfo | 2 - sysutils/rdiff-backup-devel/files/patch-setup.py | 30 ------- sysutils/rdiff-backup-devel/pkg-descr | 12 --- sysutils/rdiff-backup-devel/pkg-message | 5 -- sysutils/rdiff-backup-devel/pkg-plist | 99 ------------------------ sysutils/rdiff-backup/Makefile | 4 +- sysutils/rdiff-backup/distinfo | 4 +- sysutils/rdiff-backup/pkg-descr | 2 +- sysutils/rdiff-backup/pkg-message | 5 -- sysutils/rdiff-backup/pkg-plist | 9 +++ 14 files changed, 26 insertions(+), 199 deletions(-) delete mode 100644 sysutils/rdiff-backup-devel/Makefile delete mode 100644 sysutils/rdiff-backup-devel/distinfo delete mode 100644 sysutils/rdiff-backup-devel/files/patch-setup.py delete mode 100644 sysutils/rdiff-backup-devel/pkg-descr delete mode 100644 sysutils/rdiff-backup-devel/pkg-message delete mode 100644 sysutils/rdiff-backup-devel/pkg-plist delete mode 100644 sysutils/rdiff-backup/pkg-message diff --git a/MOVED b/MOVED index 32909dd662e8..299916218fff 100644 --- a/MOVED +++ b/MOVED @@ -1638,3 +1638,4 @@ russian/bogofilter||2005-10-04|obsoleted by utf-8 support in mail/bogofilter graphics/hs-HOpenGL||2005-10-05|Obsolete, now part of lang/ghc dns/ddup||2005-10-06|Project no longer exists x11-themes/fluxbox-fluxmod||2005-10-07|Project has gone +sysutils/rdiff-backup-devel|sysutils/rdiff-backup|2005-10-08|obsolete diff --git a/UPDATING b/UPDATING index 4d284be9ff18..d314be210519 100644 --- a/UPDATING +++ b/UPDATING @@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20051008: + AFFECTS: users of sysutils/rdiff-backup, rdiff-backup-devel + AUTHOR: lawrance@FreeBSD.org + + sysutils/rdiff-backup has been upgraded to version 1.0.1. This + version is incompatible with the previous version. Users of + rdiff-backup will need to redo their initial seed. + + rdiff-backup-devel has been removed. Users of rdiff-backup-devel + should now use rdiff-backup instead. In this case there is no need + to redo the initial seed. + 20051006: AFFECTS: users of net/smokeping AUTHOR: lth@FreeBSD.org diff --git a/sysutils/Makefile b/sysutils/Makefile index e8a95abfc896..4f8c4a780a73 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -432,7 +432,6 @@ SUBDIR += rclean SUBDIR += rdate SUBDIR += rdiff-backup - SUBDIR += rdiff-backup-devel SUBDIR += readlink SUBDIR += reed SUBDIR += rej diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile deleted file mode 100644 index 758264e90197..000000000000 --- a/sysutils/rdiff-backup-devel/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# New ports collection makefile for: rdiff-backup -# Date created: Fri Jun 10 23:30:39 CEST 2005 -# Whom: Peter Schuller -# -# $FreeBSD$ -# - -PORTNAME= rdiff-backup-devel -PORTVERSION= 0.13.6 -CATEGORIES= sysutils -MASTER_SITES= http://www.nongnu.org/rdiff-backup/ -DISTNAME= rdiff-backup-${PORTVERSION} - -MAINTAINER= peter.schuller@infidyne.com -COMMENT= Local/remote mirroring+incremental backup - -LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync - -CONFLICTS= rdiff-backup-[0-9]* - -USE_PYTHON= yes -USE_PYDISTUTILS=yes - -MAN1= rdiff-backup.1 - -DOCFILES= CHANGELOG README COPYING FAQ.html -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} - -post-install: - ${INSTALL_MAN} ${WRKSRC}/rdiff-backup.1 ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor - @${CAT} ${PKGMESSAGE} -.endif - -.include diff --git a/sysutils/rdiff-backup-devel/distinfo b/sysutils/rdiff-backup-devel/distinfo deleted file mode 100644 index fe117bbd2454..000000000000 --- a/sysutils/rdiff-backup-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (rdiff-backup-0.13.6.tar.gz) = 97141e12bc8ac0ca873fae84b7f39ac1 -SIZE (rdiff-backup-0.13.6.tar.gz) = 145871 diff --git a/sysutils/rdiff-backup-devel/files/patch-setup.py b/sysutils/rdiff-backup-devel/files/patch-setup.py deleted file mode 100644 index f704a62d2a40..000000000000 --- a/sysutils/rdiff-backup-devel/files/patch-setup.py +++ /dev/null @@ -1,30 +0,0 @@ ---- setup.py.orig Thu Jun 26 15:27:30 2003 -+++ setup.py Thu Jul 3 15:09:19 2003 -@@ -41,6 +41,10 @@ - if '-lrsync' in LIBS: - libname = [] - -+LOCALBASE = os.getenv("LOCALBASE", "/usr/local") -+include_dirs = ["%s/include" % LOCALBASE] -+library_dirs = ["%s/lib" % LOCALBASE] -+ - setup(name="rdiff-backup", - version=version_string, - description="Local/remote mirroring+incremental backup", -@@ -51,12 +55,9 @@ - ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]), - Extension("rdiff_backup._librsync", - ["_librsyncmodule.c"], -- include_dirs=incdir_list, -- library_dirs=libdir_list, -- libraries=libname, -- extra_link_args=lflags_arg)], -+ libraries=["rsync"], -+ include_dirs=include_dirs, -+ library_dirs=library_dirs)], - scripts = ['rdiff-backup'], -- data_files = [('share/man/man1', ['rdiff-backup.1']), -- ('share/doc/rdiff-backup-%s' % (version_string,), -- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])]) -+) - diff --git a/sysutils/rdiff-backup-devel/pkg-descr b/sysutils/rdiff-backup-devel/pkg-descr deleted file mode 100644 index 9fafa799da3f..000000000000 --- a/sysutils/rdiff-backup-devel/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -rdiff-backup backs up one directory to another, possibly over a network. The -target directory ends up a copy of the source directory, but extra reverse -diffs are stored in a special subdirectory of that target directory, so you -can still recover files lost some time ago. The idea is to combine the best -features of a mirror and an incremental backup. rdiff-backup also preserves -subdirectories, hard links, dev files, permissions, uid/gid ownership (if it -is running as root), and modification times. Finally, rdiff-backup can operate -in a bandwidth efficient manner over a pipe, like rsync. Thus you can use -rdiff-backup and ssh to securely back a hard drive up to a remote location, -and only the differences will be transmitted. - -WWW: http://www.nongnu.org/rdiff-backup/ diff --git a/sysutils/rdiff-backup-devel/pkg-message b/sysutils/rdiff-backup-devel/pkg-message deleted file mode 100644 index ccec5521c908..000000000000 --- a/sysutils/rdiff-backup-devel/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -### ---------------------------------------------------------------------- ### -### Upgrading to unstable 0.13.x uses a different archive format. ### -### So if you downgrade from 0.13.x you HAVE TO re-do the initial seed! ### -### Sorry for the inconvenience. ### -### ---------------------------------------------------------------------- ### diff --git a/sysutils/rdiff-backup-devel/pkg-plist b/sysutils/rdiff-backup-devel/pkg-plist deleted file mode 100644 index c2103b488cbc..000000000000 --- a/sysutils/rdiff-backup-devel/pkg-plist +++ /dev/null @@ -1,99 +0,0 @@ -bin/rdiff-backup -%%PYTHON_SITELIBDIR%%/rdiff_backup/C.so -%%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/Globals.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Globals.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Globals.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/Hardlink.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Hardlink.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Hardlink.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/Main.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Main.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Main.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/Rdiff.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Rdiff.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Rdiff.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/Security.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Security.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Security.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/SetConnections.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/SetConnections.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/SetConnections.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/TempFile.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/TempFile.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/TempFile.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/Time.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Time.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Time.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/__init__.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/__init__.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/__init__.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/_librsync.so -%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/iterfile.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/iterfile.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/iterfile.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/lazy.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/lazy.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/lazy.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/librsync.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/librsync.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/librsync.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/log.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/metadata.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/metadata.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/metadata.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/regress.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/regress.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/regress.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/restore.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/restore.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/restore.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/robust.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/robust.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/robust.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/rorpiter.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/rorpiter.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/rorpiter.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/rpath.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/rpath.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/rpath.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/selection.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/selection.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/selection.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/static.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/static.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/static.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/FAQ.html -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/rdiff_backup diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile index b551418b0061..4a400352f98a 100644 --- a/sysutils/rdiff-backup/Makefile +++ b/sysutils/rdiff-backup/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rdiff-backup -PORTVERSION= 0.12.8 +PORTVERSION= 1.0.1 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://savannah.nongnu.org/download/rdiff-backup/ @@ -23,7 +23,6 @@ USE_PYDISTUTILS=yes MAN1= rdiff-backup.1 DOCFILES= CHANGELOG README COPYING FAQ.html -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} post-install: ${INSTALL_MAN} ${WRKSRC}/rdiff-backup.1 ${PREFIX}/man/man1 @@ -32,7 +31,6 @@ post-install: .for file in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor - @${CAT} ${PKGMESSAGE} .endif .include diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo index 958284141e9a..f50e426cc43e 100644 --- a/sysutils/rdiff-backup/distinfo +++ b/sysutils/rdiff-backup/distinfo @@ -1,2 +1,2 @@ -MD5 (rdiff-backup-0.12.8.tar.gz) = 1a16b8e484948942705c7121f394d812 -SIZE (rdiff-backup-0.12.8.tar.gz) = 126592 +MD5 (rdiff-backup-1.0.1.tar.gz) = 765e8c97c696eeb7b19006d9ed0967be +SIZE (rdiff-backup-1.0.1.tar.gz) = 149637 diff --git a/sysutils/rdiff-backup/pkg-descr b/sysutils/rdiff-backup/pkg-descr index 0f36779040b9..9fafa799da3f 100644 --- a/sysutils/rdiff-backup/pkg-descr +++ b/sysutils/rdiff-backup/pkg-descr @@ -9,4 +9,4 @@ in a bandwidth efficient manner over a pipe, like rsync. Thus you can use rdiff-backup and ssh to securely back a hard drive up to a remote location, and only the differences will be transmitted. -WWW: http://rdiff-backup.stanford.edu/ +WWW: http://www.nongnu.org/rdiff-backup/ diff --git a/sysutils/rdiff-backup/pkg-message b/sysutils/rdiff-backup/pkg-message deleted file mode 100644 index ccec5521c908..000000000000 --- a/sysutils/rdiff-backup/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -### ---------------------------------------------------------------------- ### -### Upgrading to unstable 0.13.x uses a different archive format. ### -### So if you downgrade from 0.13.x you HAVE TO re-do the initial seed! ### -### Sorry for the inconvenience. ### -### ---------------------------------------------------------------------- ### diff --git a/sysutils/rdiff-backup/pkg-plist b/sysutils/rdiff-backup/pkg-plist index ea48405e5e5c..c2103b488cbc 100644 --- a/sysutils/rdiff-backup/pkg-plist +++ b/sysutils/rdiff-backup/pkg-plist @@ -37,6 +37,12 @@ bin/rdiff-backup %%PYTHON_SITELIBDIR%%/rdiff_backup/connection.py %%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyc %%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyo +%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.py +%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.pyo +%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.py +%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/increment.py %%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyc %%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyo @@ -82,6 +88,9 @@ bin/rdiff-backup %%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.py %%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.pyc %%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.pyo +%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py +%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/FAQ.html -- cgit v1.2.3