View | Details | Raw Unified | Return to bug 236845 | Differences between
and this patch

Collapse All | Expand All

(-)b/sysutils/syslog-ng318/Makefile (-4 / +6 lines)
Lines 19-25 LIB_DEPENDS= libpcre.so:devel/pcre \ Link Here
19
		libuuid.so:misc/e2fsprogs-libuuid
19
		libuuid.so:misc/e2fsprogs-libuuid
20
20
21
USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
21
USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
22
		gettext-runtime python:3.6,build shebangfix
22
		gettext-runtime shebangfix
23
23
24
CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
24
CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
25
		syslog-ng[0-9][0-9]-[0-9]* \
25
		syslog-ng[0-9][0-9]-[0-9]* \
Lines 38-44 GEOIP2_DESC= Build with geoip2 (MaxMindDB) support Link Here
38
REDIS_DESC=		Build with Redis support
38
REDIS_DESC=		Build with Redis support
39
JAVA_DESC=		Build with Java support (no modules)
39
JAVA_DESC=		Build with Java support (no modules)
40
JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
40
JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
41
PYTHON_DESC=		Build with Python 3.6 support
41
PYTHON_DESC=		Build with Python ${PYTON_VER} support
42
CURL_DESC=		Build with Curl HTTP support
42
CURL_DESC=		Build with Curl HTTP support
43
AMQP_DESC=		Build with AMQP support
43
AMQP_DESC=		Build with AMQP support
44
44
Lines 47-52 USE_RC_SUBR= syslog-ng Link Here
47
SHEBANG_FILES=	lib/merge-grammar.py
47
SHEBANG_FILES=	lib/merge-grammar.py
48
SHEBANG_LANG=	python3
48
SHEBANG_LANG=	python3
49
GNU_CONFIGURE=	yes
49
GNU_CONFIGURE=	yes
50
# Note: Even if PYTHON is deselected, glib20 will install python.
50
USE_GNOME=	glib20
51
USE_GNOME=	glib20
51
SUB_FILES=	pkg-message
52
SUB_FILES=	pkg-message
52
INSTALL_TARGET=	install-strip
53
INSTALL_TARGET=	install-strip
Lines 137-144 JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4j-1.2.16.jar \ Link Here
137
				lib/syslog-ng/java-modules/syslog-ng-common.jar
138
				lib/syslog-ng/java-modules/syslog-ng-common.jar
138
139
139
PYTHON_CONFIGURE_ON=		--enable-python
140
PYTHON_CONFIGURE_ON=		--enable-python
140
PYTHON_CONFIGURE_OFF=		--disable-python --with-python=3.6
141
PYTHON_CONFIGURE_OFF=		--disable-python
141
PYTHON_CONFIGURE_WITH=		python=3.6
142
PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
143
PYTHON_USES			bison python:3.5+
142
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
144
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
143
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
145
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
144
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
146
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
(-)b/sysutils/syslog-ng319/Makefile (-4 / +6 lines)
Lines 19-25 LIB_DEPENDS= libpcre.so:devel/pcre \ Link Here
19
		libuuid.so:misc/e2fsprogs-libuuid
19
		libuuid.so:misc/e2fsprogs-libuuid
20
20
21
USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
21
USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
22
		gettext-runtime python:3.6,build shebangfix
22
		gettext-runtime shebangfix
23
23
24
CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
24
CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
25
		syslog-ng[0-9][0-9]-[0-9]* \
25
		syslog-ng[0-9][0-9]-[0-9]* \
