Import of pkgsrc-2016Q3

sysutils/amanda-common/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2015/08/09 22:50:09 dholland Exp $
+# $NetBSD: Makefile,v 1.74 2016/07/09 06:38:58 wiz Exp $
 
 PKGNAME=		amanda-common-${AMANDA_VERSION}
-PKGREVISION=		9
+PKGREVISION=		11
 
 COMMENT=		Common libraries and binaries for Amanda
 

sysutils/amanda-common/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2014/09/25 21:47:06 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.42 2016/02/29 05:50:40 mlelstv Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
@@ -81,10 +81,11 @@ CONFIGURE_ARGS+=	--with-dump-honor-nodump
 CONFIGURE_ARGS+=	--disable-installperms
 
 LDFLAGS.SunOS+=		-lsocket
+LDFLAGS.NetBSD+=	-lutil
 
 INSTALL_MAKE_FLAGS+=	SETUID_GROUP=${ROOT_GROUP}
 
-AMPERLDIR=		${PERLDIR:Q}/${PERL5_SUB_INSTALLVENDORLIB}
+AMPERLDIR=		${PREFIX:Q}/${PERL5_SUB_INSTALLVENDORLIB}
 
 .include "../../sysutils/amanda-common/options.mk"
 
@@ -116,7 +117,7 @@ post-install-extra:
 .if defined(PERL5_MODS) && !empty(PERL5_MODS)
 .  for mod in ${PERL5_MODS}
 	${INSTALL_DATA} ${WRKSRC}/perl/${mod}				\
-		${DESTDIR}${PERLDIR}/${PERL5_SUB_INSTALLVENDORLIB}/${mod}
+		${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}/${mod}
 .  endfor
 .endif
 .if defined(PERL5_LIBS)  && !empty(PERL5_LIBS)
@@ -124,7 +125,7 @@ post-install-extra:
 	${RUN}${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} \
 	  ${WRAPPER_BINDIR}/libtool --mode=install ${INSTALL_LIB}	\
 	    ${WRKSRC}/perl/lib${lib}.la					\
