diff --git a/net/libdnet/files/patch-configure.ac b/net/libdnet/files/patch-configure.ac index 6a812f27b63d..b3bfe2f2cedc 100644 --- a/net/libdnet/files/patch-configure.ac +++ b/net/libdnet/files/patch-configure.ac @@ -1,43 +1,43 @@ Do not invasively check for BPF (Ethernet check queries presence of /dev/bpfX): we know that FreeBSD has BPF and ports can be *built* inside infrastructure that has no such /dev entries; like a jail without devfs configured to unhide BPF devices. The presence of the net/bpf.h is checked in configure earlier, so sanity checks for the build environment will still be present. Macro HAVE_BSD_BPF won't be defined after this modification, but as of libdnet-1.13 it is not used at all inside libdnet's code. FreeBSD PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238523 Origin: rea@FreeBSD.org ---- configure.ac.old 2019-06-30 21:36:25.906488000 +0300 -+++ configure.ac 2019-06-30 21:39:21.116185000 +0300 -@@ -203,7 +203,6 @@ +--- configure.ac.orig 2019-03-19 17:55:02 UTC ++++ configure.ac +@@ -203,7 +203,6 @@ AC_CHECK_FUNCS([gethostbyname gettimeofday memmove mem AC_REPLACE_FUNCS(err strlcat strlcpy strsep) dnl Checks for other system-specific jonks. -AC_DNET_BSD_BPF AC_DNET_RAWIP_HOST_OFFLEN dnl Check for arp interface. -@@ -219,18 +218,7 @@ +@@ -219,18 +218,7 @@ else (exit 1); exit 1; fi -dnl Check for Ethernet interface. -if test "$ac_cv_dnet_bsd_bpf" = yes ; then - AC_LIBOBJ([eth]) -else - echo "|------------------------------------------|" - echo "|No suitable Ethernet interface found. Most|" - echo "|probably you are not running the FreeBSD |" - echo "|OS. Please consider using this version |" - echo "|of libdnet with the FreeBSD system |" - echo "|------------------------------------------|" - (exit 1); exit 1; -fi +AC_LIBOBJ([eth]) dnl Check for firewall interface. if test "$ac_cv_header_net_pfvar_h" = yes ; then diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile index 37c5095de6d2..2742a942c570 100644 --- a/net/py-libdnet/Makefile +++ b/net/py-libdnet/Makefile @@ -1,38 +1,44 @@ PORTREVISION= 4 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python module for libdnet LIB_DEPENDS= libdnet.so:net/libdnet USES= autoreconf libtool python:3.6+ MASTERDIR= ${.CURDIR}/../libdnet INSTALL_WRKSRC= ${WRKSRC}/python DESCR= ${.CURDIR}/pkg-descr PLIST= ${NONEXISTENT} PLIST_FILES= ${PYTHON_SITELIBDIR}/dnet%%PYTHON_EXT_SUFFIX%%.so \ ${PYTHON_SITELIBDIR}/dnet-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \ ${PYTHON_SITELIBDIR}/dnet-${PORTVERSION}-py${PYTHON_VER}.egg-info/SOURCES.txt \ ${PYTHON_SITELIBDIR}/dnet-${PORTVERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \ ${PYTHON_SITELIBDIR}/dnet-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt LIBDNET_SLAVE= yes USE_PYTHON= cython flavors CONFIGURE_ARGS= --with-python=${PYTHON_CMD} .if defined(MAINTAINER_MODE) regression-test: install ${PYTHON_CMD} ${INSTALL_WRKSRC}/test.py .endif +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-patch: ${REINPLACE_CMD} 's|%%CYTHON%%|cython-${PYTHON_VER}|g' \ ${WRKSRC}/python/Makefile.am post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/dnet*.so .include "${MASTERDIR}/Makefile"