Attachment #176102 for bug #213737




.if !defined(_INCLUDE_USES_KDE_MK)
_INCLUDE_USES_KDE_MK=	yes

_USES_POST+=	kde

_KDE_SUPPORTED=		4

.  if empty(kde_ARGS)

.  endif
# ==============================================================================

# === HANDLE PYTHON ============================================================
# TODO: Keep in sync with cmake/modules/PythonMacros.cmake
_PYTHON_SHORT_VER=	${PYTHON_VERSION:S/^python//:S/.//}
.  if ${_PYTHON_SHORT_VER} > 31
PLIST_SUB+=		PYCACHE="__pycache__/" \
			PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \
			PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo
.  else
PLIST_SUB+=		PYCACHE="" \
			PYC_SUFFIX=pyc \
			PYO_SUFFIX=pyo
.  endif
# ==============================================================================
_USE_KDE4_ALL=  	baloo baloo-widgets baseapps kactivities kate kdelibs \
			kfilemetadata korundum libkcddb libkcompactdisc \

.  endfor

.endif

.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KDE_POST_MK)
_INCLUDE_USES_KDE_POST_MK=	yes

# === HANDLE PYTHON ============================================================
# TODO: Keep in sync with cmake/modules/PythonMacros.cmake
.if defined(PYTHON_SUFFIX)
.  if ${PYTHON_SUFFIX} > 31
PLIST_SUB+=		PYCACHE="__pycache__/" \
			PYC_SUFFIX=cpython-${PYTHON_SUFFIX}.pyc \
			PYO_SUFFIX=cpython-${PYTHON_SUFFIX}.pyo
.  else
PLIST_SUB+=		PYCACHE="" \
			PYC_SUFFIX=pyc \
			PYO_SUFFIX=pyo
.  endif
.endif

.endif

Lines 6-12 Link Here

(-)b/Mk/Uses/python.mk (-76 / +158 lines)
6	#	6	#
7	# Feature: python	7	# Feature: python
8	# Usage: USES=python or USES=python:args	8	# Usage: USES=python or USES=python:args
9	# Valid ARGS: <version>, build, run, test	9	# Valid ARGS: <version>, <implementation>, build, run, test
10	#	10	#
11	# version If your port requires only some set of Python versions, you	11	# version If your port requires only some set of Python versions, you
12	# can set this to [min]-[max] or min+ or -max or as an	12	# can set this to [min]-[max] or min+ or -max or as an
Lines 22-27 Link Here
22	# USES=python # Use the set default Python	22	# USES=python # Use the set default Python
23	# # version	23	# # version
24	#	24	#
		25	# implementation If your port requires a specific Python implementation, you
		26	# can specify this:
		27	#
		28	# USES=python:cpython # lang/python
		29	# USES=python:pypy # lang/pypy
		30	#
25	# build Indicates that Python is needed at build time and adds	31	# build Indicates that Python is needed at build time and adds
26	# it to BUILD_DEPENDS.	32	# it to BUILD_DEPENDS.
27	# run Indicates that Python is needed at run time and adds	33	# run Indicates that Python is needed at run time and adds
Lines 36-42 Link Here
36	# Variables, which can be set by a user:	42	# Variables, which can be set by a user:
37	#	43	#
38	# PYTHON_VERSION - The chosen Python interpreter including the version,	44	# PYTHON_VERSION - The chosen Python interpreter including the version,
39	# e.g. python2.7, python3.3, etc. This allows the user	45	# e.g. cpython2.7, pypy3.3, etc. This allows the user
40	# to override the currently chosen default version and	46	# to override the currently chosen default version and
41	# to install the port for a specific Python version.	47	# to install the port for a specific Python version.
42	# It must not be set by a port.	48	# It must not be set by a port.
Lines 92-98 Link Here
92	#	98	#
93	# PYTHON_CMD - Python's command line file name, including the	99	# PYTHON_CMD - Python's command line file name, including the
94	# version number (used for dependencies).	100	# version number (used for dependencies).
95	# default: ${PYTHONBASE}/bin/${PYTHON_VERSION}	101	# default:
		102	# cpython: ${PYTHONBASE}/bin/python${PYTHON_VER}
		103	# pypy: ${LOCALBASE}/bin/pypy${PYTHON_MAJOR_VER:S/2//}
		104	#
		105	# PYTHON_LIB - Python's library file name (used to link against)
		106	# default:
		107	# cpython: ${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so
		108	# pypy: ${PYTHON_LIBDIR}/libpypy-c.so
96	#	109	#
97	# PYSETUP - Name of the setup script used by the distutils	110	# PYSETUP - Name of the setup script used by the distutils
98	# package.	111	# package.
Lines 128-134 Link Here
128	#	141	#
129	# PYDISTUTILS_INSTALLARGS	142	# PYDISTUTILS_INSTALLARGS
130	# - Arguments to install with distutils.	143	# - Arguments to install with distutils.
131	# default: -c -O1 --prefix=${PREFIX} --single-version-externally-managed --root=${STAGEDIR}	144	# default: -c -O1 --prefix=${PYTHONPREFIX} --single-version-externally-managed --root=${STAGEDIR}
132	#	145	#
133	# PYDISTUTILS_EGGINFO	146	# PYDISTUTILS_EGGINFO
134	# - Canonical name for egg-info.	147	# - Canonical name for egg-info.
Lines 137-143 Link Here
137	# The following variables can be read by ports and must not be modified:	150	# The following variables can be read by ports and must not be modified:
138	#	151	#
139	# PYTHONBASE - The installation prefix of the chosen Python	152	# PYTHONBASE - The installation prefix of the chosen Python
140	# interpreter, e.g. /usr/local	153	# interpreter
		154	# default:
		155	# cpython: ${LOCALBASE}
		156	# pypy: ${LOCALBASE}/pypy-${PYPY_VER}
141	#	157	#
142	# PYTHON_PORTVERSION	158	# PYTHON_PORTVERSION
143	# - Version number suitable for ${PORTVERSION}.	159	# - Version number suitable for ${PORTVERSION}.
Lines 161-182 Link Here
161	# interpreter, e.g. md	177	# interpreter, e.g. md
162	#	178	#
163	# PYTHON_INCLUDEDIR - Location of the Python include files.	179	# PYTHON_INCLUDEDIR - Location of the Python include files.
164	# default: ${PYTHONBASE}/include/${PYTHON_VERSION}	180	# default:
		181	# cpython: ${PYTHONBASE}/include/python${PYTHON_VER}
		182	# pypy: ${PYTHONBASE}/include
165	#	183	#
166	# PYTHON_LIBDIR - Base of the python library tree	184	# PYTHON_LIBDIR - Base of the python library tree
167	# default: ${PYTHONBASE}/lib/${PYTHON_VERSION}	185	# default:
		186	# cpython: ${PYTHONBASE}/lib/python${PYTHON_VER}
		187	# pypy: ${PYTHONBASE}/bin
168	#	188	#
169	# PYTHON_SITELIBDIR - Location of the site-packages tree. Don't change,	189	# PYTHON_SITELIBDIR - Location of the site-packages tree. Don't change,
170	# unless you know what you do.	190	# unless you know what you do.
171	# default: ${PYTHON_LIBDIR}/site-packages	191	# default:
		192	# cpython: ${PYTHON_LIBDIR}/site-packages
		193	# pypy: ${PYTHONBASE}/site-packages
172	#	194	#
173	# There are PREFIX-clean variants of the PYTHON_*DIR variables above.	195	# There are PREFIX-clean variants of the PYTHON_*DIR variables above.
174	# They are meant to be used by ports instead of the above variables, so the	196	# They are meant to be used by ports instead of the above variables, so the
175	# ports respect ${PREFIX} (unless USE_PYTHON=pythonprefix is specified).	197	# ports respect ${PREFIX} (unless USE_PYTHON=pythonprefix is specified).
176	#	198	#
177	# PYTHONPREFIX_INCLUDEDIR default: ${PREFIX}/include/${PYTHON_VERSION}	199	# PYTHONPREFIX_INCLUDEDIR
178	# PYTHONPREFIX_LIBDIR default: ${PREFIX}/lib/${PYTHON_VERSION}	200	# PYTHONPREFIX_LIBDIR
179	# PYTHONPREFIX_SITELIBDIR default: ${PYTHONPREFIX_LIBDIR}/site-packages	201	# PYTHONPREFIX_SITELIBDIR
180	#	202	#
181	# PYTHON_PLATFORM - Python's idea of the OS release.	203	# PYTHON_PLATFORM - Python's idea of the OS release.
182	# This is faked with ${OPSYS} and ${OSREL} until we	204	# This is faked with ${OPSYS} and ${OSREL} until we
Lines 188-194 Link Here
188	# packages for different Python versions.	210	# packages for different Python versions.
189	# default: py${PYTHON_SUFFIX}-	211	# default: py${PYTHON_SUFFIX}-
190	#	212	#
191	# Using USES=python.mk also will add some useful entries to PLIST_SUB:	213	# Using USES=python also will add some useful entries to PLIST_SUB:
192	#	214	#
193	# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;}	215	# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;}
194	# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}	216	# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
Lines 219-232 Link Here
219	.if !defined(_INCLUDE_USES_PYTHON_MK)	241	.if !defined(_INCLUDE_USES_PYTHON_MK)
220	_INCLUDE_USES_PYTHON_MK= yes	242	_INCLUDE_USES_PYTHON_MK= yes
221		243
222	# What Python version and what Python interpreters are currently supported?
223	# When adding a version, please keep the comment in
224	# Mk/bsd.default-versions.mk in sync.
225	_PYTHON_VERSIONS= 2.7 3.5 3.4 3.3 # preferred first
226	_PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VERSIONS:[1]}
227	_PYTHON_BASECMD= ${LOCALBASE}/bin/python
228	_PYTHON_RELPORTDIR= lang/python
229
230	# Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>	244	# Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
231	.for var in ${USE_PYTHON}	245	.for var in ${USE_PYTHON}
232	_PYTHON_FEATURE_${var:tu}= yes	246	_PYTHON_FEATURE_${var:tu}= yes
Lines 250-255 _PYTHON_ARGS:= ${_PYTHON_ARGS:Nrun} Link Here
250	_PYTHON_TEST_DEP= yes	264	_PYTHON_TEST_DEP= yes
251	_PYTHON_ARGS:= ${_PYTHON_ARGS:Ntest}	265	_PYTHON_ARGS:= ${_PYTHON_ARGS:Ntest}
252	.endif	266	.endif
		267	.undef _PYTHON_IMPL
		268	.for impl in cpython pypy
		269	. if ${_PYTHON_ARGS:M${impl}}
		270	_PYTHON_IMPL+= ${impl}
		271	_PYTHON_ARGS:= ${_PYTHON_ARGS:N${impl}}
		272	. endif
		273	.endfor
253		274
254	# The port does not specify a build, run or test dependency, assume all are	275	# The port does not specify a build, run or test dependency, assume all are
255	# required.	276	# required.
Lines 260-265 _PYTHON_RUN_DEP= yes Link Here
260	_PYTHON_TEST_DEP= yes	281	_PYTHON_TEST_DEP= yes
261	.endif	282	.endif
262		283
		284	.for var in PYTHON_DEFAULT_VERSION PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION PYTHON_DEFAULT PYTHON2_DEFAULT PYTHON3_DEFAULT _PYTHON_DEFAULT_VERSION
		285	. if defined(${var})
		286	cleanvar:= ${${var}}
		287	. if ${cleanvar:C/^([a-z])./\1/} == ""
		288	cleanvar:= cpython${cleanvar}
		289	. endif
		290	cleanvar:= ${cleanvar:S/^python/cpython/}
		291	. if ${cleanvar} != ${${var}}
		292	WARNING+= "Converting ${var}=${${var}} to ${var}=${cleanvar}"
		293	${var}:= ${cleanvar}
		294	. endif
		295	. endif
		296	.endfor
		297
