diff options
| -rw-r--r-- | sysutils/bacula/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/bacula/options.mk | 5 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-ao | 15 |
3 files changed, 18 insertions, 6 deletions
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 5f8bf58fdd0..f5f45543c80 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2011/03/06 03:29:02 dholland Exp $ +$NetBSD: distinfo,v 1.45 2011/06/18 10:40:33 shattered Exp $ SHA1 (bacula-5.0.3.tar.gz) = 4ced1c4f8984a063a1134b59968d163243017611 RMD160 (bacula-5.0.3.tar.gz) = 0ae8f303b379daffdf09e4eab9b35182759add41 @@ -15,6 +15,6 @@ SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2 SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d SHA1 (patch-an) = dbad88c5a6f60c501176103e794e85ab9400dd1a -SHA1 (patch-ao) = d1d7f529950d144c63af0e9d033497a7cc77d4fe +SHA1 (patch-ao) = eae5e8fb98b61e23285d89d70824181308993ace SHA1 (patch-ap) = 383a4449e6503e518bc40d2053127e5968ad3cd4 SHA1 (patch-aq) = a8cabf3b43e1a2a878105875d68d5b000fe6632a diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk index 8ff1e2ef534..cb33c7da72d 100644 --- a/sysutils/bacula/options.mk +++ b/sysutils/bacula/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2010/03/11 16:03:49 adam Exp $ +# $NetBSD: options.mk,v 1.17 2011/06/18 10:40:33 shattered Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bacula PKG_SUPPORTED_OPTIONS= bacula-static ssl python @@ -25,7 +25,8 @@ BACULA_DB= mysql .if !empty(PKG_OPTIONS:Mpython) . include "../../lang/python/application.mk" . include "${PYPKGSRCDIR}/buildlink3.mk" -CONFIGURE_ARGS+= --with-python=${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYINC} +CONFIGURE_ARGS+= --with-python=yes +CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} # we can't use REPLACE_INTERPRETER here because ./configure fills in the # python path and the replace-interpreter stage happens before that. SUBST_CLASSES+= python diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-ao index b8cc6c296f8..9ebef601116 100644 --- a/sysutils/bacula/patches/patch-ao +++ b/sysutils/bacula/patches/patch-ao @@ -1,8 +1,19 @@ -$NetBSD: patch-ao,v 1.5 2010/12/26 18:39:46 adam Exp $ +$NetBSD: patch-ao,v 1.6 2011/06/18 10:40:33 shattered Exp $ --- configure.orig 2010-08-05 14:29:51.000000000 +0000 +++ configure -@@ -47521,7 +47521,7 @@ echo "$as_me: error: Could not find qmak +@@ -26254,8 +26254,8 @@ if test "${with_python+set}" = set; then + PYTHON_INCDIR=`/usr/bin/python-config --includes` + PYTHON_LIBS=`/usr/bin/python-config --libs` + else +- for python_root in /usr /usr/local /usr/sfw; do +- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do ++ for python_root in ${PREFIX}; do ++ for ver in python${PYVERSSUFFIX}; do + if test -f $python_root/include/${ver}/Python.h; then + PYTHON_INCDIR=-I$python_root/include/${ver} + if test -d $python_root/lib64/${ver}/config; then +@@ -47521,7 +47523,7 @@ echo "$as_me: error: Could not find qmak { (exit 1); exit 1; }; } fi |