From owner-svn-ports-head@FreeBSD.ORG Fri May 24 09:47:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2EC6518F; Fri, 24 May 2013 09:47:13 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 058E2EEC; Fri, 24 May 2013 09:47:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4O9lCr5049045; Fri, 24 May 2013 09:47:12 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4O9lC21049043; Fri, 24 May 2013 09:47:12 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201305240947.r4O9lC21049043@svn.freebsd.org> From: Bernhard Froehlich Date: Fri, 24 May 2013 09:47:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318940 - head/emulators/virtualbox-ose-additions X-SVN-Group: ports-head 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.14 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: Fri, 24 May 2013 09:47:13 -0000 Author: decke Date: Fri May 24 09:47:12 2013 New Revision: 318940 URL: http://svnweb.freebsd.org/changeset/ports/318940 Log: - Install DEBUG symbols for kernel modules - Fix pkg-plist for vboxvideo.ko when build without X11 Reported by: Jimmy Olgeni Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-additions/pkg-plist Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Fri May 24 09:40:30 2013 (r318939) +++ head/emulators/virtualbox-ose-additions/Makefile Fri May 24 09:47:12 2013 (r318940) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators kld MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ @@ -55,9 +55,15 @@ KMK_BUILDTYPE= release KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} KMK_FLAGS= +MAKE_FLAGS= SYSDIR=${SRC_BASE}/sys + .if ${PORT_OPTIONS:MDEBUG} KMK_FLAGS+= BUILD_TYPE=debug KMK_BUILDTYPE= debug +MAKE_FLAGS+= DEBUG_FLAGS="-O1 -g" +PLIST_SUB+= WITH_DEBUG="" +.else +PLIST_SUB+= WITH_DEBUG="@comment " .endif .if ${PORT_OPTIONS:MX11} @@ -120,13 +126,19 @@ pre-build: do-build: cd ${WRKSRC} && ${SH} env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS} - cd ${VBOX_BIN}/src && make SYSDIR=${SRC_BASE}/sys + cd ${VBOX_BIN}/src && make ${MAKE_FLAGS} do-install: ${MKDIR} ${KMODDIR} ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko ${KMODDIR} +.if ${PORT_OPTIONS:MDEBUG} + ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko.symbols ${KMODDIR} +.endif .if ${PORT_OPTIONS:MX11} ${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko ${KMODDIR} +.if ${PORT_OPTIONS:MDEBUG} + ${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko.symbols ${KMODDIR} +.endif .endif @/usr/sbin/kldxref ${KMODDIR} Modified: head/emulators/virtualbox-ose-additions/pkg-plist ============================================================================== --- head/emulators/virtualbox-ose-additions/pkg-plist Fri May 24 09:40:30 2013 (r318939) +++ head/emulators/virtualbox-ose-additions/pkg-plist Fri May 24 09:47:12 2013 (r318940) @@ -24,6 +24,8 @@ sbin/VBoxService %%X11%%@dirrmtry lib @cwd / %%KMODDIR%%/vboxguest.ko -%%KMODDIR%%/vboxvideo.ko +%%WITH_DEBUG%%%%KMODDIR%%/vboxguest.ko.symbols +%%X11%%%%KMODDIR%%/vboxvideo.ko +%%WITH_DEBUG%%%%X11%%%%KMODDIR%%/vboxvideo.ko @exec /usr/sbin/kldxref /%%KMODDIR%% @unexec /usr/sbin/kldxref /%%KMODDIR%%