263	.if defined(PYTHON_DEFAULT_VERSION)	298	.if defined(PYTHON_DEFAULT_VERSION)
264	WARNING+= "PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"	299	WARNING+= "PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"
265	.endif	300	.endif
Lines 271-311 WARNING+= "PYTHON3_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=p Link Here
271	.endif	306	.endif
272		307
273	.if exists(${LOCALBASE}/bin/python)	308	.if exists(${LOCALBASE}/bin/python)
274	.if !defined(_PYTHON_DEFAULT_VERSION)	309	. if !defined(_PYTHON_DEFAULT_VERSION)
275	_PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \	310	_PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \
276	'import sys; print("%d.%d" % sys.version_info[:2])' 2> /dev/null \	311	'import platform, sys; print("%s%d.%d" % ((platform.python_implementation().lower(),) + sys.version_info[:2]))' 2> /dev/null \
277	\|\| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) \| ${TAIL} -1	312	\|\| ${ECHO_CMD} ${PYTHON_DEFAULT}) \| ${TAIL} -1
278	.endif	313	. endif
279	_EXPORTED_VARS+= _PYTHON_DEFAULT_VERSION	314	_EXPORTED_VARS+= _PYTHON_DEFAULT_VERSION
280	.if defined(PYTHON_DEFAULT) && (${PYTHON_DEFAULT} != ${_PYTHON_DEFAULT_VERSION})	315	. if defined(PYTHON_DEFAULT) && (${PYTHON_DEFAULT} != ${_PYTHON_DEFAULT_VERSION})
281	WARNING+= "Your requested default python version ${PYTHON_DEFAULT} is different from the installed default python interpreter version ${_PYTHON_DEFAULT_VERSION}"	316	WARNING+= "Your requested default python version ${PYTHON_DEFAULT} is different from the installed default python interpreter version ${_PYTHON_DEFAULT_VERSION}"
282	.endif	317	. endif
283	PYTHON_DEFAULT_VERSION= python${_PYTHON_DEFAULT_VERSION}	318	PYTHON_DEFAULT_VERSION= ${_PYTHON_DEFAULT_VERSION}
284	.else	319	.else
285	PYTHON_DEFAULT_VERSION= python${PYTHON_DEFAULT}	320	PYTHON_DEFAULT_VERSION= ${PYTHON_DEFAULT}
286	.endif # exists(${LOCALBASE}/bin/python)	321	.endif # exists(${LOCALBASE}/bin/python)
287		322
288	# Is only a meta-port version defined?	323	# Is only a meta-port version defined?
289	.if ${PYTHON_DEFAULT_VERSION} == "python2"	324	.if ${PYTHON_DEFAULT_VERSION:C/^[a-z]+//} == "2"
290	PYTHON2_DEFAULT_VERSION?= python${PYTHON2_DEFAULT}	325	PYTHON2_DEFAULT_VERSION?= ${PYTHON2_DEFAULT}
291	.elif ${PYTHON_DEFAULT_VERSION:R} == "python2"	326	.elif ${PYTHON_DEFAULT_VERSION:R:C/^[a-z]+//} == "2"
292	PYTHON2_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION}	327	PYTHON2_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION}
293	.else	328	.else
294	PYTHON2_DEFAULT_VERSION?= python${PYTHON2_DEFAULT}	329	PYTHON2_DEFAULT_VERSION?= ${PYTHON2_DEFAULT}
295	.endif	330	.endif
296	.if ${PYTHON_DEFAULT_VERSION} == "python3"	331	.if ${PYTHON_DEFAULT_VERSION:C/^[a-z]+//} == "3"
297	PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT}	332	PYTHON3_DEFAULT_VERSION?= ${PYTHON3_DEFAULT}
298	.elif ${PYTHON_DEFAULT_VERSION:R} == "python3"	333	.elif ${PYTHON_DEFAULT_VERSION:R:C/^[a-z]+//} == "3"
299	PYTHON3_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION}	334	PYTHON3_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION}
300	.else	335	.else
301	PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT}	336	PYTHON3_DEFAULT_VERSION?= ${PYTHON3_DEFAULT}
302	.endif	337	.endif
303		338
304	.if ${_PYTHON_ARGS} == "2"	339	.if ${_PYTHON_ARGS} == "2"
305	_PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:S/^python//}	340	_PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:C/^[a-z]+//}
306	_WANTS_META_PORT= 2	341	_WANTS_META_PORT= 2
307	.elif ${_PYTHON_ARGS} == "3"	342	.elif ${_PYTHON_ARGS} == "3"
308	_PYTHON_ARGS= ${PYTHON3_DEFAULT_VERSION:S/^python//}	343	_PYTHON_ARGS= ${PYTHON3_DEFAULT_VERSION:C/^[a-z]+//}
309	_WANTS_META_PORT= 3	344	_WANTS_META_PORT= 3
310	.endif # ${_PYTHON_ARGS} == "2"	345	.endif # ${_PYTHON_ARGS} == "2"
311		346
Lines 325-335 _WANTS_META_PORT= 3 Link Here
325	# that maintainers know what they are doing and assume PYTHON_VERSION to be a	360	# that maintainers know what they are doing and assume PYTHON_VERSION to be a
326	# hint. Just warn maintainers, if the versions do not match	361	# hint. Just warn maintainers, if the versions do not match
327	# (_PYTHON_VERSION_NONSUPPORTED).	362	# (_PYTHON_VERSION_NONSUPPORTED).
328	_PYTHON_VERSION:= ${PYTHON_VERSION:S/^python//}	363	_PYTHON_VERSION:= ${PYTHON_VERSION:C/^[a-z]+//}
		364	_PYTHON_VERSION_IMPL= ${PYTHON_VERSION:C/^([a-z]+).*/\1/}
		365	. if defined(_PYTHON_IMPL) && ${_PYTHON_IMPL} != ${_PYTHON_VERSION_IMPL}
		366	IGNORE?= "needs Python implementation ${_PYTHON_VERSION_IMPL}. But a port depending on this one specified ${_PYTHON_IMPL}"
		367	. else
		368	_PYTHON_IMPL= ${_PYTHON_VERSION_IMPL}
		369	. endif
329	.else	370	.else
330	_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:S/^python//}	371	_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:C/^[a-z]+//}
		372	_PYTHON_IMPL?= ${PYTHON_DEFAULT_VERSION:C/^([a-z]+).*/\1/}
331	.endif # defined(PYTHON_VERSION)	373	.endif # defined(PYTHON_VERSION)
332		374
		375	.if ${_PYTHON_IMPL} == cpython
		376	_PYTHON_BINNAME= python
		377	_PYTHON_SHORTNAME= py
		378	_PYTHON_VERSIONS= 2.7 3.5 3.4 3.3 # preferred first
		379
		380	PYTHON_PORTSDIR= lang/python${PYTHON_SUFFIX}
		381	PYTHON_CMD?= ${LOCALBASE}/bin/python${PYTHON_VER}
		382	PYTHON_LIB= ${PYTHONBASE}/lib/libpython${_PYTHON_VERSION}${PYTHON_ABIVER}.so
		383
		384	PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER}
		385	PYTHON_LIBDIR= ${PYTHONBASE}/lib/python${_PYTHON_VERSION}
		386	PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages
		387	.elif ${_PYTHON_IMPL} == pypy
		388	_PYTHON_BINNAME= pypy
		389	_PYTHON_SHORTNAME= pypy
		390	_PYTHON_VERSIONS= 2.7 3.3 # preferred first
		391
		392	PYTHON_PORTSDIR= lang/pypy${PYTHON_SUFFIX:C/(.).*/\1/:S/2//}
		393	PYTHON_CMD?= ${LOCALBASE}/bin/pypy${PYTHON_SUFFIX:C/(.).*/\1/:S/2//}
		394	PYTHON_LIB= ${PYTHON_LIBDIR}/libpypy-c.so
		395
		396	PYTHON_INCLUDEDIR= ${PYTHONBASE}/include
		397	PYTHON_LIBDIR= ${PYTHONBASE}/bin
		398	PYTHON_SITELIBDIR= ${PYTHONBASE}/site-packages
		399	.else
		400	IGNORE?= "needs an unsupported implementation '${_PYTHON_IMPL}' of Python (supported implementations: cpython, pypy)"
		401	.endif # ${_PYTHON_IMPL}
		402
333	# Validate Python version whether it meets the version restriction.	403	# Validate Python version whether it meets the version restriction.
334	_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}	404	_PYTHON_VERSION_CHECK:= ${_PYTHON_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}
335	_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[0-9])[-+].*/\1/}	405	_PYTHON_VERSION_MINIMUM_TMP:= ${_PYTHON_VERSION_CHECK:C/([1-9]\.[0-9])[-+].*/\1/}
Lines 342-376 _PYTHON_VERSION_MAXIMUM:= ${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]} Link Here
342	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least	412	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least
343	.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})	413	.elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})
344	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most	414	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
		415	.else
		416	. undef _PYTHON_VERSION_SUPPORTED
		417	. for supported_ver in ${_PYTHON_VERSIONS}
		418	. if ${_PYTHON_VERSION} == ${supported_ver}
		419	_PYTHON_VERSION_SUPPORTED= yes
		420	. endif
		421	. endfor
		422	. if !defined(_PYTHON_VERSION_SUPPORTED)
		423	_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSIONS} (unsupported)
		424	. endif
		425	. undef _PYTHON_VERSION_SUPPORTED
345	.endif	426	.endif
346		427
347	# If we have an unsupported version of Python, try another.	428	# If we have an unsupported version of Python, try another.
348	.if defined(_PYTHON_VERSION_NONSUPPORTED)	429	.if defined(_PYTHON_VERSION_NONSUPPORTED)
349	.if defined(PYTHON_VERSION) \|\| defined(PYTHON_CMD)	430	. if defined(PYTHON_VERSION) \|\| defined(PYTHON_CMD)
350	_PV:= ${_PYTHON_VERSION} # preserve the specified python version	431	_PV:= ${_PYTHON_VERSION} # preserve the specified python version
351	WARNING+= "needs Python ${_PYTHON_VERSION_NONSUPPORTED}. But a port depending on this one specified ${_PV}"	432	WARNING+= "needs Python ${_PYTHON_VERSION_NONSUPPORTED}. But a port depending on this one specified ${_PV}"
352	.endif # defined(PYTHON_VERSION) \|\| defined(PYTHON_CMD)	433	. endif # defined(PYTHON_VERSION) \|\| defined(PYTHON_CMD)
353	.undef _PYTHON_VERSION	434	. undef _PYTHON_VERSION
354	.for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}	435	. for ver in ${PYTHON_DEFAULT:C/^[a-z]+//} ${PYTHON2_DEFAULT:C/^[a-z]+//} ${PYTHON3_DEFAULT:C/^[a-z]+//} ${_PYTHON_VERSIONS}
355	__VER= ${ver}	436	. if !defined(_PYTHON_VERSION) && \
356	.if !defined(_PYTHON_VERSION) && \
357	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \	437	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
358	${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \	438	${_PYTHON_VERSION_MINIMUM} > ${ver})) && \
359	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \	439	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
360	${__VER} > ${_PYTHON_VERSION_MAXIMUM}))	440	${_PYTHON_VERSION_MAXIMUM} < ${ver} ))
361	_PYTHON_VERSION= ${ver}	441	_ver= ${ver}
362	.endif	442	. for supported_ver in ${_PYTHON_VERSIONS}
363	.endfor	443	. if !defined(_PYTHON_VERSION) && ${_ver} == ${supported_ver}
364	.if !defined(_PYTHON_VERSION)	444	_PYTHON_VERSION:= ${ver}
365	IGNORE= needs an unsupported version of Python	445	. endif
366	.endif	446	. endfor
		447	. endif
		448	. endfor
		449	. if !defined(_PYTHON_VERSION)
		450	IGNORE?= "needs an unsupported version of Python"
		451	. endif
