From owner-svn-ports-head@freebsd.org Wed May 23 22:37:06 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63FC9EEAE38; Wed, 23 May 2018 22:37:06 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 133C382AF6; Wed, 23 May 2018 22:37:06 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD30F111C; Wed, 23 May 2018 22:37:05 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4NMb5eB020959; Wed, 23 May 2018 22:37:05 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4NMb5rh020957; Wed, 23 May 2018 22:37:05 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201805232237.w4NMb5rh020957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Wed, 23 May 2018 22:37:05 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in head/emulators/open-vm-tools: . files X-SVN-Commit-Revision: 470726 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2018 22:37:06 -0000 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 + +.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