misc/rsnapshot: Updated for version 1.4.2.

4 files changed, 11 insertions, 27 deletions

diff --git a/misc/rsnapshot/README b/misc/rsnapshot/README
index dd625a64a5419..115baf61cc4db 100644
--- a/misc/rsnapshot/README
+++ b/misc/rsnapshot/README
@@ -7,13 +7,13 @@ incrementals.
 rnapshot requires both the editing of the /etc/rsnapshot.conf file and
 the creation of various scripts to run at the intervals specified in the 
 config file. rsnapshot comes with a multitude of example scripts located
-in '/usr/doc/rsnapshot-1.3.1/utils' and has a well documented HOWTO at 
-'/usr/doc/rsnapshot-1.3.1/rsnapshot-HOWTO.en.html'
+in '/usr/doc/rsnapshot-1.4.2/utils' and has a well documented HOWTO at 
+'/usr/doc/rsnapshot-1.4.2/rsnapshot-HOWTO.en.html'
 It is highly recommended for you to read this HOWTO prior to altering your
 configuration.
 
 To get you up and running as quick as possible, I have provided a working 
-config file and scripts located in '/usr/doc/rsnapshot-1.3.1/contrib' 
+config file and scripts located in '/usr/doc/rsnapshot-1.4.2/contrib' 
 This configuration will create incremental backups every 4 hours and will
 store 6 hourly, 7 daily, 4 weekly, and 3 monthly backups at a time. 
 All backups will be stored in the path '/backup' which you will most 
@@ -21,5 +21,5 @@ likely want to change to fit your setup.  It is highly recommended that
 the backup location be a separate physical disk or remote location.
 
 rsnapshot is executed by adding entries into root's crontab.
-There is an example crontab in '/usr/doc/rsnapshot-1.3.1/contrib/crontab'
+There is an example crontab in '/usr/doc/rsnapshot-1.4.2/contrib/crontab'
 with the necessary additions to run the scripts above.
diff --git a/misc/rsnapshot/patch_pod2man.diff b/misc/rsnapshot/patch_pod2man.diff
deleted file mode 100644
index 6d275d528dfbd..0000000000000
--- a/misc/rsnapshot/patch_pod2man.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up rsnapshot-1.3.1/rsnapshot-program.pl.pod2man rsnapshot-1.3.1/rsnapshot-program.pl

---- rsnapshot-1.3.1/rsnapshot-program.pl.pod2man   2013-07-06 00:39:44.500520483 -0700

-+++ rsnapshot-1.3.1/rsnapshot-program.pl   2013-07-06 00:43:17.696767540 -0700

-@@ -6666,6 +6666,8 @@ additional disk space will be taken up.

- 

- =back

- 

-+=back

-+

- Remember that tabs must separate all elements, and that

- there must be a trailing slash on the end of every directory.

-     

diff --git a/misc/rsnapshot/rsnapshot.SlackBuild b/misc/rsnapshot/rsnapshot.SlackBuild
index c20bde65eb050..fe8d6fec358d6 100644
--- a/misc/rsnapshot/rsnapshot.SlackBuild
+++ b/misc/rsnapshot/rsnapshot.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rsnapshot
-VERSION=1.3.1
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.4.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -67,9 +67,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix for the newer pod2man
-patch -p1 < $CWD/patch_pod2man.diff
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -77,14 +74,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make all || exit 1
 make install DESTDIR=$PKG || exit 1
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} +
-)
+find $PKG/usr/man -type f -exec gzip -9 {} + || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING ChangeLog README docs/HOWTOs/rsnapshot-HOWTO.en.html utils \
diff --git a/misc/rsnapshot/rsnapshot.info b/misc/rsnapshot/rsnapshot.info
index 2a5c5c3fc5456..33f4ff183286d 100644
--- a/misc/rsnapshot/rsnapshot.info
+++ b/misc/rsnapshot/rsnapshot.info
@@ -1,8 +1,8 @@
 PRGNAM="rsnapshot"
-VERSION="1.3.1"
+VERSION="1.4.2"
 HOMEPAGE="http://www.rsnapshot.org"
-DOWNLOAD="http://www.rsnapshot.org/downloads/rsnapshot-1.3.1.tar.gz"
-MD5SUM="588f92995dcf60a6ea6df8d94a017e7e"
+DOWNLOAD="http://www.rsnapshot.org/downloads/rsnapshot-1.4.2.tar.gz"
+MD5SUM="860382f19e38fc649f9447397b54e442"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""