367	.endif # defined(_PYTHON_VERSION_NONSUPPORTED)	452	.endif # defined(_PYTHON_VERSION_NONSUPPORTED)
368		453
369	# Pass PYTHON_VERSION down the dependency chain. This ensures that	454	# Pass PYTHON_VERSION down the dependency chain. This ensures that
370	# port A -> B -> C all will use the same python version and do not	455	# port A -> B -> C all will use the same python version and do not
371	# try to find a different one, if the passed version fits into	456	# try to find a different one, if the passed version fits into
372	# the supported version range.	457	# the supported version range.
373	PYTHON_VERSION?= python${_PYTHON_VERSION}	458	PYTHON_VERSION?= ${_PYTHON_IMPL}${_PYTHON_VERSION}
374	.if !defined(PYTHON_NO_DEPENDS)	459	.if !defined(PYTHON_NO_DEPENDS)
375	DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION}	460	DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION}
376	.endif	461	.endif
Lines 378-387 DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION} Link Here
378	# NOTE:	463	# NOTE:
379	#	464	#
380	# PYTHON_VERSION will hold whatever is passed down the dependency chain.	465	# PYTHON_VERSION will hold whatever is passed down the dependency chain.
381	# If a user runs `make PYTHON_VERSION=python3.3, PYTHON_VERSION will be	466	# If a user runs `make PYTHON_VERSION=cpython3.3, PYTHON_VERSION will be
382	# set to 'python3.3'. A port however may require a different version,	467	# set to 'cpython3.3'. A port however may require a different version,
383	# which is stored (above) in _PYTHON_VERSION.	468	# which is stored (above) in _PYTHON_VERSION.
384	# Every python bit below hence should use python${_PYTHON_VERSION}, since	469	# Every python bit below hence should use ${_PYTHON_IMPL}${_PYTHON_VERSION}, since
385	# this is the value, the _port_ requires	470	# this is the value, the _port_ requires
386	#	471	#
387		472
Lines 391-399 PYTHON_SUFFIX= ${_PYTHON_VERSION:S/.//g} Link Here
391	PYTHON_MAJOR_VER= ${PYTHON_VER:R}	476	PYTHON_MAJOR_VER= ${PYTHON_VER:R}
392	PYTHON_REL= # empty	477	PYTHON_REL= # empty
393	PYTHON_ABIVER= # empty	478	PYTHON_ABIVER= # empty
394	PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}	479
395	# Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().	480	# Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
396	.if !defined(_PORTS_ENV_CHECK) \|\| exists(${PORTSDIR}/${PYTHON_PORTSDIR})	481	.if (!defined(_PORTS_ENV_CHECK) \|\| exists(${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version)) && defined(PYTHON_PORTSDIR)
397	.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"	482	.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
398	.endif	483	.endif
399	# Create a 4 integer version string, prefixing 0 to the last token if	484	# Create a 4 integer version string, prefixing 0 to the last token if
Lines 403-409 PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} Link Here
403	PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$/.0\1/:C/\.0?([0-9][0-9])$/.\1/:S/.//g}	488	PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$/.0\1/:C/\.0?([0-9][0-9])$/.\1/:S/.//g}
404		489
405	# Might be overridden by calling ports	490	# Might be overridden by calling ports
406	PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION}
407	.if ${PYTHON_VER} != 2.7	491	.if ${PYTHON_VER} != 2.7
408	.if exists(${PYTHON_CMD}-config)	492	.if exists(${PYTHON_CMD}-config)
409	PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags	493	PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags
Lines 419-434 PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \ Link Here
419	.endif	503	.endif
420	_EXPORTED_VARS+= PYTHONBASE	504	_EXPORTED_VARS+= PYTHONBASE
421		505
422	PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER}
423	PYTHON_LIBDIR= ${PYTHONBASE}/lib/python${_PYTHON_VERSION}
424	PYTHON_PLATFORM= ${OPSYS:tl}${OSREL:C/\.[0-9.]*//}	506	PYTHON_PLATFORM= ${OPSYS:tl}${OSREL:C/\.[0-9.]*//}
425	PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages	507	PYTHON_PKGNAMEPREFIX= ${_PYTHON_SHORTNAME}${PYTHON_SUFFIX}-
426	PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}-	508	PYTHON_PKGNAMESUFFIX= -${_PYTHON_SHORTNAME}${PYTHON_SUFFIX}
427	PYTHON_PKGNAMESUFFIX= -py${PYTHON_SUFFIX}
428		509
429	PYTHONPREFIX_INCLUDEDIR= ${PYTHON_INCLUDEDIR:S;${PYTHONBASE};${PREFIX};}	510	PYTHONPREFIX= ${PYTHONBASE:S;${LOCALBASE};${PREFIX};}
430	PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};}	511	PYTHONPREFIX_INCLUDEDIR= ${PYTHON_INCLUDEDIR:S;${LOCALBASE};${PREFIX};}
431	PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}	512	PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${LOCALBASE};${PREFIX};}
		513	PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${LOCALBASE};${PREFIX};}
432		514
433	# Used for recording the installed files.	515	# Used for recording the installed files.
434	_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp	516	_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp
Lines 469-476 UNIQUE_FIND_SUFFIX_FILES= \ Link Here
469	_CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}	551	_CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
470	.if defined(_PYTHON_FEATURE_DISTUTILS) && \	552	.if defined(_PYTHON_FEATURE_DISTUTILS) && \
471	${_CURRENTPORT:S/${PYTHON_SUFFIX}$//} != ${PYTHON_PKGNAMEPREFIX}setuptools	553	${_CURRENTPORT:S/${PYTHON_SUFFIX}$//} != ${PYTHON_PKGNAMEPREFIX}setuptools
472	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}	554	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/${_PYTHON_SHORTNAME}-setuptools${PYTHON_SUFFIX}
473	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}	555	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/${_PYTHON_SHORTNAME}-setuptools${PYTHON_SUFFIX}
474	.endif	556	.endif
475		557
476	# distutils support	558	# distutils support
Lines 481-487 PYDISTUTILS_SETUP?= -c \ Link Here
481	exec(compile(open(__file__, 'rb').read().replace(b'\\r\\n', b'\\n'), __file__, 'exec'))"	563	exec(compile(open(__file__, 'rb').read().replace(b'\\r\\n', b'\\n'), __file__, 'exec'))"
482	PYDISTUTILS_CONFIGUREARGS?= # empty	564	PYDISTUTILS_CONFIGUREARGS?= # empty
483	PYDISTUTILS_BUILDARGS?= # empty	565	PYDISTUTILS_BUILDARGS?= # empty
484	PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX}	566	PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PYTHONPREFIX}
485	.if defined(_PYTHON_FEATURE_DISTUTILS)	567	.if defined(_PYTHON_FEATURE_DISTUTILS)
486	. if !defined(PYDISTUTILS_INSTALLNOSINGLE)	568	. if !defined(PYDISTUTILS_INSTALLNOSINGLE)
487	PYDISTUTILS_INSTALLARGS+= --single-version-externally-managed	569	PYDISTUTILS_INSTALLARGS+= --single-version-externally-managed
Lines 564-582 PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy Link Here
564	.if defined(_PYTHON_BUILD_DEP)	646	.if defined(_PYTHON_BUILD_DEP)
565	BUILD_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}	647	BUILD_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
566	.if defined(_WANTS_META_PORT)	648	.if defined(_WANTS_META_PORT)
567	BUILD_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}	649	BUILD_DEPENDS+= python${_WANTS_META_PORT}:lang/python${_WANTS_META_PORT}
568	.endif	650	.endif
569	.endif	651	.endif
570	.if defined(_PYTHON_RUN_DEP)	652	.if defined(_PYTHON_RUN_DEP)
571	RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}	653	RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
572	.if defined(_WANTS_META_PORT)	654	.if defined(_WANTS_META_PORT)
573	RUN_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}	655	RUN_DEPENDS+= python${_WANTS_META_PORT}:lang/python${_WANTS_META_PORT}
574	.endif	656	.endif
575	.endif	657	.endif
576	.if defined(_PYTHON_TEST_DEP)	658	.if defined(_PYTHON_TEST_DEP)
577	TEST_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}	659	TEST_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
578	.if defined(_WANTS_META_PORT)	660	.if defined(_WANTS_META_PORT)
579	TEST_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}	661	TEST_DEPENDS+= python${_WANTS_META_PORT}:lang/python${_WANTS_META_PORT}
580	.endif	662	.endif
581	.endif	663	.endif
582		664
Lines 593-599 PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \ Link Here
593	PYTHON_PLATFORM=${PYTHON_PLATFORM} \	675	PYTHON_PLATFORM=${PYTHON_PLATFORM} \
594	PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \	676	PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
595	PYTHON_VER=${PYTHON_VER} \	677	PYTHON_VER=${PYTHON_VER} \
596	PYTHON_VERSION=python${_PYTHON_VERSION}	678	PYTHON_VERSION=${_PYTHON_IMPL}${_PYTHON_VERSION}
597		679
598	_USES_POST+= python	680	_USES_POST+= python
599	.endif # _INCLUDE_USES_PYTHON_MK	681	.endif # _INCLUDE_USES_PYTHON_MK

Lines 19-25 _INCLUDE_USES_ZOPE_MK= yes Link Here

(-)b/Mk/Uses/zope.mk (-1 / +1 lines)
19	_ZOPE_PORTBRANCH= 2.13	19	_ZOPE_PORTBRANCH= 2.13
20	_ZOPE_ALLBRANCHES= 2.13	20	_ZOPE_ALLBRANCHES= 2.13
21		21
22	_PYTHON_VER_REQUIRED= python2.7	22	_PYTHON_VER_REQUIRED= cpython2.7
23		23
24	.if defined(ZOPE_VERSION)	24	.if defined(ZOPE_VERSION)
25	_ZOPE_VERSION:= ${ZOPE_VERSION}	25	_ZOPE_VERSION:= ${ZOPE_VERSION}




PGSQL_DEFAULT?=		9.3
# Possible values: 5.6, 7.0
PHP_DEFAULT?=		5.6
# Possible values: cpython2.7, cpython3.3, cpython3.4, cpython3.5, pypy2.7 pypy3.3
PYTHON_DEFAULT?=	cpython2.7
# Possible values: cpython2.7, pypy2.7
PYTHON2_DEFAULT?=	cpython2.7
# Possible values: cpython3.3, cpython3.4, cpython3.5, pypy2.7 pypy3.3
PYTHON3_DEFAULT?=	cpython3.5
# Possible values: 2.0, 2.1, 2.2, 2.3
RUBY_DEFAULT?=		2.2
# Possible values: base, openssl, openssl-devel, libressl, libressl-devel

Lines 26-32 LIB_DEPENDS= libexpat.so:textproc/expat2 \ Link Here

(-)b/cad/freecad/Makefile (-1 / +1 lines)
26	libboost_thread.so:devel/boost-libs \	26	libboost_thread.so:devel/boost-libs \
27	libarea.so:devel/libarea \	27	libarea.so:devel/libarea \
28	libmed.so:french/med \	28	libmed.so:french/med \
29	libshiboken-${PYTHON_VERSION}.so:devel/shiboken	29	libshiboken-python${PYTHON_VER}.so:devel/shiboken
30		30
31	USE_GITHUB= yes	31	USE_GITHUB= yes
32	GH_TAGNAME= 958686d	32	GH_TAGNAME= 958686d





OPTIONS_DEFINE=	PYTHON TCL DOCS
OPTIONS_DEFAULT=	PYTHON
OPTIONS_SUB=	yes

PYTHON_CATEGORIES=	python
PYTHON_CONFIGURE_WITH=	python=${PYTHON_INCLUDEDIR},${PYTHON_SITELIBDIR}
PYTHON_USES=		python

TCL_CATEGORIES=		tcl
TCL_CONFIGURE_ENV=	TCL_LIBDIR=${TCL_LIBDIR}
TCL_CONFIGURE_WITH=	tcl=${TCL_INCLUDEDIR}
TCL_PLIST_SUB=		TCL_V="${TCL_VER}"
TCL_USES=		tcl:85
.else
PLIST_SUB+=	WITH_PYTHON="@comment "
.endif

