virtualbox-svn: Partial refactoring of arguments handling

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Aug 7 03:56:04 2016 +0200
Changeset:	fbf928ce3da8394420fbdd2c2079f823224b8521

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

Log Message:
virtualbox-svn: Partial refactoring of arguments handling

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

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

diffstat:
 virtualbox-svn/Makefile                | 10 +++----
 virtualbox-svn/distinfo                |  2 +-
 virtualbox-svn/patches/patch-configure | 50 ----------------------------------
 3 files changed, 5 insertions(+), 57 deletions(-)

diffs:
diff --git a/virtualbox-svn/Makefile b/virtualbox-svn/Makefile
index 9bda590..392037f 100644
--- a/virtualbox-svn/Makefile
+++ b/virtualbox-svn/Makefile
@@ -49,14 +49,11 @@ SUBST_SED.paths+=	-e 's!^INCCAP=.*!INCCAP="-I${BUILDLINK_PREFIX.libcap}/include"
 SUBST_SED.paths+=	-e 's!^LIBCAP=.*!LIBCAP="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libcap}/lib -L${BUILDLINK_PREFIX.libcap}/lib -lcap"!g'
 .endif
 # 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'
+#SUBST_SED.paths+=	-e 's!^PYTHONDIR=.*!PYTHONDIR="${PREFIX}"!g'
 # Set proper path of Python libs under ${PREFIX}/lib..
-SUBST_SED.paths+=	-e 's!lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib!lib!g'
-# Use pkgsrc provided Python version
-SUBST_SED.paths+=	-e 's!SUPPYTHONLIBS=.*!SUPPYTHONLIBS="python${PYVERSSUFFIX}"!g'
+#SUBST_SED.paths+=	-e 's!lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib!lib!g'
 # Add needed rpath for testing execution of an application linked with libpython
-SUBST_SED.paths+=	-e 's!PYTHONLIBRPATH=.*!PYTHONLIBRPATH="${COMPILER_RPATH_FLAG}${PREFIX}/lib"!g'
+#SUBST_SED.paths+=	-e 's!PYTHONLIBRPATH=.*!PYTHONLIBRPATH="${COMPILER_RPATH_FLAG}${PREFIX}/lib"!g'
 
 VBLIBDIR=	${PREFIX}/lib/virtualbox
 
@@ -82,6 +79,7 @@ CONFIGURE_ARGS+=	--with-png-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.png
 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
+CONFIGURE_ARGS+=	--with-python-dirset=${PREFIX}
 .if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--with-makeself=${PREFIX}/bin/makeself
 .endif
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index bb46008..0c60ee4 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -4,7 +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-configure) = a066e73aa956c84cb808f188a5369878f4177fc9
 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
index aff691e..794e745 100644
--- a/virtualbox-svn/patches/patch-configure
+++ b/virtualbox-svn/patches/patch-configure
@@ -2,56 +2,6 @@ $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"