Lines 38-44 GEOIP2_DESC= Build with geoip2 (MaxMindDB) support Link Here
38
REDIS_DESC=		Build with Redis support
38
REDIS_DESC=		Build with Redis support
39
JAVA_DESC=		Build with Java support (no modules)
39
JAVA_DESC=		Build with Java support (no modules)
40
JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
40
JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
41
PYTHON_DESC=		Build with Python 3.6 support
41
PYTHON_DESC=		Build with Python ${PYTON_VER} support
42
CURL_DESC=		Build with Curl HTTP support
42
CURL_DESC=		Build with Curl HTTP support
43
AMQP_DESC=		Build with AMQP support
43
AMQP_DESC=		Build with AMQP support
44
44
Lines 47-52 USE_RC_SUBR= syslog-ng Link Here
47
SHEBANG_FILES=	lib/merge-grammar.py
47
SHEBANG_FILES=	lib/merge-grammar.py
48
SHEBANG_LANG=	python3
48
SHEBANG_LANG=	python3
49
GNU_CONFIGURE=	yes
49
GNU_CONFIGURE=	yes
50
# Note: Even if PYTHON is deselected, glib20 will install python.
50
USE_GNOME=	glib20
51
USE_GNOME=	glib20
51
SUB_FILES=	pkg-message
52
SUB_FILES=	pkg-message
52
INSTALL_TARGET=	install-strip
53
INSTALL_TARGET=	install-strip
Lines 137-144 JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4j-1.2.16.jar \ Link Here
137
				lib/syslog-ng/java-modules/syslog-ng-common.jar
138
				lib/syslog-ng/java-modules/syslog-ng-common.jar
138
139
139
PYTHON_CONFIGURE_ON=		--enable-python
140
PYTHON_CONFIGURE_ON=		--enable-python
140
PYTHON_CONFIGURE_OFF=		--disable-python --with-python=3.6
141
PYTHON_CONFIGURE_OFF=		--disable-python
141
PYTHON_CONFIGURE_WITH=		python=3.6
142
PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
143
PYTHON_USES			bison python:3.5+
142
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
144
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
143
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
145
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
144
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
146
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
(-)b/sysutils/syslog-ng320/Makefile (-4 / +6 lines)
Lines 18-24 LIB_DEPENDS= libpcre.so:devel/pcre \ Link Here
18
		libuuid.so:misc/e2fsprogs-libuuid
18
		libuuid.so:misc/e2fsprogs-libuuid
19
19
20
USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
20
USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
21
		gettext-runtime python:3.6,build shebangfix
21
		gettext-runtime shebangfix
22
22
23
CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
23
CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
24
		syslog-ng[0-9][0-9]-[0-9]* \
24
		syslog-ng[0-9][0-9]-[0-9]* \
Lines 37-43 GEOIP2_DESC= Build with geoip2 (MaxMindDB) support Link Here
37
REDIS_DESC=		Build with Redis support
37
REDIS_DESC=		Build with Redis support
38
JAVA_DESC=		Build with Java support (no modules)
38
JAVA_DESC=		Build with Java support (no modules)
39
JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
39
JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
40
PYTHON_DESC=		Build with Python 3.6 support
40
PYTHON_DESC=		Build with Python ${PYTHON_VER} support
41
CURL_DESC=		Build with Curl HTTP support
41
CURL_DESC=		Build with Curl HTTP support
42
AMQP_DESC=		Build with AMQP support
42
AMQP_DESC=		Build with AMQP support
43
RIEMANN_DESC=		Build with Riemann support
43
RIEMANN_DESC=		Build with Riemann support
Lines 47-52 USE_RC_SUBR= syslog-ng Link Here
47
SHEBANG_FILES=	lib/merge-grammar.py
47
SHEBANG_FILES=	lib/merge-grammar.py
48
SHEBANG_LANG=	python3
48
SHEBANG_LANG=	python3
49
GNU_CONFIGURE=	yes
49
GNU_CONFIGURE=	yes
50
# Note: Even if PYTHON is deselected, glib20 will install python.
50
USE_GNOME=	glib20
51
USE_GNOME=	glib20
51
SUB_FILES=	pkg-message
52
SUB_FILES=	pkg-message
52
INSTALL_TARGET=	install-strip
53
INSTALL_TARGET=	install-strip
Lines 136-143 JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4j-1.2.16.jar \ Link Here
136
				lib/syslog-ng/java-modules/syslog-ng-common.jar
137
				lib/syslog-ng/java-modules/syslog-ng-common.jar
137
138
138
PYTHON_CONFIGURE_ON=		--enable-python
139
PYTHON_CONFIGURE_ON=		--enable-python
139
PYTHON_CONFIGURE_OFF=		--disable-python --with-python=3.6
140
PYTHON_CONFIGURE_OFF=		--disable-python
140
PYTHON_CONFIGURE_WITH=		python=3.6
141
PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
142
PYTHON_USES=			bison python:3.5+
141
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
143
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
142
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
144
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
143
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
145
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \

Return to bug 236845