Import of pkgsrc-2016Q3

net/rsync/Makefile

@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.100 2015/09/14 14:00:01 manu Exp $
+# $NetBSD: Makefile,v 1.103 2015/12/23 19:53:24 ryoon Exp $
 
-DISTNAME=	rsync-3.1.1
-PKGREVISION=	2
+DISTNAME=	rsync-3.1.2
 CATEGORIES=	net
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 		http://rsync.samba.org/ftp/rsync/old-versions/  \
 		ftp://ftp.fu-berlin.de/unix/network/rsync/
 
-MAINTAINER=	tron@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rsync.samba.org/
 COMMENT=	Network file distribution/synchronisation utility
 LICENSE=	gnu-gpl-v3
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync
 
-USE_TOOLS+=		perl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-included-popt
 CONFIGURE_ARGS+=	--with-rsyncd-conf=${PKG_SYSCONFDIR}/rsyncd.conf

net/rsync/distinfo

@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.41 2015/09/14 14:00:01 manu Exp $
+$NetBSD: distinfo,v 1.44 2015/12/23 19:53:24 ryoon Exp $
 
-SHA1 (rsync-3.1.1.tar.gz) = c84faba04f721d393feccfa0476bfeed9b5b5250
-RMD160 (rsync-3.1.1.tar.gz) = de7ad955cb05d481a963aa30423790f3d82efe7b
-Size (rsync-3.1.1.tar.gz) = 890124 bytes
+SHA1 (rsync-3.1.2.tar.gz) = 0d4c7fb7fe3fc80eeff922a7c1d81df11dbb8a1a
+RMD160 (rsync-3.1.2.tar.gz) = f7d6c0c9752af8d9eb933cffc6032c1763490a04
+SHA512 (rsync-3.1.2.tar.gz) = 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
+Size (rsync-3.1.2.tar.gz) = 892724 bytes
+SHA1 (patch-Makefile.in) = df3479e93de86524a391433a3d6e6108a797835a
 SHA1 (patch-ab) = 98aa07a50314e3309b48f803d6febb1138eae1f2
-SHA1 (patch-config.h.in) = 81c927bc687a0194e1a227e6ff02181d638498bd
-SHA1 (patch-configure.ac) = 1df4fd9a67d08790eb7d433eadbc9b5590ba1257
-SHA1 (patch-configure.sh) = 49d8ddea4669d14ba77625d33255df0072f5c3e4

net/rsync/files/smf/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
@@ -19,7 +19,6 @@
     <property_group name="application" type="application">
       <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/rsyncd.conf" />
     </property_group>
-    <stability value="Evolving" />
     <template>
       <common_name>
         <loctext xml:lang="C">rsyncd daemon</loctext>

net/rsync/patches/patch-Makefile.in

@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/11/13 13:41:39 wiz Exp $
+
+https://bugzilla.samba.org/show_bug.cgi?id=11594
+
+--- Makefile.in.orig	2013-06-15 23:40:10.000000000 +0000
++++ Makefile.in
+@@ -205,7 +205,7 @@ proto: proto.h-tstamp
+ proto.h: proto.h-tstamp
+ 	@if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi
+ 
+-proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
++proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
+ 	perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
+ 
+ man: rsync.1 rsyncd.conf.5 man-copy

net/rsync/patches/patch-config.h.in

@@ -1,17 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.1 2015/09/14 14:00:01 manu Exp $
-
-NetBSD extended attribute support, from upstream
-
---- config.h.in.orig	2015-09-03 03:45:23.000000000 +0200
-+++ config.h.in	2015-09-03 03:45:36.000000000 +0200
-@@ -236,9 +236,9 @@
- 
- /* Define to 1 if you have the <linux/falloc.h> header file. */
- #undef HAVE_LINUX_FALLOC_H
- 
--/* True if you have Linux xattrs */
-+/* True if you have Linux xattrs (or equivalent) */
- #undef HAVE_LINUX_XATTRS
- 
- /* Define to 1 if you have the `locale_charset' function. */
- #undef HAVE_LOCALE_CHARSET

net/rsync/patches/patch-configure.ac

@@ -1,33 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/09/14 14:00:01 manu Exp $
-
-NetBSD extended attribute support, from upstream
-
-From 1983198097f57cb9c2eb44ae51cbf8c2cabccbe4 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayned@samba.org>
-Date: Wed, 2 Sep 2015 12:20:50 -0700
-Subject: [PATCH] Add support for netbsd in xattrs case. Closes bug-suggestion
- 11484.
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git configure.ac configure.ac
-index 3aca2a1..0478ba8 100644
---- configure.ac
-+++ configure.ac
-@@ -1022,9 +1022,9 @@ if test x"$enable_xattr_support" = x"no"; then
-     AC_MSG_RESULT(no)
- else
-     case "$host_os" in
--    *linux*)
-+    *linux*|*netbsd*)
- 	AC_MSG_RESULT(Using Linux xattrs)
--	AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
-+	AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs (or equivalent)])
- 	AC_DEFINE(SUPPORT_XATTRS, 1)
- 	AC_DEFINE(NO_SYMLINK_USER_XATTRS, 1, [True if symlinks do not support user xattrs])
- 	AC_CHECK_LIB(attr,getxattr)
--- 
-2.3.2
-

net/rsync/patches/patch-configure.sh

@@ -1,17 +0,0 @@
-$NetBSD: patch-configure.sh,v 1.1 2015/09/14 14:00:01 manu Exp $
-
-NetBSD extended attribute support, from upstream
-
---- configure.sh.orig	2015-09-03 03:42:33.000000000 +0200
-+++ configure.sh	2015-09-03 03:44:27.000000000 +0200
-@@ -8867,9 +8867,9 @@
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- else
-     case "$host_os" in
--    *linux*)
-+    *linux*|*netbsd*)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Linux xattrs" >&5
- $as_echo "Using Linux xattrs" >&6; }
- 
- $as_echo "#define HAVE_LINUX_XATTRS 1" >>confdefs.h