virtualbox-svn: proof-of-concept to handle pkgsrc paths

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: virtualbox-svn: proof-of-concept to handle pkgsrc paths
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Sun, 07 Aug 2016 01:01:44 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Aug 7 03:01:44 2016 +0200
Changeset:	dfdc7a221f8b474443ca708b2ac108250cde6d53

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

Log Message:
virtualbox-svn: proof-of-concept to handle pkgsrc paths

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

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

diffstat:
 virtualbox-svn/Makefile                |  37 ++++++-----
 virtualbox-svn/distinfo                |   1 +
 virtualbox-svn/patches/patch-configure | 117 +++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 15 deletions(-)

diffs:
diff --git a/virtualbox-svn/Makefile b/virtualbox-svn/Makefile
index af55ea6..c42b014 100644
--- a/virtualbox-svn/Makefile
+++ b/virtualbox-svn/Makefile
@@ -40,12 +40,6 @@ SUBST_MESSAGE.paths=	Adjust paths for pkgsrc
 SUBST_STAGE.paths=	pre-configure
 #SUBST_STAGE.paths=	post-build
 SUBST_FILES.paths+=	configure
-SUBST_SED.paths+=	-e 's!^INCCRYPTO=.*!INCCRYPTO="-I${BUILDLINK_PREFIX.openssl}/include"!g'
-SUBST_SED.paths+=	-e 's!^LIBCRYPTO=.*!LIBCRYPTO="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto"!g'
-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'
@@ -54,14 +48,6 @@ SUBST_SED.paths+=	-e 's!^LIBDEVMAPPER=.*!LIBDEVMAPPER="${COMPILER_RPATH_FLAG}${B
 SUBST_SED.paths+=	-e 's!^INCCAP=.*!INCCAP="-I${BUILDLINK_PREFIX.libcap}/include"!g'
 SUBST_SED.paths+=	-e 's!^LIBCAP=.*!LIBCAP="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libcap}/lib -L${BUILDLINK_PREFIX.libcap}/lib -lcap"!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'
-SUBST_SED.paths+=	-e 's!^LIBPULSE=.*!LIBPULSE="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pulseaudio}/lib -L${BUILDLINK_PREFIX.pulseaudio}/lib"!g'
-SUBST_SED.paths+=	-e 's!^INCPNG=.*!INCPNG="-I${BUILDLINK_PREFIX.png}/include"!g'
-SUBST_SED.paths+=	-e 's!^LIBPNG=.*!LIBPNG="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.png}/lib -L${BUILDLINK_PREFIX.png}/lib"!g'
-SUBST_SED.paths+=	-e 's!^INCVPX=.*!INCVPX="-I${BUILDLINK_PREFIX.libvpx}/include"!g'
-SUBST_SED.paths+=	-e 's!^LIBVPX=.*!LIBVPX="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libvpx}/lib -L${BUILDLINK_PREFIX.libvpx}/lib -lvpx"!g'
 # These paths are used as a shell enumeration to check
 SUBST_SED.paths+=	-e 's!^PYTHONDIR=.*!PYTHONDIR="${PREFIX}"!g'
 SUBST_SED.paths+=	-e 's!^QT4DIR=.*!QT4DIR="${QTDIR}"!g'
@@ -79,6 +65,27 @@ KMK_ENV_VARS+=	KBUILD_LIB_SEARCH_ROOTS="/ /usr/ ${X11BASE}/ ${PREFIX}/"
 # Multiple jobs tend to be broken
 KMK_FLAGS+=	-j1
 
