virtualbox: Revamp package for recent pkgsrc changes

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: virtualbox: Revamp package for recent pkgsrc changes
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Fri, 08 Jul 2016 10:43:35 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Jul 8 12:43:35 2016 +0200
Changeset:	f6fb63ff688a442a51952aafe8e860d8f0522715

Modified Files:
	virtualbox/Makefile
	virtualbox/distinfo
	virtualbox/patches/patch-configure

Log Message:
virtualbox: Revamp package for recent pkgsrc changes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f6fb63ff688a442a51952aafe8e860d8f0522715

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox/Makefile                | 37 ++++++++++++++++++++++++-------------
 virtualbox/distinfo                |  2 +-
 virtualbox/patches/patch-configure | 12 ++++++++++++
 3 files changed, 37 insertions(+), 14 deletions(-)

diffs:
diff --git a/virtualbox/Makefile b/virtualbox/Makefile
index b1e687e..798d788 100644
--- a/virtualbox/Makefile
+++ b/virtualbox/Makefile
@@ -18,7 +18,8 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	cdrtools-[0-9]*:../../sysutils/cdrtools
 
 BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
-BUILD_DEPENDS+=	kbuild-[0-9]*:../../wip/kbuild
+BUILD_DEPENDS+=	kbuild-[0-9]*:../../devel/kbuild
+BUILD_DEPENDS+=	acpica-utils-[0-9]*:../../sysutils/acpica-utils
 
 USE_TOOLS+=	gtar pkg-config bison flex
 
@@ -27,8 +28,10 @@ WRKSRC=		${WRKDIR}/VirtualBox-${PKGVERSION_NOREV}
 HAS_CONFIGURE=		yes
 USE_LANGUAGES+=	c c++
 
+.include "../../mk/bsd.prefs.mk"
+
 SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths+=	Adjust paths for pkgsrc
+SUBST_MESSAGE.paths=	Adjust paths for pkgsrc
 SUBST_STAGE.paths=	pre-configure
 #SUBST_STAGE.paths=	post-build
 SUBST_FILES.paths+=	configure
@@ -38,6 +41,11 @@ SUBST_SED.paths+=	-e 's!^INCX11=.*!INCX11="-I${X11BASE}/include"!g'
 SUBST_SED.paths+=	-e 's!^LIBX11=.*!LIBX11="${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11"!g'
 SUBST_SED.paths+=	-e 's!^INCZ=.*!INCZ="-I${BUILDLINK_PREFIX.zlib}/include"!g'
 SUBST_SED.paths+=	-e 's!^LIBZ=.*!LIBZ="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz"!g'
+.if ${OPSYS} == "Linux"
+.include "../../sysutils/lvm2/buildlink3.mk"
+SUBST_SED.paths+=	-e 's!^INCDEVMAPPER=.*!INCDEVMAPPER="-I${BUILDLINK_PREFIX.lvm2}/include"!g'
+SUBST_SED.paths+=	-e 's!^LIBDEVMAPPER=.*!LIBDEVMAPPER="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.lvm2}/lib -L${BUILDLINK_PREFIX.lvm2}/lib -ldevmapper"!g'
+.endif
 SUBST_SED.paths+=	-e 's!^INCCURL=.*!INCCURL="-I${BUILDLINK_PREFIX.curl}/include"!g'
 SUBST_SED.paths+=	-e 's!^LIBCURL=.*!LIBCURL="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.curl}/lib -L${BUILDLINK_PREFIX.curl}/lib -lcurl"!g'
 SUBST_SED.paths+=	-e 's!^INCPULSE=.*!INCPULSE="-I${BUILDLINK_PREFIX.pulseaudio}/include"!g'
@@ -58,28 +66,29 @@ SUBST_SED.paths+=	-e 's!PYTHONLIBRPATH=.*!PYTHONLIBRPATH="${COMPILER_RPATH_FLAG}
 
 VBLIBDIR=	${PREFIX}/lib/virtualbox
 
-KMK_CONFIG+=	KBUILD_PATH=${WRKSRC}/kBuild
+KMK_ENV_VARS+=	KBUILD_PATH=${WRKSRC}/kBuild
 # Multiple jobs tend to be broken
 KMK_FLAGS+=	-j1
 
 pre-configure:
