Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Nov 2018 21:12:58 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486207 - in head/emulators: virtualbox-ose-additions virtualbox-ose/files
Message-ID:  <201811292112.wATLCwkE078163@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Thu Nov 29 21:12:58 2018
New Revision: 486207
URL: https://svnweb.freebsd.org/changeset/ports/486207

Log:
  Fix build when SRC_BASE is not /usr/src.
  
  PR:		233626

Modified:
  head/emulators/virtualbox-ose-additions/Makefile
  head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_mount__vboxvfs_Makefile.kmk

Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	Thu Nov 29 21:09:25 2018	(r486206)
+++ head/emulators/virtualbox-ose-additions/Makefile	Thu Nov 29 21:12:58 2018	(r486207)
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.22
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions

Modified: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_mount__vboxvfs_Makefile.kmk
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_mount__vboxvfs_Makefile.kmk	Thu Nov 29 21:09:25 2018	(r486206)
+++ head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_mount__vboxvfs_Makefile.kmk	Thu Nov 29 21:12:58 2018	(r486207)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk.orig	1970-01-01 01:00:00.000000000 +0100
-+++ src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk	2017-07-13 00:17:45.342815229 +0200
-@@ -0,0 +1,24 @@
+--- src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk.orig	2018-11-29 19:03:21 UTC
++++ src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk
+@@ -0,0 +1,23 @@
 +# $Id: Makefile.kmk $
 +## @file
 +# Sub-Makefile for the FreeBSD Shared folder mount utility.
@@ -13,14 +13,13 @@
 +$(error "The FreeBSD guest additions can only be built on FreeBSD!")
 +endif
 +
-+FREEBSD_SRC=	/usr/src
-+MOUNT=		${FREEBSD_SRC}/sbin/mount
++MOUNT=		$(VBOX_FREEBSD_SRC)/../sbin/mount
 +
-+CFLAGS+=-I${MOUNT}
++CFLAGS+=-I$(MOUNT)
 +
 +PROGRAMS                += mount_vboxvfs
 +mount_vboxvfs_TEMPLATE    = NewVBoxGuestR3Exe
-+mount_vboxvfs_SOURCES     = ${MOUNT}/getmntopts.c \
++mount_vboxvfs_SOURCES     = $(MOUNT)/getmntopts.c \
 +				mount_vboxvfs.c
 +
 +include $(FILE_KBUILD_SUB_FOOTER)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811292112.wATLCwkE078163>