kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update PyQt4 to 4.11.4, SIP to 4.17 and QScintilla2 to 2.9.1.

Browse source 
Bring in some long overdue updates, some of which are required for us to
later land the PyQt5 ports.

One big change with this update is that the PyQt4 ports now install their
.sip files into share/py-sip/PyQt4 instead of share/py-sip. This way we do
not end up with directories like share/py-sip/QtCore, which are especially
confusing once PyQt5 lands and starts installing files with the same names.

Other noteworthy items:
- PORTREVISION has been bumped on ports depending on devel/qscintilla2
  because libqscintilla2.so's SOVERSION has changed.
- graphics/seexpr has been converted to USE_PYQT, as the file it used to
  define a build-time dependency on x11-toolkits/py-qt4-gui has moved.

Once again, big thanks to Tobias Berner <tcberner@gmail.com> and Guido Falsi
(madpilot@) for their initial work on these ports as part of the effort to
land PyQt5 into the tree (see D2910 in Phabricator for an earlier version of
the PyQt5 patch set).

PR:		205143
This commit is contained in:
Raphael Kubo da Costa 2015-12-13 12:45:25 +00:00
parent 39f82d7120
commit b15d595457
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=403662
22 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mk/Uses/pyqt.mk
View file

@ -59,9 +59,9 @@ MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \
MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
GENTOO
SIP_VERSION= 4.16.5
QSCI2_VERSION= 2.8.4
PYQT4_VERSION= 4.11.3
SIP_VERSION= 4.17
QSCI2_VERSION= 2.9.1
PYQT4_VERSION= 4.11.4
SIP_DISTNAME= sip-${SIP_VERSION}
PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION}
@ -164,7 +164,7 @@ py-webkit_DESC= Python bindings for QtWebKit module
py-xml_DESC= Python bindings for QtXml module
py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module
SIPDIR_REL= share/py-sip
SIPDIR_REL= share/py-sip/PyQt${_PYQT_VERSION}
SIPDIR= ${PREFIX}/${SIPDIR_REL}
PLIST_SUB+= PYQT_SIPDIR=${SIPDIR_REL}

2
cad/openscad/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= openscad
PORTVERSION= 2015.03
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= cad
MASTER_SITES= http://files.openscad.org/
DISTNAME= openscad-${PORTVERSION}.src

2
databases/sqliteman/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= sqliteman
PORTVERSION= 1.2.2
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= databases
MASTER_SITES= SF

2
databases/tora/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= tora
PORTVERSION= 2.1.3
PORTREVISION= 10
PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SF

1
devel/py-qt4-dbus/Makefile
View file

@ -2,7 +2,6 @@
# $FreeBSD$
PORTNAME= dbus
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python

1
devel/py-qt4-dbussupport/Makefile
View file

@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= dbussupport
PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org

4
devel/py-qt4-qscintilla2/pkg-plist
View file

@ -43,14 +43,12 @@
%%PYQT_SIPDIR%%/Qsci/qscilexerxml.sip
%%PYQT_SIPDIR%%/Qsci/qscilexeryaml.sip
%%PYQT_SIPDIR%%/Qsci/qscimacro.sip
%%PYQT_SIPDIR%%/Qsci/qscimod3.sip
%%PYQT_SIPDIR%%/Qsci/qscimod4.sip
%%PYQT_SIPDIR%%/Qsci/qscimod5.sip
%%PYQT_SIPDIR%%/Qsci/qscimodcommon.sip
%%PYQT_SIPDIR%%/Qsci/qsciprinter.sip
%%PYQT_SIPDIR%%/Qsci/qsciscintilla.sip
%%PYQT_SIPDIR%%/Qsci/qsciscintillabase3.sip
%%PYQT_SIPDIR%%/Qsci/qsciscintillabase4.sip
%%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip
%%PYQT_SIPDIR%%/Qsci/qscistyle.sip
%%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip
share/qt4/qsci/api/python/QScintilla2.api

4
devel/py-qt4/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (PyQt-x11-gpl-4.11.3.tar.gz) = 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686
SIZE (PyQt-x11-gpl-4.11.3.tar.gz) = 11120237
SHA256 (PyQt-x11-gpl-4.11.4.tar.gz) = fc1fe77495432ba3b0d74ff5cb164d375a97f5dddb728256330f615a7cdcf407
SIZE (PyQt-x11-gpl-4.11.4.tar.gz) = 11317088

1
devel/py-sip/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= sip
PORTVERSION= ${SIP_VERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_SIP}

4
devel/py-sip/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (sip-4.16.5.tar.gz) = a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87
SIZE (sip-4.16.5.tar.gz) = 859672
SHA256 (sip-4.17.tar.gz) = 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060
SIZE (sip-4.17.tar.gz) = 959835

4
devel/qscintilla2/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (QScintilla-gpl-2.8.4.tar.gz) = 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f
SIZE (QScintilla-gpl-2.8.4.tar.gz) = 3031919
SHA256 (QScintilla-gpl-2.9.1.tar.gz) = 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
SIZE (QScintilla-gpl-2.9.1.tar.gz) = 2490144

7
devel/qscintilla2/pkg-plist
View file