.if ${PORT_OPTIONS:MTCL}
USES+=		tcl:85
CATEGORIES+=	tcl
CONFIGURE_ARGS+=--with-tcl=${TCL_INCLUDEDIR}
CONFIGURE_ENV+=	TCL_LIBDIR=${TCL_LIBDIR}
PLIST_SUB+=	TCL_V="${TCL_VER}"
PLIST_SUB+=	WITH_TCL=""
.else
PLIST_SUB+=	WITH_TCL="@comment "
.endif

pre-patch:
	${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html
	${REINPLACE_CMD} -e "s|= tclsh|=${TCLSH}|" \
		${WRKSRC}/../unix/Makefile.in
	${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \
		${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/configure

post-build-PYTHON-on:
.if ${PORT_OPTIONS:MPYTHON}
	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
		${WRKSRC}/../python
	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
		${WRKSRC}/../python
.endif

pre-install:
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}

	${INSTALL_DATA} ${WRKSRC}/../Metakit.html ${WRKSRC}/../CHANGES \
		${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}

do-test:
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)

do-test-TCL-on:
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl)
.endif

.include <bsd.port.mk>




include/mk4str.inl
lib/libmk4.so
lib/libmk4.so.0
%%PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo
%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so
%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl
%%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes.html
%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp.html
%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp_desc.html

Lines 2-7 Link Here

(-)b/databases/py33-gdbm/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-gdbm	3	MASTERDIR= ${.CURDIR}/../py-gdbm
4		4
5	PYTHON_VERSION= python3.3	5	PYTHON_VERSION= cpython3.3
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/databases/py33-sqlite3/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-sqlite3	3	MASTERDIR= ${.CURDIR}/../py-sqlite3
4		4
5	PYTHON_VERSION= python3.3	5	PYTHON_VERSION= cpython3.3
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/databases/py34-gdbm/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-gdbm	3	MASTERDIR= ${.CURDIR}/../py-gdbm
4		4
5	PYTHON_VERSION= python3.4	5	PYTHON_VERSION= cpython3.4
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/databases/py34-sqlite3/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-sqlite3	3	MASTERDIR= ${.CURDIR}/../py-sqlite3
4		4
5	PYTHON_VERSION= python3.4	5	PYTHON_VERSION= cpython3.4
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/databases/py35-gdbm/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-gdbm	3	MASTERDIR= ${.CURDIR}/../py-gdbm
4		4
5	PYTHON_VERSION= python3.5	5	PYTHON_VERSION= cpython3.5
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/databases/py35-sqlite3/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-sqlite3	3	MASTERDIR= ${.CURDIR}/../py-sqlite3
4		4
5	PYTHON_VERSION= python3.5	5	PYTHON_VERSION= cpython3.5
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 4734-4739 Link Here

(-)b/devel/Makefile (+2 lines)
4734	SUBDIR += py3-vcversioner	4734	SUBDIR += py3-vcversioner
4735	SUBDIR += py3-xdg	4735	SUBDIR += py3-xdg
4736	SUBDIR += py3-yaml	4736	SUBDIR += py3-yaml
		4737	SUBDIR += pypy-setuptools27
		4738	SUBDIR += pypy-setuptools33
4737	SUBDIR += py_static_check	4739	SUBDIR += py_static_check
4738	SUBDIR += pybugz	4740	SUBDIR += pybugz
4739	SUBDIR += pychecker	4741	SUBDIR += pychecker

Lines 33-39 USES= ada:run gettext gmake perl5 pkgconfig python Link Here

(-)b/devel/gps/Makefile (-1 / +1 lines)
33	USE_XORG= x11	33	USE_XORG= x11
34	USE_PERL5= build	34	USE_PERL5= build
35	USE_GNOME= glib20 pygobject3 gtk30 pango atk cairo gdkpixbuf2	35	USE_GNOME= glib20 pygobject3 gtk30 pango atk cairo gdkpixbuf2
36	PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py	36	PYCOMPILE= ${PYTHON_LIBDIR}/compileall.py
37	AWKREVDATE= '/Last Changed Date/ {print "\"s\|unknown date\|" $$4 "\|\""}'	37	AWKREVDATE= '/Last Changed Date/ {print "\"s\|unknown date\|" $$4 "\|\""}'
38	GPSVER= GPS_VERSION=${PORTVERSION}	38	GPSVER= GPS_VERSION=${PORTVERSION}
39	ALL_TARGET= default	39	ALL_TARGET= default

Lines 27-33 BROKEN_FreeBSD_9= missing <system_error> header Link Here

(-)b/devel/libclc/Makefile (-1 / +1 lines)
27		27
28	post-patch:	28	post-patch:
29	@${REINPLACE_CMD} -e 's\|/usr/bin/python\|${PYTHON_CMD}\|g' \	29	@${REINPLACE_CMD} -e 's\|/usr/bin/python\|${PYTHON_CMD}\|g' \
30	-e 's\|"python \|"${PYTHON_VERSION} \|g' \	30	-e 's\|"python \|"${PYTHON_CMD} \|g' \
31	${WRKSRC}/build/ninja_syntax.py \	31	${WRKSRC}/build/ninja_syntax.py \
32	${WRKSRC}/configure.py	32	${WRKSRC}/configure.py
33		33

Lines 39-45 PLIST_SUB= USERS=${USERS} \ Link Here

(-)b/devel/libsearpc/Makefile (-2 / +2 lines)
39	post-install:	39	post-install:
40	@${MKDIR} ${STAGEDIR}${SEALIB}	40	@${MKDIR} ${STAGEDIR}${SEALIB}
41	(cd ${STAGEDIR}${PREFIX}/lib && \	41	(cd ${STAGEDIR}${PREFIX}/lib && \
42	${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})	42	${COPYTREE_SHARE} python${PYTHON_VER} ${STAGEDIR}${PREFIX}/${SEALIB})
43	${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}	43	${RM} -r ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}
44		44
45	.include <bsd.port.mk>	45	.include <bsd.port.mk>




.if !defined(REFERENCE_PORT)

USES+=		gettext gmake gnome libtool pathfix pkgconfig \
		python:3:build shebangfix sqlite:3 tar:xz
USE_GNOME=	glib20 intlhack introspection:build \
		libxml2 referencehack
USE_LDCONFIG=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip
SHEBANG_FILES=	${WRKSRC}/libsoup/tld-parser.py

LIBVERSION=	1.7.0
PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}

post-patch:
	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
		${WRKSRC}/libsoup/tld-parser.py
	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
		${WRKSRC}/configure


Lines 57-63 post-patch: Link Here

(-)b/devel/newt/Makefile (-1 / +6 lines)
57		57
58	post-patch-PYTHON-on:	58	post-patch-PYTHON-on:
59	@${REINPLACE_CMD} -e \	59	@${REINPLACE_CMD} -e \
60	'/PYTHONVERS/s\|=.*\|=${PYTHON_VERSION}\|' ${WRKSRC}/configure	60	'/PYTHONVERS/s\|=.*\|=${PYTHON_CMD}\|' ${WRKSRC}/configure
		61	@${REINPLACE_CMD} \
		62	-e '/mkdir -p $$$$ver;/d' \
		63	-e 's\|/\$$(libdir)/\$$\$$ver/site-packages\|${PYTHON_SITELIBDIR}\|g' \
		64	-e 's\|\$$\$$ver/\|\|g' \
		65	${WRKSRC}/Makefile.in
61		66
62	post-install:	67	post-install:
63	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail	68	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail

Lines 14-20 Link Here

(-)b/devel/py-cxx/pkg-plist (-4 / +4 lines)
14	%%PYTHON_SITELIBDIR%%/CXX/__init__.py	14	%%PYTHON_SITELIBDIR%%/CXX/__init__.py
15	%%PYTHON_SITELIBDIR%%/CXX/__init__.pyc	15	%%PYTHON_SITELIBDIR%%/CXX/__init__.pyc
16	%%PYTHON_SITELIBDIR%%/CXX/__init__.pyo	16	%%PYTHON_SITELIBDIR%%/CXX/__init__.pyo
17	share/%%PYTHON_VERSION%%/CXX/IndirectPythonInterface.cxx	17	share/python%%PYTHON_VER%%/CXX/IndirectPythonInterface.cxx
18	share/%%PYTHON_VERSION%%/CXX/cxx_extensions.cxx	18	share/python%%PYTHON_VER%%/CXX/cxx_extensions.cxx
19	share/%%PYTHON_VERSION%%/CXX/cxxextensions.c	19	share/python%%PYTHON_VER%%/CXX/cxxextensions.c
20	share/%%PYTHON_VERSION%%/CXX/cxxsupport.cxx	20	share/python%%PYTHON_VER%%/CXX/cxxsupport.cxx

Lines 1-9 Link Here

(-)b/devel/py-gobject/pkg-plist (-3 / +3 lines)
1	bin/pygobject-codegen-2.0	1	bin/pygobject-codegen-2.0
2	include/pygtk-2.0/pyglib.h	2	include/pygtk-2.0/pyglib.h
3	include/pygtk-2.0/pygobject.h	3	include/pygtk-2.0/pygobject.h
4	lib/libpyglib-2.0-%%PYTHON_VERSION%%.so	4	lib/libpyglib-2.0-python%%PYTHON_VER%%.so
5	lib/libpyglib-2.0-%%PYTHON_VERSION%%.so.0	5	lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
6	lib/libpyglib-2.0-%%PYTHON_VERSION%%.so.0.0.0	6	lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0.0.0
7	%%PYTHON_SITELIBDIR%%/glib/__init__.py	7	%%PYTHON_SITELIBDIR%%/glib/__init__.py
8	%%PYTHON_SITELIBDIR%%/glib/__init__.pyc	8	%%PYTHON_SITELIBDIR%%/glib/__init__.pyc
9	%%PYTHON_SITELIBDIR%%/glib/__init__.pyo	9	%%PYTHON_SITELIBDIR%%/glib/__init__.pyo

Lines 23-29 INSTALL_WRKSRC= ${WRKSRC}/python Link Here

(-)b/devel/py-ice/Makefile (-1 / +1 lines)
23		23
24	SHEBANG_FILES= ${BUILD_WRKSRC}/config/s2py.py	24	SHEBANG_FILES= ${BUILD_WRKSRC}/config/s2py.py
25		25
26	MAKE_ENV+= PYTHON_VERSION=${PYTHON_VERSION}	26	MAKE_ENV+= PYTHON=${PYTHON_CMD} PYTHON_LIBS=${PYTHON_LIB}
27		27
28	LIB_VRS= ${PORTVERSION:S\|.\|\|g:C\|[0-9]$\|\|}	28	LIB_VRS= ${PORTVERSION:S\|.\|\|g:C\|[0-9]$\|\|}
29	PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"	29	PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"

Lines 14-21 COMMENT= GUI toolkit in python Link Here

(-)b/devel/py-ocempgui/Makefile (-2 / +2 lines)
14		14
15	LICENSE= BSD2CLAUSE	15	LICENSE= BSD2CLAUSE
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game	17	BUILD_DEPENDS= ${PYTHON_INCLUDEDIR}/pygame/pygame.h:devel/py-game
18	RUN_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game	18	RUN_DEPENDS= ${PYTHON_INCLUDEDIR}/pygame/pygame.h:devel/py-game
19		19
20	USES= python:2	20	USES= python:2
21	USE_GNOME= atk	21	USE_GNOME= atk

Lines 3-9 Link Here

(-)b/devel/py-setuptools27/Makefile (-1 / +1 lines)
3		3
4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}
5		5
6	PYTHON_VERSION= python2.7	6	PYTHON_VERSION= cpython2.7
7		7
8	MASTERDIR= ${.CURDIR}/../py-setuptools	8	MASTERDIR= ${.CURDIR}/../py-setuptools
9		9

