From e668126dfbc94e24dc3d3d6d0fc669c1d0ecf005 Mon Sep 17 00:00:00 2001
From: jung <jung@openbsd.org>
Date: Tue, 5 Jan 2016 13:14:45 +0000
Subject: [PATCH] switch to github variables and update to 1.4.2

ok ajacoutot
---
 net/rsnapshot/Makefile                        | 19 +++++++++++++++----
 net/rsnapshot/distinfo                        |  4 ++--
 net/rsnapshot/patches/patch-configure_ac      |  9 +++++++++
 .../patches/patch-rsnapshot_conf_default_in   | 10 +++++-----
 4 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 net/rsnapshot/patches/patch-configure_ac

diff --git a/net/rsnapshot/Makefile b/net/rsnapshot/Makefile
index 431f441d51f..3ef9a9a4942 100644
--- a/net/rsnapshot/Makefile
+++ b/net/rsnapshot/Makefile
@@ -1,8 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2015/08/19 09:26:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2016/01/05 13:14:45 jung Exp $
 
 COMMENT=		remote filesystem snapshot utility
 
-DISTNAME=		rsnapshot-1.4.1
+GH_ACCOUNT=		rsnapshot
+GH_PROJECT=		rsnapshot
+GH_TAGNAME=		1.4.2
+
 CATEGORIES=		net sysutils
 
 HOMEPAGE=		http://www.rsnapshot.org/
@@ -12,9 +15,12 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		http://www.rsnapshot.org/downloads/
+AUTOCONF_VERSION=	2.69
+AUTOMAKE_VERSION=	1.15
 
-BUILD_DEPENDS=		net/rsync
+BUILD_DEPENDS=		${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS} \
+			net/rsync
 
 RUN_DEPENDS=		devel/p5-Lchown \
 			net/rsync
@@ -26,6 +32,11 @@ CONFIGURE_STYLE=	gnu
 SAMPLES_DIR=		${PREFIX}/share/examples/rsnapshot
 FAKE_FLAGS=		sysconfdir=${SAMPLES_DIR}
 
+pre-configure:
+			cd ${WRKSRC} && \
+			    env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+			    AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autogen.sh
+
 pre-build:
 	perl -pi -e 's,/etc/rsnapshot.conf,${SYSCONFDIR}/rsnapshot.conf,g' \
 		${WRKSRC}/{README.md,rsnapshot-program.pl} \
diff --git a/net/rsnapshot/distinfo b/net/rsnapshot/distinfo
index f47b84c6534..3c889ae32d9 100644
--- a/net/rsnapshot/distinfo
+++ b/net/rsnapshot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsnapshot-1.4.1.tar.gz) = +0oRKafTgFxBdJ/QSU3r/iyiNB66D4tQ5PVJhe/kSOg=
-SIZE (rsnapshot-1.4.1.tar.gz) = 489481
+SHA256 (rsnapshot-1.4.2.tar.gz) = xHLRJFv+OfsPRkt+JLRxDKfdno3CQZaYj7hJ7/c9lGY=
+SIZE (rsnapshot-1.4.2.tar.gz) = 373231
diff --git a/net/rsnapshot/patches/patch-configure_ac b/net/rsnapshot/patches/patch-configure_ac
new file mode 100644
index 00000000000..b8e2ab453c9
--- /dev/null
+++ b/net/rsnapshot/patches/patch-configure_ac
@@ -0,0 +1,9 @@
+$OpenBSD: patch-configure_ac,v 1.1 2016/01/05 13:14:45 jung Exp $
+--- configure.ac.orig	Tue Jan  5 11:06:20 2016
++++ configure.ac	Tue Jan  5 11:07:07 2016
+@@ -1,4 +1,4 @@
+-AC_INIT([rsnapshot],[m4_esyscmd_s([git describe --tags --always --dirty])],[rsnapshot-discuss@lists.sourceforge.net])
++AC_INIT([rsnapshot],[1.4.2],[rsnapshot-discuss@lists.sourceforge.net])
+ AM_INIT_AUTOMAKE([foreign])
+ AC_PROG_MAKE_SET
+ AC_CONFIG_FILES(Makefile)
diff --git a/net/rsnapshot/patches/patch-rsnapshot_conf_default_in b/net/rsnapshot/patches/patch-rsnapshot_conf_default_in
index 8aac286a354..abc76f5e085 100644
--- a/net/rsnapshot/patches/patch-rsnapshot_conf_default_in
+++ b/net/rsnapshot/patches/patch-rsnapshot_conf_default_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-rsnapshot_conf_default_in,v 1.4 2015/07/03 07:29:58 ajacoutot Exp $
---- rsnapshot.conf.default.in.orig	Wed Jul  1 23:19:55 2015
-+++ rsnapshot.conf.default.in	Fri Jul  3 09:29:28 2015
+$OpenBSD: patch-rsnapshot_conf_default_in,v 1.5 2016/01/05 13:14:45 jung Exp $
+--- rsnapshot.conf.default.in.orig	Tue Dec  8 01:27:02 2015
++++ rsnapshot.conf.default.in	Tue Jan  5 10:56:59 2016
 @@ -50,7 +50,7 @@ snapshot_root	/.snapshots/
  
  # Uncomment this to enable remote ssh backups over rsync.
@@ -10,7 +10,7 @@ $OpenBSD: patch-rsnapshot_conf_default_in,v 1.4 2015/07/03 07:29:58 ajacoutot Ex
  
  # Comment this out to disable syslog support.
  #
-@@ -168,7 +168,7 @@ lockfile	/var/run/rsnapshot.pid
+@@ -174,7 +174,7 @@ lockfile	/var/run/rsnapshot.pid
  # This is the best way to support special files (FIFOs, etc) cross-platform.
  # The default is 0 (off).
  #
@@ -19,7 +19,7 @@ $OpenBSD: patch-rsnapshot_conf_default_in,v 1.4 2015/07/03 07:29:58 ajacoutot Ex
  
  # When sync_first is enabled, it changes the default behaviour of rsnapshot.
  # Normally, when rsnapshot is called with its lowest interval
-@@ -217,9 +217,9 @@ lockfile	/var/run/rsnapshot.pid
+@@ -223,9 +223,9 @@ lockfile	/var/run/rsnapshot.pid
  ###############################
  
  # LOCALHOST