From 84e6063d4aef608be89e392ae5489d9a09405573 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Fri, 1 Jan 2021 17:02:16 +0000 Subject: [PATCH] security/libprelude[db]: remove optional binding for expired Python 2.7 PR: 249763 PR: 249764 Submitted by: swills --- security/libprelude/Makefile | 5 +---- security/libprelude/pkg-plist | 5 ----- security/libpreludedb/Makefile | 5 +---- security/libpreludedb/pkg-plist | 4 ---- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index f9cc108faadb..b0ffa59def67 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt -OPTIONS_DEFINE= DOCS PERL PYTHON +OPTIONS_DEFINE= DOCS PERL OPTIONS_SUB= yes USES= charsetfix gettext-runtime gmake iconv libtool pathfix pkgconfig @@ -35,9 +35,6 @@ ETCDIR= ${PREFIX}/etc/prelude PERL_CONFIGURE_WITH= perl=${PERL} PERL_USES= perl5 -PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD} -PYTHON_USES= python:2.7 -PYTHON_PLIST_SUB= VERSION="${PORTVERSION}" post-install: .for f in client.conf global.conf idmef-client.conf tls.conf diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist index 742ca4fbbfbf..1aaa008f7880 100644 --- a/security/libprelude/pkg-plist +++ b/security/libprelude/pkg-plist @@ -74,10 +74,6 @@ lib/libpreludecpp.so.8 lib/libpreludecpp.so.8.0.0 %%PERL%%%%SITE_ARCH%%/Prelude.pm %%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info -%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc libdata/pkgconfig/libprelude.pc man/man1/prelude-admin.1.gz share/aclocal/libprelude.m4 @@ -129,6 +125,5 @@ share/aclocal/libprelude.m4 %%PORTDOCS%%share/gtk-doc/html/libprelude/up.png %%DATADIR%%/swig/libpreludecpp.i %%PERL%%%%DATADIR%%/swig/perl/libpreludecpp-perl.i -%%PYTHON%%%%DATADIR%%/swig/python/libpreludecpp-python.i @dir(,,711) %%ETCDIR%%/profile @dir(,,711) /var/spool/prelude diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile index d4143fef593f..03c4453b4e68 100644 --- a/security/libpreludedb/Makefile +++ b/security/libpreludedb/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --without-swig \ INSTALL_TARGET= install-strip USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS PYTHON +OPTIONS_DEFINE= DOCS OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= MYSQL @@ -34,9 +34,6 @@ MYSQL_CONFIGURE_WITH= mysql PGSQL_DESC= PostgreSQL plugin PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgresql -PYTHON_USES= python:2.7 -PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD} -PYTHON_PLIST_SUB= VERSION=${PORTVERSION} SQLITE_DESC= SQLite3 plugin SQLITE_USES= sqlite SQLITE_CONFIGURE_WITH= sqlite3 diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist index fe1566b53ef7..44f8d63dae5e 100644 --- a/security/libpreludedb/pkg-plist +++ b/security/libpreludedb/pkg-plist @@ -21,10 +21,6 @@ lib/libpreludedb/plugins/formats/classic.so %%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so %%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so %%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-%%VERSION%%-py%%PYTHON_VER%%.egg-info -%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc man/man1/preludedb-admin.1.gz share/aclocal/libpreludedb.m4 %%PORTDOCS%%share/gtk-doc/html/libpreludedb/api-index-full.html