Lines 3-9 Link Here

(-)b/devel/py-setuptools33/Makefile (-1 / +1 lines)
3		3
4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}
5		5
6	PYTHON_VERSION= python3.3	6	PYTHON_VERSION= cpython3.3
7		7
8	MASTERDIR= ${.CURDIR}/../py-setuptools	8	MASTERDIR= ${.CURDIR}/../py-setuptools
9		9

Lines 3-9 Link Here

(-)b/devel/py-setuptools34/Makefile (-1 / +1 lines)
3		3
4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}
5		5
6	PYTHON_VERSION= python3.4	6	PYTHON_VERSION= cpython3.4
7		7
8	MASTERDIR= ${.CURDIR}/../py-setuptools	8	MASTERDIR= ${.CURDIR}/../py-setuptools
9		9

Lines 3-9 Link Here

(-)b/devel/py-setuptools35/Makefile (-1 / +1 lines)
3		3
4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}
5		5
6	PYTHON_VERSION= python3.5	6	PYTHON_VERSION= cpython3.5
7		7
8	MASTERDIR= ${.CURDIR}/../py-setuptools	8	MASTERDIR= ${.CURDIR}/../py-setuptools
9		9

Added Link Here

(-)b/devel/pypy-setuptools27/Makefile (+10 lines)
1	# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
2	# $FreeBSD: head/devel/py-setuptools27/Makefile 352367 2014-04-26 19:31:10Z sunpoet $
3
4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}
5
6	PYTHON_VERSION= pypy2.7
7
8	MASTERDIR= ${.CURDIR}/../py-setuptools
9
10	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/devel/pypy-setuptools33/Makefile (+10 lines)
1	# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
2	# $FreeBSD: head/devel/pypy-setuptools33/Makefile 352367 2014-04-26 19:31:10Z sunpoet $
3
4	PKGNAMESUFFIX= ${PYTHON_SUFFIX}
5
6	PYTHON_VERSION= pypy3.3
7
8	MASTERDIR= ${.CURDIR}/../py-setuptools
9
10	.include "${MASTERDIR}/Makefile"

Lines 13-19 LICENSE= BSD3CLAUSE GPLv2 Link Here

(-)b/devel/pyside-tools/Makefile (-1 / +1 lines)
13	LICENSE_COMB= multi	13	LICENSE_COMB= multi
14		14
15	BUILD_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside	15	BUILD_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
16	LIB_DEPENDS= libshiboken-${PYTHON_VERSION}.so:devel/shiboken	16	LIB_DEPENDS= libshiboken-python${PYTHON_VER}.so:devel/shiboken
17	RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside	17	RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
18		18
19	USE_GITHUB= yes	19	USE_GITHUB= yes

Lines 16-22 LICENSE= LGPL21 Link Here

(-)b/devel/pyside/Makefile (-3 / +2 lines)
16		16
17	LIB_DEPENDS= libapiextractor.so:devel/apiextractor \	17	LIB_DEPENDS= libapiextractor.so:devel/apiextractor \
18	libgenrunner.so:devel/generatorrunner \	18	libgenrunner.so:devel/generatorrunner \
19	libshiboken-${PYTHON_VERSION}.so:devel/shiboken	19	libshiboken-python${PYTHON_VER}.so:devel/shiboken
20		20
21	CMAKE_ARGS+= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \	21	CMAKE_ARGS+= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
22	-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"	22	-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"
Lines 26-33 USE_QT4= declarative designer gui help qmake_build \ Link Here
26	phonon rcc_build script scripttools \	26	phonon rcc_build script scripttools \
27	svg uic_build webkit	27	svg uic_build webkit
28		28
29	PLIST_SUB= PORTVERSION=${PORTVERSION} \	29	PLIST_SUB= PORTVERSION=${PORTVERSION}
30	PYTHON_VERSION=${PYTHON_VERSION}
31		30
32	USES= cmake python:2 tar:bzip2	31	USES= cmake python:2 tar:bzip2
33	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes




include/PySide/pysidesignal.h
include/PySide/pysideweakref.h
include/PySide/signalmanager.h
lib/cmake/PySide-%%PORTVERSION%%/PySideConfig-python%%PYTHON_VER%%.cmake
lib/cmake/PySide-%%PORTVERSION%%/PySideConfig.cmake
lib/cmake/PySide-%%PORTVERSION%%/PySideConfigVersion.cmake
lib/libpyside-python%%PYTHON_VER%%.so
lib/libpyside-python%%PYTHON_VER%%.so.1.2
lib/libpyside-python%%PYTHON_VER%%.so.%%PORTVERSION%%
%%PYTHON_SITELIBDIR%%/PySide/QtCore.so
%%PYTHON_SITELIBDIR%%/PySide/QtDeclarative.so
%%PYTHON_SITELIBDIR%%/PySide/QtGui.so

Lines 21-27 PYDISTUTILS_CONFIGURE_TARGET= configure Link Here

(-)b/devel/pysvn/Makefile (-1 / +1 lines)
21	PYDISTUTILS_CONFIGUREARGS= --apr-inc-dir=${LOCALBASE}/include/apr-1 \	21	PYDISTUTILS_CONFIGUREARGS= --apr-inc-dir=${LOCALBASE}/include/apr-1 \
22	--svn-root-dir=${LOCALBASE}	22	--svn-root-dir=${LOCALBASE}
23		23
24	PLIST_SUB= PYTHONVER=${PYTHON_VERSION:S/./_/:S/python//}	24	PLIST_SUB= PYTHONVER=${PYTHON_VER:S/./_/}
25	PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \	25	PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \
26	%%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_%%PYTHONVER%%.so	26	%%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_%%PYTHONVER%%.so
27		27

Lines 16-23 LICENSE_COMB= multi Link Here

(-)b/devel/shiboken/Makefile (-2 / +1 lines)
16	LIB_DEPENDS= libxml2.so:textproc/libxml2 \	16	LIB_DEPENDS= libxml2.so:textproc/libxml2 \
17	libxslt.so:textproc/libxslt	17	libxslt.so:textproc/libxslt
18		18
19	PLIST_SUB= PORTVERSION=${PORTVERSION} \	19	PLIST_SUB= PORTVERSION=${PORTVERSION}
20	PYTHON_VERSION=${PYTHON_VERSION}
21		20
22	USE_QT4= corelib qmake_build qtestlib moc_build network \	21	USE_QT4= corelib qmake_build qtestlib moc_build network \
23	uic_build rcc_build xml xmlpatterns	22	uic_build rcc_build xml xmlpatterns




include/shiboken/shibokenmacros.h
include/shiboken/threadstatesaver.h
include/shiboken/typeresolver.h
lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig-python%%PYTHON_VER%%.cmake
lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig.cmake
lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfigVersion.cmake
lib/libshiboken-python%%PYTHON_VER%%.so
lib/libshiboken-python%%PYTHON_VER%%.so.1
lib/libshiboken-python%%PYTHON_VER%%.so.%%PORTVERSION%%
libdata/pkgconfig/shiboken.pc
%%PYTHON_SITELIBDIR%%/shiboken.so
%%PORTDOCS%%%%DOCSDIR%%/.buildinfo

Lines 254-261 CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ Link Here

(-)b/editors/libreoffice/Makefile (-2 / +2 lines)
254	GPERF=${LOCALBASE}/bin/gperf \	254	GPERF=${LOCALBASE}/bin/gperf \
255	OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \	255	OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
256	OPENCOLLADA_LIBS="${COLLADA_LIBS}" \	256	OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
257	PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \	257	PYTHON_CFLAGS="`${PYTHON_CMD}-config --cflags`" \
258	PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"	258	PYTHON_LIBS="`${PYTHON_CMD}-config --libs`"
259		259
260	MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}"	260	MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}"
261	MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed	261	MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed

Lines 113-120 CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ Link Here

(-)b/editors/libreoffice4/Makefile (-2 / +2 lines)
113	GPERF=${LOCALBASE}/bin/gperf \	113	GPERF=${LOCALBASE}/bin/gperf \
114	OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \	114	OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
115	OPENCOLLADA_LIBS="${COLLADA_LIBS}" \	115	OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
116	PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \	116	PYTHON_CFLAGS="`${PYTHON_CMD}-config --cflags`" \
117	PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"	117	PYTHON_LIBS="`${PYTHON_CMD}-config --libs`"
118		118
119	CONFIGURE_ARGS+= --disable-dependency-tracking \	119	CONFIGURE_ARGS+= --disable-dependency-tracking \
120	--disable-fetch-external \	120	--disable-fetch-external \

Lines 30-37 NO_ARCH= yes Link Here

(-)b/emulators/gns3/Makefile (-2 / +1 lines)
30		30
31	DESKTOP_ENTRIES= "GNS3" "${COMMENT}" "" "${PORTNAME}" "System;Emulator;" true	31	DESKTOP_ENTRIES= "GNS3" "${COMMENT}" "" "${PORTNAME}" "System;Emulator;" true
32		32
33	PLIST_SUB= PYTHON_VERSION=${PYTHON_VERSION:S/python//} \	33	PLIST_SUB= VERSION=${PORTVERSION}
34	VERSION=${PORTVERSION}
35		34
36	OPTIONS_DEFINE= DOCS	35	OPTIONS_DEFINE= DOCS
37		36

Lines 17-23 USES= compiler dos2unix gmake python Link Here

(-)b/games/kiki/Makefile (-1 / +2 lines)
17	USE_GL= gl glu glut	17	USE_GL= gl glu glut
18	USE_SDL= sdl mixer image	18	USE_SDL= sdl mixer image
19	DOS2UNIX_REGEX= ./(Makefile\|.\.cpp\|.\.h\|.\.i)$	19	DOS2UNIX_REGEX= ./(Makefile\|.\.cpp\|.\.h\|.\.i)$
20	MAKE_ENV= PYTHON_VER=${PYTHON_VERSION:C/^python//}	20	MAKE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} PYTHON_LIB=${PYTHON_LIB} \
		21	PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_VER=${PYTHON_VER}
21	CXXFLAGS+= -include sys/limits.h -fpermissive	22	CXXFLAGS+= -include sys/limits.h -fpermissive
22		23
23	WRKSRC= ${WRKDIR}/kiki	24	WRKSRC= ${WRKDIR}/kiki




-	     $(PYTHONHOME)/lib-dynload/time.so \
-	     $(PYTHONHOME)/lib-dynload/_random.so
+X11_INCLUDES = -I ${LOCALBASE}/include/
+PYTHON_INCLUDES = -I ${PYTHON_INCLUDEDIR}
+
+SDLCFLAGS = $(shell ${SDL_CONFIG} --cflags)
+SDLLIBS = $(shell ${SDL_CONFIG} --libs) -lSDL_image -lSDL_mixer
+
+GLLIBS = -lglut -lGLU -lGL -L${LOCALBASE}/lib
+
+PYTHONHOME = ${PYTHON_LIBDIR}
+PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VER).a -lutil ${PYTHON_LIB}
 
 # change this, if the kodilib directory isn't parallel to the kiki directory
 

Lines 20-27 BUILD_WRKSRC= ${WRKSRC}/build/src Link Here

(-)b/games/pykawari/Makefile (-2 / +1 lines)
20		20
21	USES= gmake python zip	21	USES= gmake python zip
22	MAKEFILE= gcc.mak	22	MAKEFILE= gcc.mak
23	MAKE_ARGS= CXX="${CXX}" CFLAGS="${CXXFLAGS}" \	23	MAKE_ARGS= CXX="${CXX}" CFLAGS="${CXXFLAGS}" PYTHON_LIB="${PYTHON_LIB}"
24	PYTHONBASE="${PYTHONBASE}" PYTHON_VERSION="${PYTHON_VERSION}"
25		24
26	CFLAGS+= -I. -DNDEBUG -I${PYTHON_INCLUDEDIR} -fPIC	25	CFLAGS+= -I. -DNDEBUG -I${PYTHON_INCLUDEDIR} -fPIC
27		26

Lines 44-50 Link Here

(-)b/games/pykawari/files/patch-build_src_gcc.mak (-2 / +2 lines)
44	CFLAGS := $(CFLAGS_STLP) -DHAVE_SSTREAM $(CFLAGS)	44	CFLAGS := $(CFLAGS_STLP) -DHAVE_SSTREAM $(CFLAGS)
45	LDFLAGS := $(LDFLAGS) $(LDFLAGS_STLP)	45	LDFLAGS := $(LDFLAGS) $(LDFLAGS_STLP)
46	- LIBS := $(LIBS) $(LIBS_STLP)	46	- LIBS := $(LIBS) $(LIBS_STLP)
47	+ LIBS := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}	47	+ LIBS := $(LIBS) ${PYTHON_LIB}
48	endif	48	endif
49		49
50	ifeq ($(SAORI_NATIVE),yes)	50	ifeq ($(SAORI_NATIVE),yes)
Lines 53-59 Link Here
53	CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")	53	CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")
54	CFLAGS := $(CFLAGS_PYTHON) $(CFLAGS)	54	CFLAGS := $(CFLAGS_PYTHON) $(CFLAGS)
55	- LIBS := $(LIBS) -lpython$(PYTHON_VER)	55	- LIBS := $(LIBS) -lpython$(PYTHON_VER)
56	+ LIBS := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}	56	+ LIBS := $(LIBS) ${PYTHON_LIB}
57	endif	57	endif
58	endif	58	endif
59		59

