Date: Wed, 28 Jan 2004 22:19:48 +0100 (CET) From: Eugene Ossintsev <eugos@gmx.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62044: x11-toolkits/py-qt: make dependent on qscintilla Message-ID: <20040128211948.47C6D40D@badger.home> Resent-Message-ID: <200401282120.i0SLK5pS023717@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62044 >Category: ports >Synopsis: x11-toolkits/py-qt: make dependent on qscintilla >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 28 13:20:05 PST 2004 >Closed-Date: >Last-Modified: >Originator: Eugene Ossintsev >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD badger.home 4.9-STABLE FreeBSD 4.9-STABLE #5: Sat Jan 3 23:47:24 CET 2004 root@badger.home:/usr/obj/usr/src/sys/BADGER i386 >Description: Make the port dependent on x11-toolkits/qscintilla. Fix pkg-plist for the case when x11-toolkits/qt32 is built as WITHOUT_OPENGL. >How-To-Repeat: >Fix: diff -ruN py-qt.orig/Makefile py-qt/Makefile --- py-qt.orig/Makefile Sun Jan 25 19:35:50 2004 +++ py-qt/Makefile Tue Jan 27 21:46:10 2004 @@ -6,6 +6,7 @@ PORTNAME= qt PORTVERSION= 3.10 +PORTREVISION= 1 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.river-bank.demon.co.uk/download/PyQt/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,15 +15,26 @@ MAINTAINER= eugos@gmx.net COMMENT= Python bindings for the Qt toolkit +LIB_DEPENDS= qscintilla.3:${PORTSDIR}/x11-toolkits/qscintilla BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip RUN_DEPENDS= ${BUILD_DEPENDS} USE_QT_VER= 3 USE_PYTHON= yes +.include <bsd.port.pre.mk> + +WITH_GL!= ldd ${X11BASE}/lib/libqt-mt.so | ${GREP} 'libGL' || ${TRUE} +.if !empty(WITH_GL) +PLIST_SUB+= GL="" +.else +PLIST_SUB+= GL="@comment " +.endif + do-configure: @(cd ${WRKSRC} && ${ECHO} "yes" | ${PYTHON_CMD} configure.py \ -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ + -n ${X11BASE}/include -o ${X11BASE}/lib \ -v ${PREFIX}/share/sip) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN py-qt.orig/pkg-plist py-qt/pkg-plist --- py-qt.orig/pkg-plist Sun Jan 25 19:35:50 2004 +++ py-qt/pkg-plist Tue Jan 27 21:22:54 2004 @@ -3,7 +3,7 @@ %%PYTHON_SITELIBDIR%%/pyqtconfig.py %%PYTHON_SITELIBDIR%%/qt.so %%PYTHON_SITELIBDIR%%/qtcanvas.so -%%PYTHON_SITELIBDIR%%/qtgl.so +%%GL%%%%PYTHON_SITELIBDIR%%/qtgl.so %%PYTHON_SITELIBDIR%%/qtnetwork.so %%PYTHON_SITELIBDIR%%/qtsql.so %%PYTHON_SITELIBDIR%%/qttable.so @@ -190,10 +190,28 @@ share/sip/qtcanvas/copying.sip share/sip/qtcanvas/qcanvas.sip share/sip/qtcanvas/qtcanvasmod.sip -share/sip/qtgl/copying.sip -share/sip/qtgl/qgl.sip -share/sip/qtgl/qglcolormap.sip -share/sip/qtgl/qtglmod.sip +share/sip/qtext/qtextmod.sip +share/sip/qtext/copying.sip +share/sip/qtext/qextscintillaapis.sip +share/sip/qtext/qextscintillabase.sip +share/sip/qtext/qextscintilla.sip +share/sip/qtext/qextscintillacommand.sip +share/sip/qtext/qextscintillacommandset.sip +share/sip/qtext/qextscintillalexer.sip +share/sip/qtext/qextscintillalexercpp.sip +share/sip/qtext/qextscintillalexercsharp.sip +share/sip/qtext/qextscintillalexerhtml.sip +share/sip/qtext/qextscintillalexeridl.sip +share/sip/qtext/qextscintillalexerjava.sip +share/sip/qtext/qextscintillalexerjavascript.sip +share/sip/qtext/qextscintillalexerpython.sip +share/sip/qtext/qextscintillalexersql.sip +share/sip/qtext/qextscintillamacro.sip +share/sip/qtext/qextscintillaprinter.sip +%%GL%%share/sip/qtgl/copying.sip +%%GL%%share/sip/qtgl/qgl.sip +%%GL%%share/sip/qtgl/qglcolormap.sip +%%GL%%share/sip/qtgl/qtglmod.sip share/sip/qtnetwork/copying.sip share/sip/qtnetwork/qdns.sip share/sip/qtnetwork/qftp.sip @@ -235,7 +253,8 @@ share/sip/qtxml/qtxmlmod.sip @dirrm share/sip/qt @dirrm share/sip/qtcanvas -@dirrm share/sip/qtgl +@dirrm share/sip/qtext +%%GL%%@dirrm share/sip/qtgl @dirrm share/sip/qtnetwork @dirrm share/sip/qtsql @dirrm share/sip/qttable >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040128211948.47C6D40D>