summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshattered <shattered@pkgsrc.org>2013-05-19 11:00:03 +0000
committershattered <shattered@pkgsrc.org>2013-05-19 11:00:03 +0000
commit8f63418bc566aa61c9f161a4b481daee066d84ca (patch)
tree085df207ea58d0e32e501f1a74795c0566beabe4
parent038544186a9a2010a472496b43b1370f6324d86e (diff)
downloadpkgsrc-8f63418bc566aa61c9f161a4b481daee066d84ca.tar.gz
Remove 'python' option (was required for DVD support) and 'bacula-static'
option (broken upstream, no sign of a upcoming fix)
-rw-r--r--sysutils/bacula/Makefile4
-rw-r--r--sysutils/bacula/PLIST.common4
-rw-r--r--sysutils/bacula/PLIST.server4
-rw-r--r--sysutils/bacula/options.mk30
4 files changed, 6 insertions, 36 deletions
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 606d16988da..ef551e82451 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2013/05/09 07:40:30 adam Exp $
+# $NetBSD: Makefile,v 1.50 2013/05/19 11:00:03 shattered Exp $
-PKGREVISION= 6
+PKGREVISION= 7
CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]*
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index 523df2e1d7e..7d240ae0f5e 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.16 2013/04/25 20:41:33 shattered Exp $
+@comment $NetBSD: PLIST.common,v 1.17 2013/05/19 11:00:03 shattered Exp $
lib/bpipe-fd.la
lib/libbac.la
lib/libbaccfg.la
@@ -39,8 +39,6 @@ sbin/bacula
sbin/bacula-fd
sbin/bconsole
sbin/btraceback
-${STATIC}sbin/static-bacula-fd
-${STATIC}sbin/static-bconsole
share/doc/bacula/ChangeLog
share/doc/bacula/INSTALL
share/doc/bacula/LICENSE
diff --git a/sysutils/bacula/PLIST.server b/sysutils/bacula/PLIST.server
index 8f26350c96e..b39729aa31f 100644
--- a/sysutils/bacula/PLIST.server
+++ b/sysutils/bacula/PLIST.server
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.server,v 1.11 2013/04/25 20:41:33 shattered Exp $
+@comment $NetBSD: PLIST.server,v 1.12 2013/05/19 11:00:03 shattered Exp $
lib/libbaccats.la
lib/libbaccats-${BACULA_DB}.la
lib/libbacsql.la
@@ -29,8 +29,6 @@ sbin/bsmtp
sbin/btape
sbin/bwild
sbin/dbcheck
-${STATIC}sbin/static-bacula-dir
-${STATIC}sbin/static-bacula-sd
share/examples/bacula/bacula-dir.conf
share/examples/bacula/bacula-sd.conf
share/examples/rc.d/bacula
diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk
index aea73434265..e1f8e92381b 100644
--- a/sysutils/bacula/options.mk
+++ b/sysutils/bacula/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.19 2012/09/08 12:36:57 shattered Exp $
+# $NetBSD: options.mk,v 1.20 2013/05/19 11:00:03 shattered Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.bacula
-# bacula-static is broken -- see PR 42954
-PKG_SUPPORTED_OPTIONS= ssl python
+PKG_SUPPORTED_OPTIONS= ssl
PKG_OPTIONS_REQUIRED_GROUPS= database
PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql
PKG_SUGGESTED_OPTIONS= catalog-sqlite3
@@ -23,31 +22,6 @@ CONFIGURE_ARGS+= --with-mysql=${PREFIX}
BACULA_DB= mysql
.endif
-.if !empty(PKG_OPTIONS:Mpython)
-. include "../../lang/python/application.mk"
-. include "${PYPKGSRCDIR}/buildlink3.mk"
-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
-SUBST_MESSAGE.python= Fixing Python interpreter path.
-SUBST_STAGE.python= post-configure
-SUBST_FILES.python= scripts/dvd-handler
-SUBST_SED.python= -e '1s,^\#!.*,\#! ${PYTHONBIN},'
-.endif
-
-.if !empty(PKG_OPTIONS:Mbacula-static)
-CONFIGURE_ARGS+= --enable-static-cons
-CONFIGURE_ARGS+= --enable-static-dir
-CONFIGURE_ARGS+= --enable-static-fd
-CONFIGURE_ARGS+= --enable-static-sd
-CONFIGURE_ARGS+= --enable-static-tools
-PLIST_SUBST+= STATIC=
-.else
-PLIST_SUBST+= STATIC="@comment "
-.endif
-
.if !empty(PKG_OPTIONS:Mssl)
. include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}