Lines 24-30 LIB_DEPENDS= libfreetype.so:print/freetype2 \ Link Here

(-)b/graphics/py-ming/Makefile (-1 / +1 lines)
24	PORTSCOUT= limit:^ming-	24	PORTSCOUT= limit:^ming-
25		25
26	CONFIGURE_ARGS= --enable-python	26	CONFIGURE_ARGS= --enable-python
27	CONFIGURE_ENV= PYTHON_LDFLAGS="-L${PYTHON_LIBDIR} -l${PYTHON_VERSION}${PYTHON_ABIVER}"	27	CONFIGURE_ENV= PYTHON_LDFLAGS="${PYTHON_LIB}"
28	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
29	USE_PYTHON= autoplist concurrent distutils	29	USE_PYTHON= autoplist concurrent distutils
30	USES= autoreconf libtool localbase:ldflags python	30	USES= autoreconf libtool localbase:ldflags python

Lines 31-37 PLIST_SUB+= GUCHARMAP="@comment " Link Here

(-)b/japanese/libtomoe-gtk/Makefile (-1 / +1 lines)
31	#.endif	31	#.endif
32		32
33	.if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc)	33	.if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc)
34	CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \	34	CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VER} \
35	pyexecdir=${PYTHON_SITELIBDIR}	35	pyexecdir=${PYTHON_SITELIBDIR}
36	PLIST_SUB+= PYTHON=""	36	PLIST_SUB+= PYTHON=""
37	.else	37	.else

Lines 19-25 USES= gettext gmake libtool pathfix perl5 pkgconfig Link Here

(-)b/japanese/tomoe/Makefile (-1 / +1 lines)
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20	USE_PERL5= build	20	USE_PERL5= build
21		21
22	CONFIGURE_ENV= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \	22	CONFIGURE_ENV= PYTHON_VERSION=${PYTHON_VER} \
23	pyexecdir=${PYTHON_SITELIBDIR} \	23	pyexecdir=${PYTHON_SITELIBDIR} \
24	GMSGFMT="${LOCALBASE}/bin/msgfmt"	24	GMSGFMT="${LOCALBASE}/bin/msgfmt"
25	CFLAGS+= -I${LOCALBASE}/include	25	CFLAGS+= -I${LOCALBASE}/include

Added Link Here

(-)b/lang/pypy/Makefile.version (+4 lines)
1	# Mk/Uses/python.mk includes this file, don't remove it!
2	# $FreeBSD$
3
4	PYTHON_PORTVERSION= 2.7.10

Added Link Here

(-)b/lang/pypy3/Makefile.version (+4 lines)
1	# Mk/Uses/python.mk includes this file, don't remove it!
2	# $FreeBSD$
3
4	PYTHON_PORTVERSION= 3.3.5

Lines 25-31 CPE_VERSION= ${DISTVERSION} Link Here

(-)b/lang/python35/Makefile (-1 / +1 lines)
25		25
26	# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.	26	# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
27	PYTHON_VER= ${PYTHON_PORTVERSION:R}	27	PYTHON_VER= ${PYTHON_PORTVERSION:R}
28	PYTHON_VERSION= python${PYTHON_VER}	28	PYTHON_VERSION= cpython${PYTHON_VER}
29	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}	29	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
30		30
31	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm	31	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm

Lines 8-14 COMMENT= Python-script filter support for OpenSMTPD Link Here

(-)b/mail/opensmtpd-extras-filter-python/Makefile (-1 / +2 lines)
8		8
9	PLIST_FILES= libexec/opensmtpd/filter-python	9	PLIST_FILES= libexec/opensmtpd/filter-python
10		10
11	CONFIGURE_ARGS+= --with-experimental-filter-python --with-python-type=${PYTHON_VERSION}	11	CONFIGURE_ARGS+= --with-experimental-filter-python --with-python=${LOCALBASE} \
		12	--with-python-type=`basename ${PYTHON_CMD}`
12		13
13	USES= python:2 pkgconfig	14	USES= python:2 pkgconfig
14		15

Lines 8-14 COMMENT= Python queue support for OpenSMTPD Link Here

(-)b/mail/opensmtpd-extras-queue-python/Makefile (-1 / +2 lines)
8		8
9	PLIST_FILES= libexec/opensmtpd/queue-python	9	PLIST_FILES= libexec/opensmtpd/queue-python
10		10
11	CONFIGURE_ARGS+= --with-queue-python --with-python-type=${PYTHON_VERSION}	11	CONFIGURE_ARGS+= --with-queue-python --with-python=${LOCALBASE} \
		12	--with-python-type=`basename ${PYTHON_CMD}`
12		13
13	USES= python:2 pkgconfig	14	USES= python:2 pkgconfig
14		15

Lines 8-14 COMMENT= Python scheduler support for OpenSMTPD Link Here

(-)b/mail/opensmtpd-extras-scheduler-python/Makefile (-1 / +2 lines)
8		8
9	PLIST_FILES= libexec/opensmtpd/scheduler-python	9	PLIST_FILES= libexec/opensmtpd/scheduler-python
10		10
11	CONFIGURE_ARGS+= --with-scheduler-python --with-python-type=${PYTHON_VERSION}	11	CONFIGURE_ARGS+= --with-scheduler-python --with-python=${LOCALBASE} \
		12	--with-python-type=`basename ${PYTHON_CMD}`
12		13
13	USES= python:2 pkgconfig	14	USES= python:2 pkgconfig
14		15

Lines 8-14 COMMENT= Python table support for OpenSMTPD Link Here

(-)b/mail/opensmtpd-extras-table-python/Makefile (-1 / +2 lines)
8		8
9	PLIST_FILES= libexec/opensmtpd/table-python	9	PLIST_FILES= libexec/opensmtpd/table-python
10		10
11	CONFIGURE_ARGS+= --with-table-python --with-python-type=${PYTHON_VERSION}	11	CONFIGURE_ARGS+= --with-table-python --with-python=${LOCALBASE} \
		12	--with-python-type=`basename ${PYTHON_CMD}`
12		13
13	USES= python:2 pkgconfig	14	USES= python:2 pkgconfig
14		15

Lines 41-47 PYTHON_USES= python Link Here

(-)b/math/qtiplot/Makefile (-1 / +1 lines)
41	PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui	41	PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui
42	PYTHON_RUN_DEPENDS:= ${PYTHON_BUILD_DEPENDS}	42	PYTHON_RUN_DEPENDS:= ${PYTHON_BUILD_DEPENDS}
43	PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \	43	PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
44	PYTHON_VERSION=${PYTHON_VERSION}	44	PYTHON_LIB="${PYTHON_LIB}"
45		45
46	NLS_USE= QT4=linguisttools_build	46	NLS_USE= QT4=linguisttools_build
47		47

Lines 72-78 Link Here

(-)b/math/qtiplot/files/patch-qtiplot__qtiplot.pro (-1 / +1 lines)
72	- INCLUDEPATH += $$system($$PYTHON python-includepath.py)	72	- INCLUDEPATH += $$system($$PYTHON python-includepath.py)
73	- LIBS += $$system($$PYTHON -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")	73	- LIBS += $$system($$PYTHON -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
74	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)	74	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
75	+ LIBS += -l$$(PYTHON_VERSION)	75	+ LIBS += $$(PYTHON_LIB)
76	LIBS += -lm	76	LIBS += -lm
77	system(mkdir -p $${SIP_DIR})	77	system(mkdir -p $${SIP_DIR})
78	- system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)	78	- system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)

Lines 32-38 FREEVO_HOME= /var/db/${FREEVO_USER} Link Here

(-)b/multimedia/freevo/Makefile (-1 / +1 lines)
32	USERS= ${FREEVO_USER}	32	USERS= ${FREEVO_USER}
33	GROUPS= ${FREEVO_GROUP}	33	GROUPS= ${FREEVO_GROUP}
34		34
35	SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAULT_VERSION} \	35	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} \
36	PORTVERSION=${PORTVERSION} \	36	PORTVERSION=${PORTVERSION} \
37	FREEVO_HOME=${FREEVO_HOME}	37	FREEVO_HOME=${FREEVO_HOME}
38	SUB_FILES= pkg-message pkg-deinstall	38	SUB_FILES= pkg-message pkg-deinstall

Lines 30-36 freevo_uid=`pw usershow ${freevo_user} \| awk -F: '{print $3}'` Link Here

(-)b/multimedia/freevo/files/freevo.in (-1 / +1 lines)
30	freevo_dir=`pw usershow ${freevo_user} \| awk -F: '{print $9}'`	30	freevo_dir=`pw usershow ${freevo_user} \| awk -F: '{print $9}'`
31		31
32	command="%%PREFIX%%/bin/freevo"	32	command="%%PREFIX%%/bin/freevo"
33	command_interpreter="%%PREFIX%%/bin/%%PYTHON_VERSION%%"	33	command_interpreter="%%PYTHON_CMD%%"
34		34
35	# freevo needs PATH set so it can determine python version	35	# freevo needs PATH set so it can determine python version
36	export PATH=/bin:/usr/bin:%%PREFIX%%/bin:${freevo_dir}/bin	36	export PATH=/bin:/usr/bin:%%PREFIX%%/bin:${freevo_dir}/bin

Lines 63-70 post-install: Link Here

(-)b/net-mgmt/ccnet/Makefile (-2 / +2 lines)
63	${STAGEDIR}${PREFIX}/bin/ccnet-server \	63	${STAGEDIR}${PREFIX}/bin/ccnet-server \
64	${STAGEDIR}${PREFIX}/bin/ccnet-servtool	64	${STAGEDIR}${PREFIX}/bin/ccnet-servtool
65	(cd ${STAGEDIR}${PREFIX}/lib && \	65	(cd ${STAGEDIR}${PREFIX}/lib && \
66	${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})	66	${COPYTREE_SHARE} python${PYTHON_VER} ${STAGEDIR}${PREFIX}/${SEALIB})
67	@${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}	67	@${RM} -r ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}
68	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/	68	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
69		69
70	.include <bsd.port.mk>	70	.include <bsd.port.mk>

Lines 90-96 post-patch: Link Here