-	    ${DESTDIR}${PERLDIR}/${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${lib}
+	    ${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${lib}
 .  endfor
 .endif
 .if defined(MANPAGES) && !empty(MANPAGES)

sysutils/amanda-common/distinfo

@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.18 2015/08/09 22:50:09 dholland Exp $
+$NetBSD: distinfo,v 1.21 2016/06/11 21:07:27 dholland Exp $
 
 SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98
 RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d
+SHA512 (amanda-3.3.1.tar.gz) = 86b7b127c81e75bdc60bebbaf06e474667c364e66b3c12ed6797f1a5ef6971010bc20e4b596488586e0cde6cdbb7e0a96679cabf04d2e427d9eb2922347ebd66
 Size (amanda-3.3.1.tar.gz) = 4328574 bytes
 SHA1 (patch-Makefile.am) = 005201b7a9b4e875c45362456e100c57fcf700f3
 SHA1 (patch-amandad-src_Makefile.am) = bdff2c06da0ee6c88237c56568fe20c5cefedd7a
 SHA1 (patch-application-src_Makefile.am) = 3a5f256ab7e2439c2e19c4f75234d3a677707cc2
 SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442
+SHA1 (patch-client-src_getfsent.c) = 903a921b8679ddcff1fdd838ffdce16a6d8da46f
 SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec
 SHA1 (patch-client-src_sendsize.c) = 32a1627c250b6413e4695a610bba59796c6e7ed6
 SHA1 (patch-common-src_Makefile.in) = 422e4d519d8797e686d62cfeca8cda2e8a4a8bb3

sysutils/amanda-common/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2015/02/09 18:35:12 gdt Exp $
+# $NetBSD: options.mk,v 1.12 2015/11/25 12:53:29 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amanda
 # Common options.
@@ -30,9 +30,7 @@ CONFIGURE_ARGS+=        --with-ssh-security
 
 .  if !exists(/usr/bin/ssh)
 DEPENDS+=		openssh-[0-9]*:../../security/openssh
-FIND_PREFIX:= 		SSHPREFIX=openssh
-.include "../../mk/find-prefix.mk"
-CONFIGURE_ENV+=		ac_cv_path_SSH=${SSHPREFIX}/bin/ssh
+CONFIGURE_ENV+=		ac_cv_path_SSH=${LOCALBASE}/bin/ssh
 .  endif
 .endif
 

sysutils/amanda-common/patches/patch-client-src_getfsent.c

@@ -0,0 +1,85 @@
+$NetBSD: patch-client-src_getfsent.c,v 1.2 2016/06/11 21:07:28 dholland Exp $
+
+Support looking up devices by name.
+
+--- client-src/getfsent.c.orig	2012-02-21 11:36:41.000000000 +0000
++++ client-src/getfsent.c
+@@ -41,6 +41,12 @@
+ 
+ static char *dev2rdev(char *);
+ 
++#if (defined __NetBSD__ && __NetBSD_Version__ >= 699000000)
++/* #include <util.h> */
++const char     *getdiskrawname(char *, size_t, const char *);
++const char     *getfsspecname(char *, size_t, const char *);
++#endif
++
+ /*
+  * You are in a twisty maze of passages, all alike.
+  * Geesh.
+@@ -74,10 +80,20 @@ get_fstab_nextentry(
+     struct fstab *sys_fsent = getfsent();
+     static char *xfsname = NULL, *xmntdir = NULL;
+     static char *xfstype = NULL, *xmntopts = NULL;
++#if defined __NetBSD__ && __NetBSD_Version__ >= 699000000
++    char buf[MAXPATHLEN];
++    const char *spec;
++#endif
+ 
+     if(!sys_fsent)
+ 	return 0;
++#if defined __NetBSD__ && __NetBSD_Version__ >= 699000000
++    spec = getfsspecname(buf, sizeof(buf), sys_fsent->fs_spec);
++    if (spec == NULL) spec = sys_fsent->fs_spec;
++    fsent->fsname  = xfsname  = newstralloc(xfsname, spec);
++#else
+     fsent->fsname  = xfsname  = newstralloc(xfsname,  sys_fsent->fs_spec);
++#endif
+     fsent->mntdir  = xmntdir  = newstralloc(xmntdir,  sys_fsent->fs_file);
+     fsent->freq    = sys_fsent->fs_freq;
+     fsent->passno  = sys_fsent->fs_passno;
+@@ -429,10 +445,15 @@ static char *
+ dev2rdev(
+     char *	name)
+ {
+-  char *fname = NULL;
+   struct stat st;
++#if (defined __NetBSD__ && __NetBSD_Version__ >= 699000000)
++  char buf[MAXPATHLEN];
++  const char *raw;
++#else
++  char *fname = NULL;
+   char *s;
+   int ch;
++#endif
+ 
+   if(stat(name, &st) == 0 && !S_ISBLK(st.st_mode)) {
+     /*
+@@ -441,6 +462,10 @@ dev2rdev(
+     return stralloc(name);
+   }
+ 
++#if (defined __NetBSD__ && __NetBSD_Version__ >= 699000000)
++  raw = getdiskrawname(buf, sizeof(buf), name);
++  if (raw) return stralloc(raw);
++#else /* ! (defined __NetBSD__ && __NetBSD_Version__ >= 699000000) */
+   s = name;
+   ch = *s++;
+ 
+@@ -464,6 +489,7 @@ dev2rdev(
+     ch = *s++;
+   }
+   amfree(fname);
++#endif
+   return stralloc(name);			/* no match */
+ }
+ 
+@@ -477,6 +503,8 @@ samefile(
+ {
+   int i;
+   for(i = 0; i < 3; ++i) {
++    if (stats[i].st_dev == (dev_t)-1)
++      continue;
+     if (stats[i].st_dev == estat->st_dev &&
+ 	stats[i].st_ino == estat->st_ino)
+       return 1;