Fri Aug 22 09:08:39 2014 UTC ()
Fix linkage. For some reason, Qsci.so was not linked against
libqscintilla2, make it unusable by itself. Hardcode libqscintilla2
into LDFLAGS.

Bump PKGREVISION.


(wiz)
diff -r1.38 -r1.39 pkgsrc/x11/py-qt4-qscintilla/Makefile
cvs diff -r1.38 -r1.39 pkgsrc/x11/py-qt4-qscintilla/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4-qscintilla/Attic/Makefile 2014/08/21 21:35:39 1.38
+++ pkgsrc/x11/py-qt4-qscintilla/Attic/Makefile 2014/08/22 09:08:39 1.39
@@ -1,31 +1,35 @@ @@ -1,31 +1,35 @@
1# $NetBSD: Makefile,v 1.38 2014/08/21 21:35:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2014/08/22 09:08:39 wiz Exp $
2 2
3.include "../../x11/qt4-qscintilla/Makefile.common" 3.include "../../x11/qt4-qscintilla/Makefile.common"
4 4
5PKGNAME= ${PYPKGPREFIX}-qt4-${DISTNAME:tl:S/-gpl-/-/} 5PKGNAME= ${PYPKGPREFIX}-qt4-${DISTNAME:tl:S/-gpl-/-/}
 6PKGREVISION= 1
6COMMENT= QScintilla -- Python bindings 7COMMENT= QScintilla -- Python bindings
7 8
8WRKSRC= ${WRKDIR}/${DISTNAME}/Python 9WRKSRC= ${WRKDIR}/${DISTNAME}/Python
9 10
10PY_PATCHPLIST= yes 11PY_PATCHPLIST= yes
11PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} 12PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
12 13
13MAKE_FLAGS+= TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la 14MAKE_FLAGS+= TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
14INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} 15INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
 16LIBS+= -lqscintilla2
 17MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}\ ${LIBS:Q}
15 18
16do-configure: 19do-configure:
17 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \ 20 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
18 --qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \ 21 --qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
19 --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX} \ 22 --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX} \
20 --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX} 23 --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX} \
 24 --qsci-libdir=${QTDIR}/lib
21 25
22post-install: 26post-install:
23 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/Qsci.la \ 27 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/Qsci.la \
24 ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4/ 28 ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4/
25 29
26.include "../../lang/python/extension.mk" 30.include "../../lang/python/extension.mk"
27.include "../../x11/py-sip/buildlink3.mk" 31.include "../../x11/py-sip/buildlink3.mk"
28.include "../../x11/py-qt4/buildlink3.mk" 32.include "../../x11/py-qt4/buildlink3.mk"
29BUILDLINK_API_DEPENDS.qt4-qscintilla+= qt4-qscintilla>=${PKGVERSION_NOREV} 33BUILDLINK_API_DEPENDS.qt4-qscintilla+= qt4-qscintilla>=${PKGVERSION_NOREV}
30.include "../../x11/qt4-qscintilla/buildlink3.mk" 34.include "../../x11/qt4-qscintilla/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"