Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Jan 2021 17:02:17 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559855 - in head/security: libprelude libpreludedb
Message-ID:  <202101011702.101H2Hki059004@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Fri Jan  1 17:02:16 2021
New Revision: 559855
URL: https://svnweb.freebsd.org/changeset/ports/559855

Log:
  security/libprelude[db]: remove optional binding for expired Python 2.7
  
  PR:		249763
  PR:		249764
  Submitted by:	swills

Modified:
  head/security/libprelude/Makefile
  head/security/libprelude/pkg-plist
  head/security/libpreludedb/Makefile
  head/security/libpreludedb/pkg-plist

Modified: head/security/libprelude/Makefile
==============================================================================
--- head/security/libprelude/Makefile	Fri Jan  1 16:52:26 2021	(r559854)
+++ head/security/libprelude/Makefile	Fri Jan  1 17:02:16 2021	(r559855)
@@ -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

Modified: head/security/libprelude/pkg-plist
==============================================================================
--- head/security/libprelude/pkg-plist	Fri Jan  1 16:52:26 2021	(r559854)
+++ head/security/libprelude/pkg-plist	Fri Jan  1 17:02:16 2021	(r559855)
@@ -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

Modified: head/security/libpreludedb/Makefile
==============================================================================
--- head/security/libpreludedb/Makefile	Fri Jan  1 16:52:26 2021	(r559854)
+++ head/security/libpreludedb/Makefile	Fri Jan  1 17:02:16 2021	(r559855)
@@ -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

Modified: head/security/libpreludedb/pkg-plist
==============================================================================
--- head/security/libpreludedb/pkg-plist	Fri Jan  1 16:52:26 2021	(r559854)
+++ head/security/libpreludedb/pkg-plist	Fri Jan  1 17:02:16 2021	(r559855)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101011702.101H2Hki059004>