(-)b/net-mgmt/seafile/Makefile (-3 / +3 lines)
90	.if ${OSVERSION} >= 1100097	90	.if ${OSVERSION} >= 1100097
91	${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c	91	${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c
92	.endif	92	.endif
93	${REINPLACE_CMD} 's/python/${PYTHON_VERSION}/' \	93	${REINPLACE_CMD} 's\|python\|${PYTHON_CMD}\|' \
94	${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh	94	${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh
95	${REINPLACE_CMD} -e 's\|^INSTALL.*\|INSTALLPATH="${PREFIX}/${SEAFILE_SERVER}/seafile"\|' \	95	${REINPLACE_CMD} -e 's\|^INSTALL.*\|INSTALLPATH="${PREFIX}/${SEAFILE_SERVER}/seafile"\|' \
96	${WRKSRC}/scripts/seaf-cli-wrapper.sh	96	${WRKSRC}/scripts/seaf-cli-wrapper.sh
Lines 114-121 post-install: Link Here
114	${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/bin/seaf-cli ${STAGEDIR}${PREFIX}/${SEABIN}/seaf-cli.py	114	${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/bin/seaf-cli ${STAGEDIR}${PREFIX}/${SEABIN}/seaf-cli.py
115	${INSTALL_SCRIPT} ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${STAGEDIR}${PREFIX}/bin/seaf-cli	115	${INSTALL_SCRIPT} ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${STAGEDIR}${PREFIX}/bin/seaf-cli
116	(cd ${STAGEDIR}${PREFIX}/lib && \	116	(cd ${STAGEDIR}${PREFIX}/lib && \
117	${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})	117	${COPYTREE_SHARE} python${PYTHON_VER} ${STAGEDIR}${PREFIX}/${SEALIB})
118	@${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \	118	@${RM} -r ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER} \
119	${WRKSRC}/scripts/seaf-cli-wrapper.sh \	119	${WRKSRC}/scripts/seaf-cli-wrapper.sh \
120	${WRKSRC}/scripts/sqlite2mysql.[ps][yh] \	120	${WRKSRC}/scripts/sqlite2mysql.[ps][yh] \
121	${WRKSRC}/scripts/setup-seafile.sh \	121	${WRKSRC}/scripts/setup-seafile.sh \

Lines 30-37 USE_GNOME= intlhack pygobject3 Link Here

(-)b/print/system-config-printer/Makefile (-2 lines)
30	CONFIGURE_ARGS= --without-udev-rules \	30	CONFIGURE_ARGS= --without-udev-rules \
31	--without-systemdsystemunitdir	31	--without-systemdsystemunitdir
32		32
33	PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//}
34
35	SHEBANG_FILES= .py troubleshoot/.py xml/validate.py	33	SHEBANG_FILES= .py troubleshoot/.py xml/validate.py
36		34
37	PYDISTUTILS_PKGNAME= cupshelpers	35	PYDISTUTILS_PKGNAME= cupshelpers

Lines 41-48 LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}:${LOCALBASE}/lib:/usr/lib:/lib -fPIC Link Here

(-)b/sysutils/condor/Makefile (-2 / +2 lines)
41	# Does not build with Python 3	41	# Does not build with Python 3
42	CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \	42	CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \
43	-DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS} \	43	-DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS} \
44	-DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \	44	-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDEDIR} \
45	-DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so	45	-DPYTHON_LIBRARIES=${PYTHON_LIB}
46		46
47	SUB_FILES= condor-config condor_config.local pkg-message	47	SUB_FILES= condor-config condor_config.local pkg-message
48	PLIST_SUB+= CONDOR_UVER=${PORTVERSION:S/./_/g}	48	PLIST_SUB+= CONDOR_UVER=${PORTVERSION:S/./_/g}

Lines 17-23 LICENSE_FILE= ${WRKSRC}/OPENSOLARIS.LICENSE Link Here

(-)b/sysutils/py-zfs/Makefile (-1 / +1 lines)
17	USES= python:2	17	USES= python:2
18	MAKEFILE= ${FILESDIR}/Makefile.lib	18	MAKEFILE= ${FILESDIR}/Makefile.lib
19	MAKE_ARGS+= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \	19	MAKE_ARGS+= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
20	PYTHON_LDFLAGS="-L${LOCALBASE}/lib -l${PYTHON_VERSION}"	20	PYTHON_LDFLAGS="${PYTHON_LIB}"
21	NO_WRKSUBDIR= yes	21	NO_WRKSUBDIR= yes
22		22
23	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}	23	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}

Lines 2-7 Link Here

(-)b/www/py33-requests/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-requests	3	MASTERDIR= ${.CURDIR}/../py-requests
4		4
5	PYTHON_VERSION= python3.3	5	PYTHON_VERSION= cpython3.3
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/www/py34-requests/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-requests	3	MASTERDIR= ${.CURDIR}/../py-requests
4		4
5	PYTHON_VERSION= python3.4	5	PYTHON_VERSION= cpython3.4
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/www/py35-requests/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-requests	3	MASTERDIR= ${.CURDIR}/../py-requests
4		4
5	PYTHON_VERSION= python3.5	5	PYTHON_VERSION= cpython3.5
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 28-34 GH_ACCOUNT= uzbl Link Here

(-)b/www/uzbl/Makefile (-1 / +1 lines)
28		28
29	OPTIONS_DEFINE= DOCS	29	OPTIONS_DEFINE= DOCS
30		30
31	MAKE_ENV+= PYTHON=${PYTHON_VERSION}	31	MAKE_ENV+= PYTHON=${PYTHON_CMD}
32		32
33	.include <bsd.port.options.mk>	33	.include <bsd.port.options.mk>
34		34




.endif

post-patch:
	${REINPLACE_CMD} -e 's,python,${PYTHON_CMD},g' \
		-e 's,$$$${PYTHON},${PYTHON_CMD},g' \
		${WRKSRC}/Source/WebCore/DerivedSources.make \
		${WRKSRC}/Source/WebCore/DerivedSources.pri \
		${WRKSRC}/Source/WebKit2/DerivedSources.make \
		${WRKSRC}/Source/WebKit2/DerivedSources.pri \
		${WRKSRC}/Source/JavaScriptCore/DerivedSources.make \
		${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri
	${REINPLACE_CMD} -e 's,python,,g' \
		${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf

pre-configure:

Lines 2-7 Link Here

(-)b/x11-toolkits/py33-tkinter/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-tkinter	3	MASTERDIR= ${.CURDIR}/../py-tkinter
4		4
5	PYTHON_VERSION= python3.3	5	PYTHON_VERSION= cpython3.3
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/x11-toolkits/py34-tkinter/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-tkinter	3	MASTERDIR= ${.CURDIR}/../py-tkinter
4		4
5	PYTHON_VERSION= python3.4	5	PYTHON_VERSION= cpython3.4
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)b/x11-toolkits/py35-tkinter/Makefile (-1 / +1 lines)
2		2
3	MASTERDIR= ${.CURDIR}/../py-tkinter	3	MASTERDIR= ${.CURDIR}/../py-tkinter
4		4
5	PYTHON_VERSION= python3.5	5	PYTHON_VERSION= cpython3.5
6		6
7	.include "${MASTERDIR}/Makefile"	7	.include "${MASTERDIR}/Makefile"

Return to bug 213737

Lines 29-34 Link Here

(-)b/Mk/Uses/kde.mk (-12 / +21 lines)
29	.if !defined(_INCLUDE_USES_KDE_MK)	29	.if !defined(_INCLUDE_USES_KDE_MK)
30	_INCLUDE_USES_KDE_MK= yes	30	_INCLUDE_USES_KDE_MK= yes
31		31
		32	_USES_POST+= kde
		33
32	_KDE_SUPPORTED= 4	34	_KDE_SUPPORTED= 4
33		35
34	. if empty(kde_ARGS)	36	. if empty(kde_ARGS)
Lines 140-157 PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}" \ Link Here
140	. endif	142	. endif
141	# ==============================================================================	143	# ==============================================================================
142		144
143	# === HANDLE PYTHON ============================================================
144	# TODO: Keep in sync with cmake/modules/PythonMacros.cmake
145	_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//}
146	. if ${_PYTHON_SHORT_VER} > 31
147	PLIST_SUB+= PYCACHE="__pycache__/" \
148	PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \
149	PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo
150	. else
151	PLIST_SUB+= PYCACHE="" \
152	PYC_SUFFIX=pyc \
153	PYO_SUFFIX=pyo
154	. endif
155	# ==============================================================================	145	# ==============================================================================
156	_USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \	146	_USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \
157	kfilemetadata korundum libkcddb libkcompactdisc \	147	kfilemetadata korundum libkcddb libkcompactdisc \
Lines 339-341 IGNORE= cannot be installed: unknown USE_KDE component '${component}' Link Here
339	. endfor	329	. endfor
340		330
341	.endif	331	.endif
		332
		333	.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KDE_POST_MK)
		334	_INCLUDE_USES_KDE_POST_MK= yes
		335
		336	# === HANDLE PYTHON ============================================================
		337	# TODO: Keep in sync with cmake/modules/PythonMacros.cmake
		338	.if defined(PYTHON_SUFFIX)
		339	. if ${PYTHON_SUFFIX} > 31
		340	PLIST_SUB+= PYCACHE="__pycache__/" \
		341	PYC_SUFFIX=cpython-${PYTHON_SUFFIX}.pyc \
		342	PYO_SUFFIX=cpython-${PYTHON_SUFFIX}.pyo
		343	. else
		344	PLIST_SUB+= PYCACHE="" \
		345	PYC_SUFFIX=pyc \
		346	PYO_SUFFIX=pyo
		347	. endif
		348	.endif
		349
		350	.endif

Lines 61-72 PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} Link Here

(-)b/Mk/bsd.default-versions.mk (-6 / +6 lines)
61	PGSQL_DEFAULT?= 9.3	61	PGSQL_DEFAULT?= 9.3
62	# Possible values: 5.6, 7.0	62	# Possible values: 5.6, 7.0
63	PHP_DEFAULT?= 5.6	63	PHP_DEFAULT?= 5.6
64	# Possible values: 2.7, 3.3, 3.4, 3.5	64	# Possible values: cpython2.7, cpython3.3, cpython3.4, cpython3.5, pypy2.7 pypy3.3
65	PYTHON_DEFAULT?= 2.7	65	PYTHON_DEFAULT?= cpython2.7
66	# Possible values: 2.7	66	# Possible values: cpython2.7, pypy2.7
67	PYTHON2_DEFAULT?= 2.7	67	PYTHON2_DEFAULT?= cpython2.7
68	# Possible values: 3.3, 3.4, 3.5	68	# Possible values: cpython3.3, cpython3.4, cpython3.5, pypy2.7 pypy3.3
69	PYTHON3_DEFAULT?= 3.5	69	PYTHON3_DEFAULT?= cpython3.5
70	# Possible values: 2.0, 2.1, 2.2, 2.3	70	# Possible values: 2.0, 2.1, 2.2, 2.3
71	RUBY_DEFAULT?= 2.2	71	RUBY_DEFAULT?= 2.2
72	# Possible values: base, openssl, openssl-devel, libressl, libressl-devel	72	# Possible values: base, openssl, openssl-devel, libressl, libressl-devel

Lines 20-62 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds Link Here

(-)b/databases/metakit/Makefile (-28 / +13 lines)
20		20
21	OPTIONS_DEFINE= PYTHON TCL DOCS	21	OPTIONS_DEFINE= PYTHON TCL DOCS
22	OPTIONS_DEFAULT= PYTHON	22	OPTIONS_DEFAULT= PYTHON
		23	OPTIONS_SUB= yes
23		24
24	.include <bsd.port.options.mk>	25	PYTHON_CATEGORIES= python
		26	PYTHON_CONFIGURE_WITH= python=${PYTHON_INCLUDEDIR},${PYTHON_SITELIBDIR}
		27	PYTHON_USES= python
