Date: Wed, 23 May 2018 22:37:05 +0000 (UTC) From: Josh Paetzel <jpaetzel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470726 - in head/emulators/open-vm-tools: . files Message-ID: <201805232237.w4NMb5rh020957@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jpaetzel Date: Wed May 23 22:37:05 2018 New Revision: 470726 URL: https://svnweb.freebsd.org/changeset/ports/470726 Log: Unbreak after src r333813 Fallout from being out of tree. Added: head/emulators/open-vm-tools/files/extra-patch-modules_freebsd_vmxnet_net__compat.h (contents, props changed) Modified: head/emulators/open-vm-tools/Makefile Modified: head/emulators/open-vm-tools/Makefile ============================================================================== --- head/emulators/open-vm-tools/Makefile Wed May 23 21:59:34 2018 (r470725) +++ head/emulators/open-vm-tools/Makefile Wed May 23 22:37:05 2018 (r470726) @@ -4,7 +4,7 @@ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} DISTVERSIONPREFIX= stable- -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 2 CATEGORIES= emulators @@ -64,6 +64,10 @@ USE_RC_SUBR= vmware-guestd vmware-kmod INSTALL_TARGET= install-strip .include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200063 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-modules_freebsd_vmxnet_net__compat.h +.endif .if ${PORT_OPTIONS:MX11} CONFLICTS= open-vm-tools-nox11-[0-9]* Added: head/emulators/open-vm-tools/files/extra-patch-modules_freebsd_vmxnet_net__compat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/open-vm-tools/files/extra-patch-modules_freebsd_vmxnet_net__compat.h Wed May 23 22:37:05 2018 (r470726) @@ -0,0 +1,13 @@ +--- modules/freebsd/vmxnet/net_compat.h.orig 2018-05-23 22:11:09 UTC ++++ modules/freebsd/vmxnet/net_compat.h +@@ -38,8 +38,8 @@ + #define VXN_IFMULTI_FIRST LIST_FIRST + #define VXN_IFMULTI_NEXT LIST_NEXT + #else /* >= 500016 */ +- #define VXN_IFMULTI_FIRST TAILQ_FIRST +- #define VXN_IFMULTI_NEXT TAILQ_NEXT ++ #define VXN_IFMULTI_FIRST CK_STAILQ_FIRST ++ #define VXN_IFMULTI_NEXT CK_STAILQ_NEXT + #endif /* 500016 */ + + #if __FreeBSD_version < 500043
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805232237.w4NMb5rh020957>