Import of pkgsrc-2014Q1

sysutils/amanda-common/Makefile

@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.61 2013/05/31 12:41:59 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2013/12/13 16:27:34 schnoebe Exp $
 
 PKGNAME=		amanda-common-${AMANDA_VERSION}
-PKGREVISION=		3
+PKGREVISION=		5
 SVR4_PKGNAME=		amaco
 
 COMMENT=		Common libraries and binaries for Amanda
 
 .include "../../sysutils/amanda-common/Makefile.common"
 
-.if ${OPSYS} == "SunOS"
-CPPFLAGS+=		-D_LARGEFILE64_SOURCE
-.endif
+CPPFLAGS.SunOS+=	-D_LARGEFILE64_SOURCE
+LDFLAGS.SunOS+=		-lsocket
 
 CONFIGURE_ARGS+=	--without-server --without-client --without-gnuplot
 

sysutils/amanda-common/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2012/09/25 05:04:36 sbd Exp $
+$NetBSD: distinfo,v 1.14 2014/01/06 22:15:06 joerg Exp $
 
 SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98
 RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d
@@ -9,6 +9,7 @@ SHA1 (patch-application-src_Makefile.am) = 3a5f256ab7e2439c2e19c4f75234d3a677707
 SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442
 SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec
 SHA1 (patch-client-src_sendsize.c) = 32a1627c250b6413e4695a610bba59796c6e7ed6
+SHA1 (patch-common-src_Makefile.in) = 422e4d519d8797e686d62cfeca8cda2e8a4a8bb3
 SHA1 (patch-common-src_glib-util.c) = 8b62499f6730843fbf9e872adc80978b77b5573f
 SHA1 (patch-common-src_glib-util.h) = 6d5b14acd7a44b17a52ebc697f5354db2a4b04f9
 SHA1 (patch-common-src_security-util.h) = c628cc19a624da2cfabdb7d488bc2cd2d4b955a4
@@ -18,6 +19,7 @@ SHA1 (patch-config_macro-archive_xsltproc.m4) = 20324db1ce3db016fa89fe39df5a8133
 SHA1 (patch-device-src_Makefile.am) = 29fd554033ff0ff7b1d98a08306f157ced7324c5
 SHA1 (patch-example_Makefile.am) = 8d2dac1abdc473fbf94489bcb620a42a665fd27a
 SHA1 (patch-oldrecover-src_Makefile.am) = 9127c1523937da3955662cc0b0921d05bca75248
+SHA1 (patch-perl_Amanda_Xfer.pm) = 7389672ce0ed08d8b5f6548a6bb466ef4e18ab1d
 SHA1 (patch-perl_Makefile.am) = 7b09e5cc30c9b441dae03b06bef5c757c93ff9f7
 SHA1 (patch-perl_amglue_Makefile.am) = 051e456a5d34dd19a11ccd45c32f078e72d16e6f
 SHA1 (patch-recover-src_Makefile.am) = cd2ee55a0b285a33903e6157260cf167a1c79249

sysutils/amanda-common/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2012/07/30 07:21:11 sbd Exp $
+# $NetBSD: options.mk,v 1.10 2013/12/13 12:42:12 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amanda
 # Common options.
@@ -37,6 +37,9 @@ CONFIGURE_ENV+=		ac_cv_path_SSH=${SSHPREFIX}/bin/ssh
 .endif
 
 .if !empty(PKG_OPTIONS:Mkerberos)
+.  if ${OPSYS} == "SunOS"
+USE_BUILTIN.mit-krb5=	no
+.  endif
 CONFIGURE_ARGS+=	--with-krb5-security=${KRB5BASE:Q}
 .  include "../../mk/krb5.buildlink3.mk"
 .endif

sysutils/amanda-common/patches/patch-common-src_Makefile.in

@@ -0,0 +1,12 @@
+$NetBSD: patch-common-src_Makefile.in,v 1.1 2014/01/06 22:15:06 joerg Exp $
+
+--- common-src/Makefile.in.orig	2014-01-05 23:13:17.000000000 +0000
++++ common-src/Makefile.in
+@@ -1704,6 +1704,7 @@ genversion_SOURCES = genversion.c svn-in
+ genversion_LDADD = $(libamanda_la_LIBADD)	\
+ 	../gnulib/libgnu.la
+ 
++genversion.la: genversion.h
+ 
+ # these are used for testing only:
+ TEST_PROGS = file bsdsecurity

sysutils/amanda-common/patches/patch-perl_Amanda_Xfer.pm

@@ -0,0 +1,19 @@
+$NetBSD: patch-perl_Amanda_Xfer.pm,v 1.1 2013/12/13 16:27:34 schnoebe Exp $
+
+Rather than try to conditionally eval in Amanda::XferServer based on the
+value of Amanda::Constants::AMANDA_COMPONENTS, unconditionally attempt
+to eval it in. The end result is the same.
+
+--- perl/Amanda/Xfer.pm.orig	2012-02-21 11:39:17.000000000 +0000
++++ perl/Amanda/Xfer.pm
+@@ -897,9 +897,6 @@ package Amanda::Xfer;
+ # try to load Amanda::XferServer, which is server-only.  If it's not found, then
+ # its classes just remain undefined.
+ BEGIN {
+-    use Amanda::Util;
+-    if (Amanda::Util::built_with_component("server")) {
+-	eval "use Amanda::XferServer;";
+-    }
++      eval "use Amanda::XferServer;";
+ }
+ 1;