+CONFIGURE_ARGS+=	--with-kbuild=${PREFIX}/share/kBuild/
+CONFIGURE_ARGS+=	--with-qt-dir=${PREFIX}/${QTDIR}
+CONFIGURE_ARGS+=	--with-openssl-incset="-I${BUILDLINK_PREFIX.openssl}/include"
+CONFIGURE_ARGS+=	--with-openssl-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto"
+CONFIGURE_ARGS+=	--with-curl-incset="-I${BUILDLINK_PREFIX.curl}/include"
+CONFIGURE_ARGS+=	--with-curl-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.curl}/lib -L${BUILDLINK_PREFIX.curl}/lib -lcurl"
+CONFIGURE_ARGS+=	--with-zlib-incset="-I${BUILDLINK_PREFIX.zlib}/include"
+CONFIGURE_ARGS+=	--with-zlib-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz"
+CONFIGURE_ARGS+=	--with-x11-incset="-I${X11BASE}/include"
+CONFIGURE_ARGS+=	--with-x11-libset="${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11"
+CONFIGURE_ARGS+=	--with-pulse-incset="-I${BUILDLINK_PREFIX.pulseaudio}/include"
+CONFIGURE_ARGS+=	--with-pulse-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pulseaudio}/lib -L${BUILDLINK_PREFIX.pulseaudio}/lib"
+CONFIGURE_ARGS+=	--with-png-incset="-I${BUILDLINK_PREFIX.png}/include"
+CONFIGURE_ARGS+=	--with-png-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.png}/lib -L${BUILDLINK_PREFIX.png}/lib"
+CONFIGURE_ARGS+=	--with-vpx-incset="-I${BUILDLINK_PREFIX.libvpx}/include"
+CONFIGURE_ARGS+=	--with-vpx-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libvpx}/lib -L${BUILDLINK_PREFIX.libvpx}/lib"
+CONFIGURE_ARGS+=	--with-iasl=${PREFIX}/bin/iasl
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--with-makeself=${PREFIX}/bin/makeself
+.endif
+
 pre-configure:
 	${RUN} ${ECHO} "VBOX_GCC_OPT=${CXXFLAGS}" >> ${WRKSRC}/LocalConfig.kmk
 	${RUN} ${ECHO} "VBOX_WITH_ORIGIN:=" >> ${WRKSRC}/LocalConfig.kmk
@@ -108,7 +115,7 @@ do-install:
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-#.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index b6c650a..bb46008 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -4,6 +4,7 @@ SHA1 (VirtualBox-5.0.16.tar.bz2) = ca7b3fadda37b1b281f78ef2d573aceacab7d9fd
 RMD160 (VirtualBox-5.0.16.tar.bz2) = 6d7a5d6cae5367d26a015895c09294ff0282d062
 SHA512 (VirtualBox-5.0.16.tar.bz2) = 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074
 Size (VirtualBox-5.0.16.tar.bz2) = 111062984 bytes
