Import of pkgsrc-2014Q1

2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
@@ -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
@@ -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;