Fix rpath for X11=native case.

From Olaf 'Rhialto' Seibert in PR 50876.

Bump PKGREVISION.

5 files changed, 47 insertions, 7 deletions

diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index 0eadae3e413..9154f3802ec 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/04/11 19:02:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2016/04/23 07:38:38 wiz Exp $
 
 DISTNAME=	PyQt-gpl-${PYQT_VERSION}
 PKGNAME=	${PYPKGPREFIX}-qt5-${PYQT_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 PYQT_VERSION=	5.5.1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
@@ -28,7 +28,7 @@ INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 PY_PATCHPLIST=		yes
 PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
-SUBST_CLASSES+=		install
+SUBST_CLASSES+=		install x11lib
 SUBST_STAGE.install=	post-configure
 SUBST_SED.install+=	-e 's,INSTALL_FILE  = ,INSTALL_FILE  = libtool --mode=install ,'
 SUBST_SED.install+=	-e 's,\(TARGET[A-Z ]*\)= lib,\1= ,'
@@ -57,6 +57,14 @@ SUBST_FILES.install+=	QtWidgets/Makefile
 SUBST_FILES.install+=	QtXmlPatterns/Makefile
 SUBST_FILES.install+=	_QOpenGLFunctions_2_0/Makefile
 
+SUBST_STAGE.x11lib=     post-patch
+SUBST_SED.x11lib+=      -e 's,@X11LIB@,${X11BASE}/lib,'
+SUBST_SED.x11lib+=      -e 's,@PREFIX@,${PREFIX},'
+SUBST_MESSAGE.x11lib=   Fixing rpath for X11 and pulseaudio libraries.
+SUBST_FILES.x11lib+=    configure.py
+SUBST_FILES.x11lib+=    designer/designer.pro-in
+SUBST_FILES.x11lib+=    qmlscene/qmlscene.pro-in
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo
index b13d4ef6f92..bbee5402d96 100644
--- a/x11/py-qt5/distinfo
+++ b/x11/py-qt5/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/10/26 21:40:39 adam Exp $
+$NetBSD: distinfo,v 1.4 2016/04/23 07:38:38 wiz Exp $
 
 SHA1 (PyQt-gpl-5.5.1.tar.gz) = d54cd7cf26b10f0b59fddce4a6a742f9697a94ff
 RMD160 (PyQt-gpl-5.5.1.tar.gz) = f0027899d9cef20d40dbcad01560edd25c6f7e4e
 SHA512 (PyQt-gpl-5.5.1.tar.gz) = ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4
 Size (PyQt-gpl-5.5.1.tar.gz) = 3705749 bytes
-SHA1 (patch-configure.py) = 8cba68f76142df2ed61dec766f8c0e952210487e
+SHA1 (patch-configure.py) = 5b447f906b05dace1068fc5126b3c40a2e6c9452
+SHA1 (patch-designer_designer.pro-in) = 8b7d885c4a5c5336dbdbead2bd88a4da02026ee2
+SHA1 (patch-qmlscene_qmlscene.pro-in) = fbc19d909b9174b26c9b81898e3843c8a3521492
diff --git a/x11/py-qt5/patches/patch-configure.py b/x11/py-qt5/patches/patch-configure.py
index 3e17eb70887..8728fd4a0ef 100644
--- a/x11/py-qt5/patches/patch-configure.py
+++ b/x11/py-qt5/patches/patch-configure.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.py,v 1.3 2015/10/26 21:40:40 adam Exp $
+$NetBSD: patch-configure.py,v 1.4 2016/04/23 07:38:38 wiz Exp $
 
 On Darwin, do not expect application bundle.
 Adapt for pkgsrc change to make qmake create libtool files.
@@ -17,7 +17,7 @@ Adapt for pkgsrc change to make qmake create libtool files.
  
      remove_file(platform_exe)
  
-@@ -2441,8 +2438,8 @@ win32 {
+@@ -2441,8 +2438,10 @@ win32 {
      target.files = %s%s.pyd
      LIBS += %s
  } else {
@@ -25,6 +25,8 @@ Adapt for pkgsrc change to make qmake create libtool files.
 -    target.files = %s.so
 +    PY_MODULE = %s.la
 +    target.files = %s.la
++    LIBS += -Wl,-rpath,@X11LIB@
++    LIBS += -Wl,-rpath,@PREFIX@/lib/pulseaudio
  }
  ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name)
  
diff --git a/x11/py-qt5/patches/patch-designer_designer.pro-in b/x11/py-qt5/patches/patch-designer_designer.pro-in
new file mode 100644
index 00000000000..2cc75578ead
--- /dev/null
+++ b/x11/py-qt5/patches/patch-designer_designer.pro-in
@@ -0,0 +1,14 @@
+$NetBSD: patch-designer_designer.pro-in,v 1.1 2016/04/23 07:38:38 wiz Exp $
+
+Add rpath to X11 libraries.
+
+--- designer/designer.pro-in.orig	2014-12-25 10:18:22.000000000 +0000
++++ designer/designer.pro-in
+@@ -9,6 +9,7 @@ TEMPLATE    = lib
+ 
+ INCLUDEPATH += @PYINCDIR@
+ LIBS        += @PYLINK@
++LIBS        += -Wl,-rpath,@X11LIB@
+ DEFINES     += PYTHON_LIB=\\\"@PYSHLIB@\\\"
+ 
+ SOURCES     = pluginloader.cpp
diff --git a/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in b/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in
new file mode 100644
index 00000000000..1d14d80ceae
--- /dev/null
+++ b/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in
@@ -0,0 +1,14 @@
+$NetBSD: patch-qmlscene_qmlscene.pro-in,v 1.1 2016/04/23 07:38:38 wiz Exp $
+
+Add rpath to X11 libraries.
+
+--- qmlscene/qmlscene.pro-in.orig	2014-12-25 10:18:22.000000000 +0000
++++ qmlscene/qmlscene.pro-in
+@@ -9,6 +9,7 @@ TEMPLATE    = lib
+ 
+ INCLUDEPATH += @PYINCDIR@ @SIPINCDIR@
+ LIBS        += @PYLINK@
++LIBS        += -Wl,-rpath,@X11LIB@
+ 
+ SOURCES     = pluginloader.cpp
+ HEADERS     = pluginloader.h