+SHA1 (patch-configure) = 7ba1cdb9b102f7a824353a7ab52dd853a6e07215
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_postflight) = d073de54d5de4f61e154003e8e2acc039b6e059b
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_preflight) = f24f7d6dd449e6ad664b8e5a8f5861dd7e0f13e8
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk.sh) = d949a78be396466636aa2c8d92e6ecf76725f336
diff --git a/virtualbox-svn/patches/patch-configure b/virtualbox-svn/patches/patch-configure
new file mode 100644
index 0000000..aff691e
--- /dev/null
+++ b/virtualbox-svn/patches/patch-configure
@@ -0,0 +1,117 @@
+$NetBSD$
+
+--- configure.orig	2016-08-05 16:04:02.000000000 +0000
++++ configure
+@@ -122,16 +122,16 @@ LIBPTHREAD="-lpthread"
+ LIBCAP="-lcap"
+ GSOAP=""
+ GSOAP_IMPORT=""
+-INCX11="/usr/local/include"
+-LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
++INCX11="-I/usr/X11R7/include"
++LIBX11="-Wl,-R/usr/X11R7/lib -L/usr/X11R7/lib -lXext -lX11"
+ LIBXCURSOR="-lXcursor"
+ LIBXMU="-lXmu"
+ LIBXINERAMA="-lXinerama"
+ LIBXRANDR="-lXrandr"
+ MAKESELF="makeself"
+ MESA="-lGL"
+-INCZ=""
+-LIBZ="-lz"
++INCZ="-I/usr/include"
++LIBZ="-Wl,-R/usr/lib -L/usr/lib -lz"
+ INCVNCSERVER=""
+ LIBVNCSERVER="-lvncserver"
+ INCDEVMAPPER=""
+@@ -150,11 +150,11 @@ else
+   INCPNG=""
+   LIBPNG="-lpng"
+ fi
+-INCVPX=""
+-LIBVPX="-lvpx"
++INCVPX="-I/usr/pkg/include"
++LIBVPX="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lvpx"
+ PKGCONFIG="`which_wrapper pkg-config`"
+-PYTHONDIR="/usr /usr/local"
+-QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr /usr/local"
++PYTHONDIR="/usr/pkg"
++QT4DIR="/usr/pkg/qt5"
+ QT4DIR_PKGCONFIG=1
+ QT5DIR="/usr/lib/qt5 /usr/share/qt5 /usr/lib64/qt5 /usr /usr/local"
+ QT5DIR_PKGCONFIG=1
+@@ -2119,10 +2119,10 @@ extern "C" int main(void)
+ }
+ EOF
+   found=
+-  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.5 python3.5m"
++  SUPPYTHONLIBS="python2.7"
+   for p in $PYTHONDIR; do
+     for d in $SUPPYTHONLIBS; do
+-      for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
++      for b in lib; do
+         echo "compiling the following source file:" >> $LOG
+         cat $ODIR.tmp_src.cc >> $LOG
+         echo "using the following command line:" >> $LOG
+@@ -2605,6 +2605,62 @@ for option in "$@"; do
+       INCCRYPTO="-I${OPENSSLDIR}/include"
+       LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a"
+       ;;
++    --with-openssl-incset=*)
++      OPENSSLINCSET=`echo $option | cut -d'=' -f2`
++      INCCRYPTO="${OPENSSLINCSET}"
++      ;;
++    --with-openssl-libset=*)
++      OPENSSLLIBSET=`echo $option | cut -d'=' -f2`
++      LIBCRYPTO="${OPENSSLLIBSET}"
++      ;;
++    --with-curl-incset=*)
++      CURLINCSET=`echo $option | cut -d'=' -f2`
++      INCCURL="${CURLINCSET}"
++      ;;
++    --with-curl-libset=*)
++      CURLLIBSET=`echo $option | cut -d'=' -f2`
++      LIBCURL="${CURLLIBSET}"
++      ;;
++    --with-zlib-incset=*)
++      ZINCSET=`echo $option | cut -d'=' -f2`
++      INCZ="${ZINCSET}"
++      ;;
++    --with-zlib-libset=*)
++      ZLIBSET=`echo $option | cut -d'=' -f2`
++      LIBZ="${ZLIBSET}"
++      ;;
++    --with-x11-incset=*)
++      X11INCSET=`echo $option | cut -d'=' -f2`
++      INCX11="${X11INCSET}"
++      ;;
++    --with-x11-libset=*)
++      X11LIBSET=`echo $option | cut -d'=' -f2`
++      LIBX11="${X11LIBSET}"
++      ;;
++    --with-pulse-incset=*)
++      PULSEINCSET=`echo $option | cut -d'=' -f2`
++      INCPULSE="${PULSEINCSET}"
++      ;;
++    --with-pulse-libset=*)
++      PULSELIBSET=`echo $option | cut -d'=' -f2`
++      LIBPULSE="${PULSELIBSET}"
++      ;;
++    --with-png-incset=*)
++      PNGINCSET=`echo $option | cut -d'=' -f2`
++      INCPNG="${PNGINCSET}"
++      ;;
++    --with-png-libset=*)
++      PNGLIBSET=`echo $option | cut -d'=' -f2`
++      LIBPNG="${PNGLIBSET}"
++      ;;
++    --with-vpx-incset=*)
++      VPXINCSET=`echo $option | cut -d'=' -f2`
++      INCVPX="${VPXINCSET}"
++      ;;
++    --with-vpx-libset=*)
++      VPXLIBSET=`echo $option | cut -d'=' -f2`
++      LIBVPX="${VPXLIBSET}"
++      ;;
+     --with-ow-dir=*)
+       WATCOM=`echo $option | cut -d'=' -f2`
+       ;;
Prev by Date: gradle: Simplify install
Next by Date: virtualbox-svn: Fix shell portability (patch pending upstream)
Previous by Thread: gradle: Simplify install
Next by Thread: virtualbox-svn: Fix shell portability (patch pending upstream)
Indexes:
Home | Main Index | Thread Index | Old Index