@ -49,9 +49,9 @@
%%QT_INCDIR%%/Qsci/qscistyle.h
%%QT_INCDIR%%/Qsci/qscistyledtext.h
%%QT_LIBDIR%%/libqscintilla2.so
%%QT_LIBDIR%%/libqscintilla2.so.11
%%QT_LIBDIR%%/libqscintilla2.so.11.3
%%QT_LIBDIR%%/libqscintilla2.so.11.3.0
%%QT_LIBDIR%%/libqscintilla2.so.12
%%QT_LIBDIR%%/libqscintilla2.so.12.0
%%QT_LIBDIR%%/libqscintilla2.so.12.0.1
%%QT_MKSPECDIR%%/features/qscintilla2.prf
share/qt4/qsci/api/python/Python-2.4.api
share/qt4/qsci/api/python/Python-2.5.api
@ -61,6 +61,7 @@ share/qt4/qsci/api/python/Python-3.1.api
share/qt4/qsci/api/python/Python-3.2.api
share/qt4/qsci/api/python/Python-3.3.api
share/qt4/qsci/api/python/Python-3.4.api
share/qt4/qsci/api/python/Python-3.5.api
%%NLS%%share/qt4/translations/qscintilla_cs.qm
%%NLS%%share/qt4/translations/qscintilla_de.qm
%%NLS%%share/qt4/translations/qscintilla_es.qm

1
devel/ruby-qtruby/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= qtruby
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde ruby
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}

1
devel/smokeqt/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= smokeqt
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}

2
devel/universalindentgui/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= universalindentgui
PORTVERSION= 1.2.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION}

1
graphics/qgis/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= qgis
PORTVERSION= 2.12.0
PORTREVISION= 1
CATEGORIES= graphics geography
MAINTAINER= rhurlin@gwdg.de

5
graphics/seexpr/Makefile
View file

@ -11,13 +11,12 @@ COMMENT= Embeddable expression evaluation language
LICENSE= APACHE20
BUILD_DEPENDS= ${LOCALBASE}/share/py-sip/QtGui/QtGuimod.sip:${PORTSDIR}/x11-toolkits/py-qt4-gui
USE_GITHUB= yes
GH_ACCOUNT= wdas
GH_TAGNAME= 36ffb818b8
USES= bison cmake compiler:c++0x python
USES= bison cmake compiler:c++0x pyqt:4 python
USE_PYQT= gui_build
USE_QT4= moc_build qmake_build rcc_build uic_build gui opengl
WRKSRC= ${WRKDIR}/SeExpr-${GH_TAGNAME_EXTRACT}

2
math/octave/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= octave
PORTVERSION= 3.8.2
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= GNU

1
misc/py-qt4-demo/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= demo
PORTVERSION= ${PYQT4_VERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= misc devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}

8
misc/py-qt4-doc/Makefile
View file

@ -23,10 +23,10 @@ DOCSDIR= ${PREFIX}/share/doc/py-qt4
do-install:
cd ${WRKSRC} &&\
${MKDIR} ${STAGEDIR}${DOCSDIR} &&\
${INSTALL_DATA} GPL_EXCEPTION.TXT\
GPL_EXCEPTION_ADDENDUM.TXT NEWS\
LICENSE.GPL2 LICENSE.GPL3\
OPENSOURCE-NOTICE.TXT README THANKS\
${INSTALL_DATA} LICENSE \
NEWS \
README \
THANKS\
${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}

10
misc/py-qt4-doc/pkg-plist
View file

@ -1,9 +1,5 @@
%%DOCSDIR%%/GPL_EXCEPTION.TXT
%%DOCSDIR%%/GPL_EXCEPTION_ADDENDUM.TXT
%%DOCSDIR%%/LICENSE.GPL2
%%DOCSDIR%%/LICENSE.GPL3
%%DOCSDIR%%/LICENSE
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/OPENSOURCE-NOTICE.TXT
%%DOCSDIR%%/README
%%DOCSDIR%%/THANKS
%%DOCSDIR%%/html/_sources/buffer_interface.txt
@ -33,15 +29,16 @@
%%DOCSDIR%%/html/_sources/webkit.txt
%%DOCSDIR%%/html/_static/ajax-loader.gif
%%DOCSDIR%%/html/_static/basic.css
%%DOCSDIR%%/html/_static/classic.css
%%DOCSDIR%%/html/_static/comment-bright.png
%%DOCSDIR%%/html/_static/comment-close.png
%%DOCSDIR%%/html/_static/comment.png
%%DOCSDIR%%/html/_static/default.css
%%DOCSDIR%%/html/_static/doctools.js
%%DOCSDIR%%/html/_static/down-pressed.png
%%DOCSDIR%%/html/_static/down.png
%%DOCSDIR%%/html/_static/file.png
%%DOCSDIR%%/html/_static/jquery.js
%%DOCSDIR%%/html/_static/jquery-1.11.1.js
%%DOCSDIR%%/html/_static/logo.png
%%DOCSDIR%%/html/_static/logo_tn.ico
%%DOCSDIR%%/html/_static/minus.png
@ -50,6 +47,7 @@
%%DOCSDIR%%/html/_static/searchtools.js
%%DOCSDIR%%/html/_static/sidebar.js
%%DOCSDIR%%/html/_static/underscore.js
%%DOCSDIR%%/html/_static/underscore-1.3.1.js
%%DOCSDIR%%/html/_static/up-pressed.png
%%DOCSDIR%%/html/_static/up.png
%%DOCSDIR%%/html/_static/websupport.js

2
x11/leechcraft/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= leechcraft
PORTVERSION= 0.6.70
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/