From owner-freebsd-stable@FreeBSD.ORG  Mon Sep 29 12:59:18 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6A59016A4BF; Mon, 29 Sep 2003 12:59:18 -0700 (PDT)
Received: from mx.nsu.ru (mx.nsu.ru [212.192.164.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 10FAC43FE1; Mon, 29 Sep 2003 12:59:16 -0700 (PDT)
	(envelope-from fjoe@iclub.nsu.ru)
Received: from mail by mx.nsu.ru with drweb-scanned (Exim 3.35 #1 (Debian))
	id 1A44B3-00035p-00; Tue, 30 Sep 2003 02:59:25 +0700
Received: from iclub.nsu.ru ([193.124.215.97] ident=root)
	by mx.nsu.ru with esmtp (Exim 3.35 #1 (Debian))
	id 1A44B2-00033c-00; Tue, 30 Sep 2003 02:59:24 +0700
Received: from iclub.nsu.ru (fjoe@localhost [127.0.0.1])
	by iclub.nsu.ru (8.12.8p2/8.12.8) with ESMTP id h8TJw8wL096822;
	Tue, 30 Sep 2003 02:58:08 +0700 (NSS)
	(envelope-from fjoe@iclub.nsu.ru)
Received: (from fjoe@localhost)
	by iclub.nsu.ru (8.12.8p2/8.12.8/Submit) id h8TJw598096821;
	Tue, 30 Sep 2003 02:58:05 +0700 (NSS)
	(envelope-from fjoe)
Date: Tue, 30 Sep 2003 02:58:05 +0700
From: Max Khon <fjoe@iclub.nsu.ru>
To: "Brandon S. Allbery KF8NH" <allbery@ece.cmu.edu>
Message-ID: <20030929195805.GA94995@iclub.nsu.ru>
References: <3F77EAE3.1060506@aeefyu.net>
	<1064823907.9010.1.camel@pyanfar.ece.cmu.edu>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="envbJBWh7q8WU6mo"
Content-Disposition: inline
In-Reply-To: <1064823907.9010.1.camel@pyanfar.ece.cmu.edu>
User-Agent: Mutt/1.4.1i
X-Spam-Status: No, hits=0.3 required=5.0 tests=UPPERCASE_25_50 autolearn=no 
	version=2.60
X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on 
	iclub.nsu.ru
X-Envelope-To: allbery@ece.cmu.edu,
 afu-subscribed-list@aeefyu.net,
 freebsd-emulation@freebsd.org,
 freebsd-stable@freebsd.org
cc: Aeefyu <afu-subscribed-list@aeefyu.net>
cc: freebsd-emulation@freebsd.org
cc: freebsd-stable@freebsd.org
Subject: Re: Failure to build (ports) vmware2 in 4-9-PRERELEASE
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Sep 2003 19:59:18 -0000


--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello!

On Mon, Sep 29, 2003 at 04:25:07AM -0400, Brandon S. Allbery KF8NH wrote:

> > I got the following errors in re-building emulators/vmware2. (need to 
> > change the netgraph bridging interface)
> > Anyone experiencing the similar symptoms?
> 
> The PAE import broke vmware2; no ETA on a fix that I've heard.  I
> suggest sticking with RELENG_4_8.

Attached patch works for me.
(run "patch <Makefile.diff" in ports/emulators/vmware2).
I would like to commit it after maintainer approval.

/fjoe

--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.diff"

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/vmware2/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile	24 Sep 2003 00:59:22 -0000	1.56
+++ Makefile	29 Sep 2003 19:45:06 -0000
@@ -98,7 +98,7 @@ post-patch:
 .if ${OSVERSION} >= 500023
 	${CAT} ${FILESDIR}/kse.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
 .endif
-.if ${OSVERSION} >= 500027
+.if ${OSVERSION} >= 500027 || (${OSVERSION} < 500000 && ${OSVERSION} >= 480102)
 	${CAT} ${FILESDIR}/pmap.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
 .endif
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
@@ -129,8 +129,10 @@ post-patch:
 .if ${OSVERSION} >= 500104
 	${CAT} ${FILESDIR}/cdevsw.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
 .endif
-.if ${OSVERSION} >= 500109
+.if ${OSVERSION} >= 500109 || (${OSVERSION} < 500000 && ${OSVERSION} >= 480102)
 	${CAT} ${FILESDIR}/hostif_c.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
+.endif
+.if ${OSVERSION} >= 500109
 	${CAT} ${FILESDIR}/vm_types_h.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
 .endif
 	${CAT} ${FILESDIR}/vmnet-only+Makefile.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1

--envbJBWh7q8WU6mo--