aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimur <timur@FreeBSD.org>2017-12-17 14:06:00 +0800
committertimur <timur@FreeBSD.org>2017-12-17 14:06:00 +0800
commitfceb3fe54bf9a992dee963caa0b5645aa8361d95 (patch)
tree91d0c9f44c3010c97d8e83e48bafff1aaf5c3dfb
parent701b038e6afc3ec6ed29b723e5a263b4946e8c4c (diff)
downloadfreebsd-ports-gnome-fceb3fe54bf9a992dee963caa0b5645aa8361d95.tar.gz
freebsd-ports-gnome-fceb3fe54bf9a992dee963caa0b5645aa8361d95.tar.zst
freebsd-ports-gnome-fceb3fe54bf9a992dee963caa0b5645aa8361d95.zip
Small useless bump of the version to make poudriere pick up changes in WITH_SAMBA4_PYTHON3 usage
Diffstat
-rw-r--r--databases/ldb12/Makefile46
-rw-r--r--databases/ldb13/Makefile44
-rw-r--r--databases/tdb/Makefile38
-rw-r--r--devel/talloc/Makefile44
-rw-r--r--devel/tevent/Makefile42
5 files changed, 107 insertions, 107 deletions
diff --git a/databases/ldb12/Makefile b/databases/ldb12/Makefile
index 03323d857580..93f97ee4375f 100644
--- a/databases/ldb12/Makefile
+++ b/databases/ldb12/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ldb
PORTVERSION= 1.2.2
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= databases
MASTER_SITES= SAMBA
@@ -92,30 +92,30 @@ PLIST_FILES+= include/pyldb.h \
%%PKGCONFIGDIR%%/pyldb-util.pc
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA_PYTHON3) && ${WITH_SAMBA_PYTHON3:Mpython3\.[0-9]}
-SAMBA_PYTHON3= ${WITH_SAMBA_PYTHON3}
-SAMBA_PYTHON3_VERSION:= ${SAMBA_PYTHON3:S/^python//}
-SAMBA_PYTHON3_VER:= ${SAMBA_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA_PYTHON3_VER})
-.error unsupported or unknown Python version ${SAMBA_PYTHON3_VERSION}
+.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:Mpython3\.[0-9]}
+SAMBA4_PYTHON3= ${WITH_SAMBA4_PYTHON3}
+SAMBA4_PYTHON3_VERSION:=${SAMBA4_PYTHON3:S/^python//}
+SAMBA4_PYTHON3_VER:= ${SAMBA4_PYTHON3_VERSION:C/\.//}
+.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
+.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
-BUILD_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
-RUN_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
+BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
+RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
-SAMBA_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA_PYTHON3_SITELIBDIR=lib/python${SAMBA_PYTHON3_VERSION}/site-packages
+SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
+SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA_PYTHON3}
+CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
+CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-PLIST_SUB+= SAMBA_PYTHON3_SO_ABI=${SAMBA_PYTHON3_SO_ABI} \
- SAMBA_PYTHON3_SITELIBDIR=${SAMBA_PYTHON3_SITELIBDIR}
+PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
+ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-PLIST_FILES+= lib/libpyldb-util.%%SAMBA_PYTHON3_SO_ABI%%.so \
- lib/libpyldb-util.%%SAMBA_PYTHON3_SO_ABI%%.so.1 \
- %%SAMBA_PYTHON3_SITELIBDIR%%/ldb.so \
- %%SAMBA_PYTHON3_SITELIBDIR%%/_ldb_text.py \
- %%PKGCONFIGDIR%%/pyldb-util.%%SAMBA_PYTHON3_SO_ABI%%.pc
+PLIST_FILES+= lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
+ lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.1 \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.so \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py \
+ %%PKGCONFIGDIR%%/pyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
.endif
.endif
@@ -171,9 +171,9 @@ post-install:
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
-.if defined(SAMBA_PYTHON3)
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA_PYTHON3_SO_ABI}.so
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA_PYTHON3_SITELIBDIR}/ldb.so
+.if defined(SAMBA4_PYTHON3)
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.so
.endif
.endif
diff --git a/databases/ldb13/Makefile b/databases/ldb13/Makefile
index afab40e0eda1..49050b75defb 100644
--- a/databases/ldb13/Makefile
+++ b/databases/ldb13/Makefile
@@ -92,30 +92,30 @@ PLIST_FILES+= include/pyldb.h \
%%PKGCONFIGDIR%%/pyldb-util.pc
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA_PYTHON3) && ${WITH_SAMBA_PYTHON3:Mpython3\.[0-9]}
-SAMBA_PYTHON3= ${WITH_SAMBA_PYTHON3}
-SAMBA_PYTHON3_VERSION:= ${SAMBA_PYTHON3:S/^python//}
-SAMBA_PYTHON3_VER:= ${SAMBA_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA_PYTHON3_VER})
-.error unsupported or unknown Python version ${SAMBA_PYTHON3_VERSION}
+.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:Mpython3\.[0-9]}
+SAMBA4_PYTHON3= ${WITH_SAMBA4_PYTHON3}
+SAMBA4_PYTHON3_VERSION:=${SAMBA4_PYTHON3:S/^python//}
+SAMBA4_PYTHON3_VER:= ${SAMBA4_PYTHON3_VERSION:C/\.//}
+.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
+.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
-BUILD_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
-RUN_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
+BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
+RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
-SAMBA_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA_PYTHON3_SITELIBDIR=lib/python${SAMBA_PYTHON3_VERSION}/site-packages
+SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
+SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA_PYTHON3}
+CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
+CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-PLIST_SUB+= SAMBA_PYTHON3_SO_ABI=${SAMBA_PYTHON3_SO_ABI} \
- SAMBA_PYTHON3_SITELIBDIR=${SAMBA_PYTHON3_SITELIBDIR}
+PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
+ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-PLIST_FILES+= lib/libpyldb-util.%%SAMBA_PYTHON3_SO_ABI%%.so \
- lib/libpyldb-util.%%SAMBA_PYTHON3_SO_ABI%%.so.1 \
- %%SAMBA_PYTHON3_SITELIBDIR%%/ldb.so \
- %%SAMBA_PYTHON3_SITELIBDIR%%/_ldb_text.py \
- %%PKGCONFIGDIR%%/pyldb-util.%%SAMBA_PYTHON3_SO_ABI%%.pc
+PLIST_FILES+= lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
+ lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.1 \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.so \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py \
+ %%PKGCONFIGDIR%%/pyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
.endif
.endif
@@ -171,9 +171,9 @@ post-install:
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
-.if defined(SAMBA_PYTHON3)
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA_PYTHON3_SO_ABI}.so
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA_PYTHON3_SITELIBDIR}/ldb.so
+.if defined(SAMBA4_PYTHON3)
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.so
.endif
.endif
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index e72a2af9812f..8d94c2015262 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tdb
PORTVERSION= 1.3.15
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SAMBA
@@ -53,27 +53,27 @@ PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so \
%%PYTHON_SITELIBDIR%%/_tdb_text.py
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA_PYTHON3) && ${WITH_SAMBA_PYTHON3:Mpython3\.[0-9]}
-SAMBA_PYTHON3= ${WITH_SAMBA_PYTHON3}
-SAMBA_PYTHON3_VERSION:= ${SAMBA_PYTHON3:S/^python//}
-SAMBA_PYTHON3_VER:= ${SAMBA_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA_PYTHON3_VER})
-.error unsupported or unknown Python version ${SAMBA_PYTHON3_VERSION}
+.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:Mpython3\.[0-9]}
+SAMBA4_PYTHON3= ${WITH_SAMBA4_PYTHON3}
+SAMBA4_PYTHON3_VERSION:=${SAMBA4_PYTHON3:S/^python//}
+SAMBA4_PYTHON3_VER:= ${SAMBA4_PYTHON3_VERSION:C/\.//}
+.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
+.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
-BUILD_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
-RUN_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
+BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
+RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
-SAMBA_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA_PYTHON3_SITELIBDIR=lib/python${SAMBA_PYTHON3_VERSION}/site-packages
+SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
+SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA_PYTHON3}
+CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
+CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-PLIST_SUB+= SAMBA_PYTHON3_SO_ABI=${SAMBA_PYTHON3_SO_ABI} \
- SAMBA_PYTHON3_SITELIBDIR=${SAMBA_PYTHON3_SITELIBDIR}
+PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
+ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-PLIST_FILES+= %%SAMBA_PYTHON3_SITELIBDIR%%/tdb.so \
- %%SAMBA_PYTHON3_SITELIBDIR%%/_tdb_text.py
+PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/tdb.so \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/_tdb_text.py
.endif
.endif
@@ -124,8 +124,8 @@ post-install:
.endfor
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so
-.if defined(SAMBA_PYTHON3)
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA_PYTHON3_SITELIBDIR}/tdb.so
+.if defined(SAMBA4_PYTHON3)
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.so
.endif
.endif
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 36aa9afd1bab..288a88b9d199 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= talloc
PORTVERSION= 2.1.10
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SAMBA
@@ -49,29 +49,29 @@ PLIST_FILES+= include/pytalloc.h \
%%PKGCONFIGDIR%%/pytalloc-util.pc
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA_PYTHON3) && ${WITH_SAMBA_PYTHON3:Mpython3\.[0-9]}
-SAMBA_PYTHON3= ${WITH_SAMBA_PYTHON3}
-SAMBA_PYTHON3_VERSION:= ${SAMBA_PYTHON3:S/^python//}
-SAMBA_PYTHON3_VER:= ${SAMBA_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA_PYTHON3_VER})
-.error unsupported or unknown Python version ${SAMBA_PYTHON3_VERSION}
+.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:Mpython3\.[0-9]}
+SAMBA4_PYTHON3= ${WITH_SAMBA4_PYTHON3}
+SAMBA4_PYTHON3_VERSION:=${SAMBA4_PYTHON3:S/^python//}
+SAMBA4_PYTHON3_VER:= ${SAMBA4_PYTHON3_VERSION:C/\.//}
+.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
+.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
-BUILD_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
-RUN_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
+BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
+RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
-SAMBA_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA_PYTHON3_SITELIBDIR=lib/python${SAMBA_PYTHON3_VERSION}/site-packages
+SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
+SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA_PYTHON3}
+CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
+CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-PLIST_SUB+= SAMBA_PYTHON3_SO_ABI=${SAMBA_PYTHON3_SO_ABI} \
- SAMBA_PYTHON3_SITELIBDIR=${SAMBA_PYTHON3_SITELIBDIR}
+PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
+ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-PLIST_FILES+= lib/libpytalloc-util.%%SAMBA_PYTHON3_SO_ABI%%.so \
- lib/libpytalloc-util.%%SAMBA_PYTHON3_SO_ABI%%.so.2 \
- %%SAMBA_PYTHON3_SITELIBDIR%%/talloc.so \
- %%PKGCONFIGDIR%%/pytalloc-util.%%SAMBA_PYTHON3_SO_ABI%%.pc
+PLIST_FILES+= lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
+ lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.2 \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.so \
+ %%PKGCONFIGDIR%%/pytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
.endif
.endif
@@ -123,9 +123,9 @@ post-install:
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.so
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
-.if defined(SAMBA_PYTHON3)
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA_PYTHON3_SO_ABI}.so
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA_PYTHON3_SITELIBDIR}/talloc.so
+.if defined(SAMBA4_PYTHON3)
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.so
.endif
.endif
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index b8beb37052d1..f7a28cb0b8f8 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tevent
PORTVERSION= 0.9.34
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= devel
MASTER_SITES= SAMBA
@@ -54,29 +54,29 @@ PLIST_FILES+= %%PYTHON_SITELIBDIR%%/_tevent.so \
%%PYTHON_SITELIBDIR%%/tevent.pyo
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA_PYTHON3) && ${WITH_SAMBA_PYTHON3:Mpython3\.[0-9]}
-SAMBA_PYTHON3= ${WITH_SAMBA_PYTHON3}
-SAMBA_PYTHON3_VERSION:= ${SAMBA_PYTHON3:S/^python//}
-SAMBA_PYTHON3_VER:= ${SAMBA_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA_PYTHON3_VER})
-.error unsupported or unknown Python version ${SAMBA_PYTHON3_VERSION}
+.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:Mpython3\.[0-9]}
+SAMBA4_PYTHON3= ${WITH_SAMBA4_PYTHON3}
+SAMBA4_PYTHON3_VERSION:=${SAMBA4_PYTHON3:S/^python//}
+SAMBA4_PYTHON3_VER:= ${SAMBA4_PYTHON3_VERSION:C/\.//}
+.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
+.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
-BUILD_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
-RUN_DEPENDS+= ${SAMBA_PYTHON3}:lang/python${SAMBA_PYTHON3_VER}
+BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
+RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
-SAMBA_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA_PYTHON3_SITELIBDIR=lib/python${SAMBA_PYTHON3_VERSION}/site-packages
+SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
+SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA_PYTHON3}
+CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
+CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-PLIST_SUB+= SAMBA_PYTHON3_SO_ABI=${SAMBA_PYTHON3_SO_ABI} \
- SAMBA_PYTHON3_SITELIBDIR=${SAMBA_PYTHON3_SITELIBDIR}
+PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
+ SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-PLIST_FILES+= %%SAMBA_PYTHON3_SITELIBDIR%%/_tevent.so \
- %%SAMBA_PYTHON3_SITELIBDIR%%/tevent.py \
- %%SAMBA_PYTHON3_SITELIBDIR%%/tevent.pyc \
- %%SAMBA_PYTHON3_SITELIBDIR%%/tevent.pyo
+PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.so \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.py \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyc \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyo
.endif
.endif
@@ -116,8 +116,8 @@ post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
-.if defined(SAMBA_PYTHON3)
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA_PYTHON3_SITELIBDIR}/_tevent.so
+.if defined(SAMBA4_PYTHON3)
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.so
.endif
.endif
generated by cgit (git 2.34.1) at 2024-11-23 10:22:52 +0800