-	${RUN} echo "VBOX_GCC_OPT=${CXXFLAGS}" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_WITH_ORIGIN:=" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_WITH_RUNPATH:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_PATH_APP_PRIVATE_ARCH:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_PATH_APP_PRIVATE:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_WITH_TESTCASES=" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_WITH_TESTSUITE:=" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_JAVA_HOME:=${JAVA_HOME}" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} echo "VBOX_USE_SYSTEM_XORG_HEADERS:=1" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_GCC_OPT=${CXXFLAGS}" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_WITH_ORIGIN:=" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_WITH_RUNPATH:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_PATH_APP_PRIVATE_ARCH:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_PATH_APP_PRIVATE:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_WITH_TESTCASES=" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_WITH_TESTSUITE:=" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_JAVA_HOME:=${JAVA_HOME}" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_USE_SYSTEM_XORG_HEADERS:=1" >> ${WRKSRC}/LocalConfig.kmk
 
 do-build:
-	${RUN} cd ${WRKSRC} && . ./env.sh && ${KMK_CONFIG} kmk ${KMK_FLAGS}
+	${RUN} cd ${WRKSRC} && . ./env.sh && ${KMK_ENV_VARS} kmk ${KMK_FLAGS}
 
 do-install:
 	${RUN} cd ${WRKSRC} && . ./env.sh && kmk install
 
 .include "../../mk/java-vm.mk"
+.include "../../net/libIDL/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -93,4 +102,6 @@ do-install:
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/virtualbox/distinfo b/virtualbox/distinfo
index 1e1f206..218f600 100644
--- a/virtualbox/distinfo
+++ b/virtualbox/distinfo
@@ -6,7 +6,7 @@ SHA512 (VirtualBox-5.0.16.tar.bz2) = 3da3a227360fb50d299e99770378f65e8cb99525377
 Size (VirtualBox-5.0.16.tar.bz2) = 111062984 bytes
 SHA1 (patch-Config.kmk) = 136895de8ba926bad725f7f7cf084b25ffbf3152
 SHA1 (patch-Makefile.kmk) = fbb5d999abad202368df11756d91ed7e13c646ae
-SHA1 (patch-configure) = ac34debc8ad9900aaa22c4d00ca7641eb7091aa3
+SHA1 (patch-configure) = 9f2bbd4e706cfde2a7fb4d74ac4c035ab7241d09
 SHA1 (patch-include_VBox_VBoxGuest.h) = 4f41910ca3abbc502bad31cb9f9b427566025765
 SHA1 (patch-include_VBox_ostypes.h) = fd452f95c79b2e5c98a048af21f6561c80adebc5
 SHA1 (patch-include_VBox_param.h) = 1efcacb3e7890344dc132fee85b945bf9baa9614
diff --git a/virtualbox/patches/patch-configure b/virtualbox/patches/patch-configure
index 451aff1..388e4c2 100644
--- a/virtualbox/patches/patch-configure
+++ b/virtualbox/patches/patch-configure
@@ -63,6 +63,18 @@ $NetBSD$
        cnf_append " SDK_VBOX_ZLIB_LIBS" "`strip_l "$LIBZ"`"
        cnf_append " SDK_VBOX_ZLIB_INCS" "$INCZ"
        echo "endif" >> $CNF
+@@ -1723,9 +1719,9 @@ EOF
+   echo "compiling the following source file:" >> $LOG
+   cat $ODIR.tmp_src.c >> $LOG
+   echo "using the following command line:" >> $LOG
+-  echo "$CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -nostdinc -I$LINUX/include " \
++  echo "$CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -I$LINUX/include " \
+       "-I$LINUX/include/generated/uapi" >> $LOG
+-  $CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -nostdinc -I$LINUX/include \
++  $CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -I$LINUX/include \
+       -I$LINUX/include/generated/uapi >> $LOG 2>&1
+   if [ $? -ne 0 ]; then
+     echo
 @@ -1932,20 +1928,16 @@ extern "C" int main(void)
  }
  EOF
Prev by Date: kbuild: Drop, imported into pkgsrc
Next by Date: virtualbox: Remove duplicate line.
Previous by Thread: kbuild: Drop, imported into pkgsrc
Next by Thread: virtualbox: Remove duplicate line.
Indexes:
Home | Main Index | Thread Index | Old Index