Index: Makefile
===================================================================
--- Makefile	(revision 461732)
+++ Makefile	(working copy)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=		tevent
-PORTVERSION=		0.9.34
-PORTREVISION=		1
+PORTVERSION=		0.9.35
+PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
@@ -14,9 +14,14 @@
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
-BUILD_DEPENDS=		talloc>=2.1.10:devel/talloc
-RUN_DEPENDS=		talloc>=2.1.10:devel/talloc
+BUILD_DEPENDS=		talloc>=2.1.11:devel/talloc
+RUN_DEPENDS=		talloc>=2.1.11:devel/talloc
 
+FLAVORS=		default nopython
+nopython_PKGNAMESUFFIX=	-nopython
+nopython_CONFLICTS=	tevent
+default_CONFLICTS=	tevent-nopython
+
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
@@ -28,7 +33,6 @@
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
 			--disable-rpath \
 			--without-gettext
 
@@ -42,7 +46,7 @@
 			lib/libtevent.so.0 \
 			%%PKGCONFIGDIR%%/tevent.pc
 
-.if defined(NO_PYTHON)
+.if ${FLAVOR:U} == nopython
 USES+=			python:2.7,build
 CONFIGURE_ARGS+=	--disable-python
 .else
@@ -73,7 +77,7 @@
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
-PLIST_FILES+=		%%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.so \
+PLIST_FILES+=		%%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.py  \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyc \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyo
@@ -108,16 +112,18 @@
 				${FALSE}; \
 			fi
 
+.if ${FLAVOR:U} != nopython
 post-build:
 			${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
 			${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
+.endif
 
 post-install:
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
-.if !defined(NO_PYTHON)
+.if ${FLAVOR:U} != nopython
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
 .if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.so
+			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 
Index: distinfo
===================================================================
--- distinfo	(revision 461732)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510686207
-SHA256 (tevent-0.9.34.tar.gz) = 73213ef8b27f4a0164e375140a177a751e06fe190a90f3178e24f206b4747b8a
-SIZE (tevent-0.9.34.tar.gz) = 590260
+TIMESTAMP = 1516161103
+SHA256 (tevent-0.9.35.tar.gz) = 25a3a9d264eb3af9a688c38512f248fc1640fd86d663d3346dbfa18feb5c16e9
+SIZE (tevent-0.9.35.tar.gz) = 591546
Index: files/patch-buildtools__wafsamba__samba_autoconf.py
===================================================================
--- files/patch-buildtools__wafsamba__samba_autoconf.py	(revision 461732)
+++ files/patch-buildtools__wafsamba__samba_autoconf.py	(working copy)
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
Index: files/patch-buildtools__wafsamba__samba_python.py
===================================================================
--- files/patch-buildtools__wafsamba__samba_python.py	(revision 461732)
+++ files/patch-buildtools__wafsamba__samba_python.py	(working copy)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig	2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
 +++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
  
  def _check_python_headers(conf, mandatory):
      try:
@@ -19,12 +19,16 @@
      if conf.env['PYTHON_VERSION'] > '3':
 -        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 -        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON3_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG
++        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
++           while environment variable is PYTHON3_SO_ABI_FLAG'''
++        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
++        if override_PYTHON_SO_ABI_FLAG is not None:
++            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
++            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +        if not conf.env['PYTHON_SO_ABI_FLAG']:
 +            if conf.env['PYTHON_SO_ABI']:
 +                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
++                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +            else:
 +                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 +                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
Index: files/patch-buildtools__wafsamba__wscript
===================================================================
--- files/patch-buildtools__wafsamba__wscript	(nonexistent)
+++ files/patch-buildtools__wafsamba__wscript	(working copy)
@@ -0,0 +1,15 @@
+--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -76,10 +76,10 @@ def set_options(opt):
+ 
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')

Property changes on: files/patch-buildtools__wafsamba__wscript
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property