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

Collapse All | Expand All

(-)sysutils/syslog-ng320/Makefile (-26 / +25 lines)
Lines 17-24 Link Here
17
LIB_DEPENDS=	libpcre.so:devel/pcre \
17
LIB_DEPENDS=	libpcre.so:devel/pcre \
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 bison:build gettext-runtime gmake libtool  \
21
		gettext-runtime shebangfix
21
		pathfix pkgconfig python:3.5+,build shebangfix ssl
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 45-51 Link Here
45
USE_LDCONFIG=	yes
45
USE_LDCONFIG=	yes
46
USE_RC_SUBR=	syslog-ng
46
USE_RC_SUBR=	syslog-ng
47
SHEBANG_FILES=	lib/merge-grammar.py
47
SHEBANG_FILES=	lib/merge-grammar.py
48
SHEBANG_LANG=	python3
49
GNU_CONFIGURE=	yes
48
GNU_CONFIGURE=	yes
50
# Note: Even if PYTHON is deselected, glib20 will install python.
49
# Note: Even if PYTHON is deselected, glib20 will install python.
51
USE_GNOME=	glib20
50
USE_GNOME=	glib20
Lines 55-61 Link Here
55
CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
54
CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
56
		--enable-dynamic-linking --enable-manpages \
55
		--enable-dynamic-linking --enable-manpages \
57
		--disable-linux-caps \
56
		--disable-linux-caps \
58
		--datadir=${PREFIX}/share/
57
		--datadir=${PREFIX}/share/ \
58
		--with-python=${PYTHON_VER}
59
59
60
CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
60
CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
61
			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
61
			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
Lines 136-185 Link Here
136
				lib/syslog-ng/java-modules/http.jar \
136
				lib/syslog-ng/java-modules/http.jar \
137
				lib/syslog-ng/java-modules/syslog-ng-common.jar
137
				lib/syslog-ng/java-modules/syslog-ng-common.jar
138
138
139
PYTHON_USES=			bison python:3.5+
139
PYTHON_USES=			python:3.5+ 
140
PYTHON_CONFIGURE_ON=		--enable-python
140
PYTHON_CONFIGURE_ON=		--enable-python 
141
PYTHON_CONFIGURE_OFF=		--disable-python
141
PYTHON_CONFIGURE_OFF=		--disable-python
142
PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
143
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
142
PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
144
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
143
		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
145
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
144
		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
146
		%%PYTHON_SITELIBDIR%%/syslogng/__pycache__/__init__.cpython-36.pyc \
145
		%%PYTHON_SITELIBDIR%%/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
147
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__init__.py \
146
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__init__.py \
148
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/__init__.cpython-36.pyc \
147
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
149
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/choicecompleter.py \
148
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/choicecompleter.py \
150
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/choicecompleter.cpython-36.pyc \
149
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/choicecompleter.cpython-${PYTHON_SUFFIX}.pyc \
151
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/commandlinelexer.py \
150
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/commandlinelexer.py \
152
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-36.pyc \
151
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-${PYTHON_SUFFIX}.pyc \
153
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completer.py  \
152
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completer.py  \
154
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completer.cpython-36.pyc \
153
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completer.cpython-${PYTHON_SUFFIX}.pyc \
155
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completerlang.py  \
154
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completerlang.py  \
156
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completerlang.cpython-36.pyc \
155
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completerlang.cpython-${PYTHON_SUFFIX}.pyc \
157
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuggercli.py \
156
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuggercli.py \
158
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuggercli.cpython-36.pyc \
157
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuggercli.cpython-${PYTHON_SUFFIX}.pyc \
159
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuglang.py \
158
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuglang.py \
160
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuglang.cpython-36.pyc \
159
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuglang.cpython-${PYTHON_SUFFIX}.pyc \
161
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/getoptlexer.py \
160
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/getoptlexer.py \
162
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/getoptlexer.cpython-36.pyc \
161
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/getoptlexer.cpython-${PYTHON_SUFFIX}.pyc \
163
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/langcompleter.py \
162
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/langcompleter.py \
164
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/langcompleter.cpython-36.pyc \
163
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/langcompleter.cpython-${PYTHON_SUFFIX}.pyc \
165
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexer.py \
164
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexer.py \
166
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexer.cpython-36.pyc \
165
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexer.cpython-${PYTHON_SUFFIX}.pyc \
167
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexertoken.py \
166
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexertoken.py \
168
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexertoken.cpython-36.pyc \
167
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexertoken.cpython-${PYTHON_SUFFIX}.pyc \
169
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/macrocompleter.py \
168
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/macrocompleter.py \
170
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/macrocompleter.cpython-36.pyc \
169
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/macrocompleter.cpython-${PYTHON_SUFFIX}.pyc \
171
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/readline.py \
170
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/readline.py \
172
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/readline.cpython-36.pyc \
171
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/readline.cpython-${PYTHON_SUFFIX}.pyc \
173
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/syslognginternals.py \
172
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/syslognginternals.py \
174
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/syslognginternals.cpython-36.pyc \
173
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/syslognginternals.cpython-${PYTHON_SUFFIX}.pyc \
175
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tablexer.py \
174
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tablexer.py \
176
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tablexer.cpython-36.pyc \
175
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tablexer.cpython-${PYTHON_SUFFIX}.pyc \
177
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelang.py \
176
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelang.py \
178
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelang.cpython-36.pyc \
177
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelang.cpython-${PYTHON_SUFFIX}.pyc \
179
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelexer.py \
178
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelexer.py \
180
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelexer.cpython-36.pyc \
179
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelexer.cpython-${PYTHON_SUFFIX}.pyc \
181
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tflang.py \
180
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tflang.py \
182
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tflang.cpython-36.pyc
181
		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
183
182
184
CURL_CONFIGURE_OFF=		--with-libcurl=off
183
CURL_CONFIGURE_OFF=		--with-libcurl=off
185
CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
184
CURL_LIB_DEPENDS=		libcurl.so:ftp/curl

Return to bug 236845