25		28
26	.if ${PORT_OPTIONS:MPYTHON}	29	TCL_CATEGORIES= tcl
27	USES+= python	30	TCL_CONFIGURE_ENV= TCL_LIBDIR=${TCL_LIBDIR}
28	CONFIGURE_ARGS+= --with-python=${LOCALBASE}	31	TCL_CONFIGURE_WITH= tcl=${TCL_INCLUDEDIR}
29	CATEGORIES+= python	32	TCL_PLIST_SUB= TCL_V="${TCL_VER}"
30	PLIST_SUB+= WITH_PYTHON=""	33	TCL_USES= tcl:85
31	.else
32	PLIST_SUB+= WITH_PYTHON="@comment "
33	.endif
34
35	.if ${PORT_OPTIONS:MTCL}
36	USES+= tcl:85
37	CATEGORIES+= tcl
38	CONFIGURE_ARGS+=--with-tcl=${TCL_INCLUDEDIR}
39	CONFIGURE_ENV+= TCL_LIBDIR=${TCL_LIBDIR}
40	PLIST_SUB+= TCL_V="${TCL_VER}"
41	PLIST_SUB+= WITH_TCL=""
42	.else
43	PLIST_SUB+= WITH_TCL="@comment "
44	.endif
45		34
46	pre-patch:	35	pre-patch:
47	${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html	36	${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html
48	${REINPLACE_CMD} -e "s\|= tclsh\|=${TCLSH}\|" \	37	${REINPLACE_CMD} -e "s\|= tclsh\|=${TCLSH}\|" \
49	${WRKSRC}/../unix/Makefile.in	38	${WRKSRC}/../unix/Makefile.in
50	${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \
51	${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/configure
52		39
53	post-build:	40	post-build-PYTHON-on:
54	.if ${PORT_OPTIONS:MPYTHON}
55	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \	41	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
56	${WRKSRC}/../python	42	${WRKSRC}/../python
57	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \	43	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
58	${WRKSRC}/../python	44	${WRKSRC}/../python
59	.endif
60		45
61	pre-install:	46	pre-install:
62	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}	47	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
Lines 71-82 post-install: Link Here
71	${INSTALL_DATA} ${WRKSRC}/../Metakit.html ${WRKSRC}/../CHANGES \	56	${INSTALL_DATA} ${WRKSRC}/../Metakit.html ${WRKSRC}/../CHANGES \
72	${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}	57	${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}
73		58
74	test:	59	do-test:
75	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \	60	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
76	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)	61	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
77	.if ${PORT_OPTIONS:MTCL}	62
		63	do-test-TCL-on:
78	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \	64	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
79	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl)	65	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl)
80	.endif
81		66
82	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Lines 4-15 include/mk4str.h Link Here

(-)b/databases/metakit/pkg-plist (-6 / +6 lines)
4	include/mk4str.inl	4	include/mk4str.inl
5	lib/libmk4.so	5	lib/libmk4.so
6	lib/libmk4.so.0	6	lib/libmk4.so.0
7	%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so	7	%%PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so
8	%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py	8	%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py
9	%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc	9	%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc
10	%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo	10	%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo
11	%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so	11	%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so
12	%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl	12	%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl
13	%%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes.html	13	%%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes.html
14	%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp.html	14	%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp.html
15	%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp_desc.html	15	%%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp_desc.html

Lines 20-26 PORTSCOUT= limitw:1,even Link Here

(-)b/devel/libsoup/Makefile (-3 / +2 lines)
20	.if !defined(REFERENCE_PORT)	20	.if !defined(REFERENCE_PORT)
21		21
22	USES+= gettext gmake gnome libtool pathfix pkgconfig \	22	USES+= gettext gmake gnome libtool pathfix pkgconfig \
23	python:3:build sqlite:3 tar:xz	23	python:3:build shebangfix sqlite:3 tar:xz
24	USE_GNOME= glib20 intlhack introspection:build \	24	USE_GNOME= glib20 intlhack introspection:build \
25	libxml2 referencehack	25	libxml2 referencehack
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
Lines 30-35 CONFIGURE_ARGS= --disable-more-warnings \ Link Here
30	CPPFLAGS+= -I${LOCALBASE}/include	30	CPPFLAGS+= -I${LOCALBASE}/include
31	LIBS+= -L${LOCALBASE}/lib	31	LIBS+= -L${LOCALBASE}/lib
32	INSTALL_TARGET= install-strip	32	INSTALL_TARGET= install-strip
		33	SHEBANG_FILES= ${WRKSRC}/libsoup/tld-parser.py
33		34
34	LIBVERSION= 1.7.0	35	LIBVERSION= 1.7.0
35	PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION}	36	PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION}
Lines 45-52 CONFIGURE_ARGS+=--without-gnome Link Here
45	post-patch:	46	post-patch:
46	@${REINPLACE_CMD} -e 's\|-Wmissing-include-dirs\|\|g' \	47	@${REINPLACE_CMD} -e 's\|-Wmissing-include-dirs\|\|g' \
47	${WRKSRC}/configure	48	${WRKSRC}/configure
48	@${REINPLACE_CMD} -e 's\|env python\|env ${PYTHON_VERSION}\|g' \
49	${WRKSRC}/libsoup/tld-parser.py
50	@${REINPLACE_CMD} -e 's\|DATADIRNAME=lib\|DATADIRNAME=share\|g' \	49	@${REINPLACE_CMD} -e 's\|DATADIRNAME=lib\|DATADIRNAME=share\|g' \
51	${WRKSRC}/configure	50	${WRKSRC}/configure
52		51

Lines 30-41 include/PySide/pysideqflags.h Link Here

(-)b/devel/pyside/pkg-plist (-4 / +4 lines)
30	include/PySide/pysidesignal.h	30	include/PySide/pysidesignal.h
31	include/PySide/pysideweakref.h	31	include/PySide/pysideweakref.h
32	include/PySide/signalmanager.h	32	include/PySide/signalmanager.h
33	lib/cmake/PySide-%%PORTVERSION%%/PySideConfig-%%PYTHON_VERSION%%.cmake	33	lib/cmake/PySide-%%PORTVERSION%%/PySideConfig-python%%PYTHON_VER%%.cmake
34	lib/cmake/PySide-%%PORTVERSION%%/PySideConfig.cmake	34	lib/cmake/PySide-%%PORTVERSION%%/PySideConfig.cmake
35	lib/cmake/PySide-%%PORTVERSION%%/PySideConfigVersion.cmake	35	lib/cmake/PySide-%%PORTVERSION%%/PySideConfigVersion.cmake
36	lib/libpyside-%%PYTHON_VERSION%%.so	36	lib/libpyside-python%%PYTHON_VER%%.so
37	lib/libpyside-%%PYTHON_VERSION%%.so.1.2	37	lib/libpyside-python%%PYTHON_VER%%.so.1.2
38	lib/libpyside-%%PYTHON_VERSION%%.so.%%PORTVERSION%%	38	lib/libpyside-python%%PYTHON_VER%%.so.%%PORTVERSION%%
39	%%PYTHON_SITELIBDIR%%/PySide/QtCore.so	39	%%PYTHON_SITELIBDIR%%/PySide/QtCore.so
40	%%PYTHON_SITELIBDIR%%/PySide/QtDeclarative.so	40	%%PYTHON_SITELIBDIR%%/PySide/QtDeclarative.so
41	%%PYTHON_SITELIBDIR%%/PySide/QtGui.so	41	%%PYTHON_SITELIBDIR%%/PySide/QtGui.so

Lines 18-29 include/shiboken/shibokenbuffer.h Link Here

(-)b/devel/shiboken/pkg-plist (-4 / +4 lines)
18	include/shiboken/shibokenmacros.h	18	include/shiboken/shibokenmacros.h
19	include/shiboken/threadstatesaver.h	19	include/shiboken/threadstatesaver.h
20	include/shiboken/typeresolver.h	20	include/shiboken/typeresolver.h
21	lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig-%%PYTHON_VERSION%%.cmake	21	lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig-python%%PYTHON_VER%%.cmake
22	lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig.cmake	22	lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfig.cmake
23	lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfigVersion.cmake	23	lib/cmake/Shiboken-%%PORTVERSION%%/ShibokenConfigVersion.cmake
24	lib/libshiboken-%%PYTHON_VERSION%%.so	24	lib/libshiboken-python%%PYTHON_VER%%.so
25	lib/libshiboken-%%PYTHON_VERSION%%.so.1	25	lib/libshiboken-python%%PYTHON_VER%%.so.1
26	lib/libshiboken-%%PYTHON_VERSION%%.so.%%PORTVERSION%%	26	lib/libshiboken-python%%PYTHON_VER%%.so.%%PORTVERSION%%
27	libdata/pkgconfig/shiboken.pc	27	libdata/pkgconfig/shiboken.pc
28	%%PYTHON_SITELIBDIR%%/shiboken.so	28	%%PYTHON_SITELIBDIR%%/shiboken.so
29	%%PORTDOCS%%%%DOCSDIR%%/.buildinfo	29	%%PORTDOCS%%%%DOCSDIR%%/.buildinfo

Lines 19-33 Link Here

(-)b/games/kiki/files/patch-linux-Makefile (-3 / +3 lines)
19	- $(PYTHONHOME)/lib-dynload/time.so \	19	- $(PYTHONHOME)/lib-dynload/time.so \
20	- $(PYTHONHOME)/lib-dynload/_random.so	20	- $(PYTHONHOME)/lib-dynload/_random.so
21	+X11_INCLUDES = -I ${LOCALBASE}/include/	21	+X11_INCLUDES = -I ${LOCALBASE}/include/
22	+PYTHON_INCLUDES = -I ${LOCALBASE}/include/python$(PYTHON_VER)	22	+PYTHON_INCLUDES = -I ${PYTHON_INCLUDEDIR}
23	+	23	+
24	+SDLCFLAGS = $(shell ${SDL_CONFIG} --cflags)	24	+SDLCFLAGS = $(shell ${SDL_CONFIG} --cflags)
25	+SDLLIBS = $(shell ${SDL_CONFIG} --libs) -lSDL_image -lSDL_mixer	25	+SDLLIBS = $(shell ${SDL_CONFIG} --libs) -lSDL_image -lSDL_mixer
26	+	26	+
27	+GLLIBS = -lglut -lGLU -lGL -L${LOCALBASE}/lib	27	+GLLIBS = -lglut -lGLU -lGL -L${LOCALBASE}/lib
28	+	28	+
29	+PYTHONHOME = ${LOCALBASE}/lib/python$(PYTHON_VER)/	29	+PYTHONHOME = ${PYTHON_LIBDIR}
30	+PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VER).a -lutil -lpython${PYTHON_VER}	30	+PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VER).a -lutil ${PYTHON_LIB}
31		31
32	# change this, if the kodilib directory isn't parallel to the kiki directory	32	# change this, if the kodilib directory isn't parallel to the kiki directory
33		33

Lines 56-69 BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils Link Here

(-)b/www/webkit-qt5/Makefile (-3 / +4 lines)
56	.endif	56	.endif
57		57
58	post-patch:	58	post-patch:
59	${REINPLACE_CMD} -e 's,python,${PYTHON_VERSION},g' \	59	${REINPLACE_CMD} -e 's,python,${PYTHON_CMD},g' \
60	-e 's,$$$${PYTHON},${PYTHON_VERSION},g' \	60	-e 's,$$$${PYTHON},${PYTHON_CMD},g' \
61	${WRKSRC}/Source/WebCore/DerivedSources.make \	61	${WRKSRC}/Source/WebCore/DerivedSources.make \
62	${WRKSRC}/Source/WebCore/DerivedSources.pri \	62	${WRKSRC}/Source/WebCore/DerivedSources.pri \
63	${WRKSRC}/Source/WebKit2/DerivedSources.make \	63	${WRKSRC}/Source/WebKit2/DerivedSources.make \
64	${WRKSRC}/Source/WebKit2/DerivedSources.pri \	64	${WRKSRC}/Source/WebKit2/DerivedSources.pri \
65	${WRKSRC}/Source/JavaScriptCore/DerivedSources.make \	65	${WRKSRC}/Source/JavaScriptCore/DerivedSources.make \
66	${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \	66	${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri
		67	${REINPLACE_CMD} -e 's,python,,g' \
67	${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf	68	${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf
68		69
69	pre-configure:	70	pre-configure: