Date: Mon, 18 Jun 2012 16:44:06 -0700
From: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: vbox@FreeBSD.org
Subject: ports/169223: [PATCH] emulators/virtualbox-ose: fix usage of ${SRC_BASE} before it is defined
Message-ID: <1340063046.270576.25154.nullmailer@experts-exchange.com>
Resent-Message-ID: <201206182350.q5INoMtw036084@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169223
>Category: ports
>Synopsis: [PATCH] emulators/virtualbox-ose: fix usage of ${SRC_BASE} before it is defined
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 18 23:50:22 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 8.3-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr 9 21:23:18 UTC
>Description:
Original PR filed as ports/165994
SRC_BASE is being used before being defined in several ports. it happened to
work anyways in most cases because the main use of SRC_BASE is for checking if
${SRC_BASE}/sys/ (/usr/src/sys/) exists, and if SRC_BASE is empty, it just
checks for /sys/ which does exist on most systems as a symlink to /usr/src/sys/.
pet portlint on license placement
Port maintainer (vbox@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:
--- virtualbox-ose-4.1.16_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/virtualbox-ose/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- Makefile 6 Jun 2012 06:43:44 -0000 1.52
+++ Makefile 18 Jun 2012 23:44:56 -0000
@@ -20,6 +20,9 @@
MAINTAINER= vbox@FreeBSD.org
COMMENT= A general-purpose full virtualizer for x86 hardware
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
as86:${PORTSDIR}/devel/dev86 \
xsltproc:${PORTSDIR}/textproc/libxslt \
@@ -30,9 +33,6 @@
curl.6:${PORTSDIR}/ftp/curl
RUN_DEPENDS= /boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
ONLY_FOR_ARCHS= i386 amd64
USE_CDRTOOLS= yes
@@ -81,10 +81,6 @@
SUB_LIST+= VBOXUSER=${VBOXUSER}
USE_RC_SUBR+= vboxheadless
-KMK_BUILDTYPE= release
-KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
-KMK_FLAGS=
-
.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
BROKEN= NLS support requires QT4 frontend. Run 'make config' again!
.endif
@@ -125,6 +121,12 @@
PLIST_SUB+= GUESTADDITIONS="@comment "
.endif
+.include <bsd.port.pre.mk>
+
+KMK_BUILDTYPE= release
+KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
+KMK_FLAGS=
+
.if defined(WITH_DEBUG)
KMK_FLAGS+= BUILD_TYPE=debug
KMK_BUILDTYPE= debug
@@ -175,8 +177,6 @@
PLIST_SUB+= I386="@comment "
.endif
-.include <bsd.port.pre.mk>
-
.if ${OSVERSION} < 802000
BROKEN= Does not compile on FreeBSD < 8.2
.endif
--- virtualbox-ose-4.1.16_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1340063046.270576.25154.nullmailer>