diff options
| -rw-r--r-- | sysutils/amanda-common/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/amanda-common/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/amanda-common/patches/patch-perl_Amanda_Xfer.pm | 19 |
3 files changed, 23 insertions, 3 deletions
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index c74df2deccc..518c502a073 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2013/12/13 12:42:12 jperkin Exp $ +# $NetBSD: Makefile,v 1.64 2013/12/13 16:27:34 schnoebe Exp $ PKGNAME= amanda-common-${AMANDA_VERSION} -PKGREVISION= 4 +PKGREVISION= 5 SVR4_PKGNAME= amaco COMMENT= Common libraries and binaries for Amanda diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo index 775ebef2882..aa2440beca6 100644 --- a/sysutils/amanda-common/distinfo +++ b/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.13 2013/12/13 16:27:34 schnoebe Exp $ SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98 RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d @@ -18,6 +18,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 diff --git a/sysutils/amanda-common/patches/patch-perl_Amanda_Xfer.pm b/sysutils/amanda-common/patches/patch-perl_Amanda_Xfer.pm new file mode 100644 index 00000000000..748314f66b6 --- /dev/null +++ b/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; |