Date: Sat, 30 Mar 2019 18:36:51 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497322 - in head/sysutils: syslog-ng318 syslog-ng319 syslog-ng320 Message-ID: <201903301836.x2UIapHt060649@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sat Mar 30 18:36:51 2019 New Revision: 497322 URL: https://svnweb.freebsd.org/changeset/ports/497322 Log: Don't depend on python 3.6 when the python option is deselected. However syslog-ng* does depend on glib20. glib20 does depend on python and if python is deslected the default python27 is installed by glib20. If OTOH the python option is selected, python36 is installed and glib20 will use it instead. Installing syslog-ng without python support and subsequently changing one's mind to later depend on python will result in both python27 and python36 to be installed. PR: 236845 Inspired by: leres@ Modified: head/sysutils/syslog-ng318/Makefile (contents, props changed) head/sysutils/syslog-ng319/Makefile (contents, props changed) head/sysutils/syslog-ng320/Makefile (contents, props changed) Modified: head/sysutils/syslog-ng318/Makefile ============================================================================== --- head/sysutils/syslog-ng318/Makefile Sat Mar 30 18:36:47 2019 (r497321) +++ head/sysutils/syslog-ng318/Makefile Sat Mar 30 18:36:51 2019 (r497322) @@ -19,7 +19,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ libuuid.so:misc/e2fsprogs-libuuid USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ - gettext-runtime python:3.6,build shebangfix + gettext-runtime shebangfix CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ @@ -38,7 +38,7 @@ GEOIP2_DESC= Build with geoip2 (MaxMindDB) support REDIS_DESC= Build with Redis support JAVA_DESC= Build with Java support (no modules) JAVA_MOD_DESC= Build with Java modules (needs Maven / Internet access) -PYTHON_DESC= Build with Python 3.6 support +PYTHON_DESC= Build with Python ${PYTHON_VER} support CURL_DESC= Build with Curl HTTP support AMQP_DESC= Build with AMQP support @@ -47,6 +47,7 @@ USE_RC_SUBR= syslog-ng SHEBANG_FILES= lib/merge-grammar.py SHEBANG_LANG= python3 GNU_CONFIGURE= yes +# Note: Even if PYTHON is deselected, glib20 will install python. USE_GNOME= glib20 SUB_FILES= pkg-message INSTALL_TARGET= install-strip @@ -136,9 +137,10 @@ JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4 lib/syslog-ng/java-modules/http.jar \ lib/syslog-ng/java-modules/syslog-ng-common.jar +PYTHON_USES= bison python:3.5+ PYTHON_CONFIGURE_ON= --enable-python -PYTHON_CONFIGURE_OFF= --disable-python --with-python=3.6 -PYTHON_CONFIGURE_WITH= python=3.6 +PYTHON_CONFIGURE_OFF= --disable-python +PYTHON_CONFIGURE_WITH= python=${PYTHON_VER} PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ %%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \ %%PYTHON_SITELIBDIR%%/syslogng/__init__.py \ Modified: head/sysutils/syslog-ng319/Makefile ============================================================================== --- head/sysutils/syslog-ng319/Makefile Sat Mar 30 18:36:47 2019 (r497321) +++ head/sysutils/syslog-ng319/Makefile Sat Mar 30 18:36:51 2019 (r497322) @@ -19,7 +19,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ libuuid.so:misc/e2fsprogs-libuuid USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ - gettext-runtime python:3.6,build shebangfix + gettext-runtime shebangfix CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ @@ -38,7 +38,7 @@ GEOIP2_DESC= Build with geoip2 (MaxMindDB) support REDIS_DESC= Build with Redis support JAVA_DESC= Build with Java support (no modules) JAVA_MOD_DESC= Build with Java modules (needs Maven / Internet access) -PYTHON_DESC= Build with Python 3.6 support +PYTHON_DESC= Build with Python ${PYTHON_VER} support CURL_DESC= Build with Curl HTTP support AMQP_DESC= Build with AMQP support @@ -47,6 +47,7 @@ USE_RC_SUBR= syslog-ng SHEBANG_FILES= lib/merge-grammar.py SHEBANG_LANG= python3 GNU_CONFIGURE= yes +# Note: Even if PYTHON is deselected, glib20 will install python. USE_GNOME= glib20 SUB_FILES= pkg-message INSTALL_TARGET= install-strip @@ -136,9 +137,10 @@ JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4 lib/syslog-ng/java-modules/http.jar \ lib/syslog-ng/java-modules/syslog-ng-common.jar +PYTHON_USES= bison python:3.5+ PYTHON_CONFIGURE_ON= --enable-python -PYTHON_CONFIGURE_OFF= --disable-python --with-python=3.6 -PYTHON_CONFIGURE_WITH= python=3.6 +PYTHON_CONFIGURE_OFF= --disable-python +PYTHON_CONFIGURE_WITH= python=${PYTHON_VER} PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ %%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \ %%PYTHON_SITELIBDIR%%/syslogng/__init__.py \ Modified: head/sysutils/syslog-ng320/Makefile ============================================================================== --- head/sysutils/syslog-ng320/Makefile Sat Mar 30 18:36:47 2019 (r497321) +++ head/sysutils/syslog-ng320/Makefile Sat Mar 30 18:36:51 2019 (r497322) @@ -18,7 +18,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ libuuid.so:misc/e2fsprogs-libuuid USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ - gettext-runtime python:3.6,build shebangfix + gettext-runtime shebangfix CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ @@ -37,7 +37,7 @@ GEOIP2_DESC= Build with geoip2 (MaxMindDB) support REDIS_DESC= Build with Redis support JAVA_DESC= Build with Java support (no modules) JAVA_MOD_DESC= Build with Java modules (needs Maven / Internet access) -PYTHON_DESC= Build with Python 3.6 support +PYTHON_DESC= Build with Python ${PYTHON_VER} support CURL_DESC= Build with Curl HTTP support AMQP_DESC= Build with AMQP support RIEMANN_DESC= Build with Riemann support @@ -47,6 +47,7 @@ USE_RC_SUBR= syslog-ng SHEBANG_FILES= lib/merge-grammar.py SHEBANG_LANG= python3 GNU_CONFIGURE= yes +# Note: Even if PYTHON is deselected, glib20 will install python. USE_GNOME= glib20 SUB_FILES= pkg-message INSTALL_TARGET= install-strip @@ -135,9 +136,10 @@ JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4 lib/syslog-ng/java-modules/http.jar \ lib/syslog-ng/java-modules/syslog-ng-common.jar +PYTHON_USES= bison python:3.5+ PYTHON_CONFIGURE_ON= --enable-python -PYTHON_CONFIGURE_OFF= --disable-python --with-python=3.6 -PYTHON_CONFIGURE_WITH= python=3.6 +PYTHON_CONFIGURE_OFF= --disable-python +PYTHON_CONFIGURE_WITH= python=${PYTHON_VER} PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ %%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \ %%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903301836.x2UIapHt060649>