On Sat Feb 22, 2020 at 07:21:32AM +0100, Rafael Sadowski wrote:
> Set editors/qscintilla,qt5 as default.
>
> All our consumers only use the qt5 FLAVOR so here is an update diff
> which removes the the qt4 pieces. Added @pkgpath,@conflict and bump
> all consumers. I also changed the HOMEPAGE so I bumped qscintilla
> itself.
>
> Comments, OK?
Concerns?
>
> RS
>
>
> Index: cad/openscad/Makefile
> ===================================================================
> RCS file: /cvs/ports/cad/openscad/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- cad/openscad/Makefile 4 Feb 2020 06:09:13 -0000 1.34
> +++ cad/openscad/Makefile 22 Feb 2020 06:19:16 -0000
> @@ -5,7 +5,7 @@ BROKEN-sparc64= SIGILL on src/cgalutils.
>
> V = 2019.05
> DISTNAME = openscad-${V}
> -REVISION = 1
> +REVISION = 3
>
> CATEGORIES = cad
>
> @@ -35,7 +35,7 @@ LIB_DEPENDS = devel/boost \
> devel/gmp \
> devel/harfbuzz \
> devel/mpfr \
> - editors/qscintilla,qt5 \
> + editors/qscintilla \
> graphics/glew \
> graphics/opencsg \
> math/cgal \
> Index: databases/sqlitebrowser/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/sqlitebrowser/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- databases/sqlitebrowser/Makefile 24 Aug 2019 07:46:57 -0000 1.29
> +++ databases/sqlitebrowser/Makefile 22 Feb 2020 06:19:18 -0000
> @@ -5,6 +5,7 @@ COMMENT = graphical interface to sqlite
> GH_ACCOUNT = sqlitebrowser
> GH_PROJECT = sqlitebrowser
> GH_TAGNAME = v3.11.2
> +REVISION = 0
>
> CATEGORIES = databases x11
>
> @@ -21,7 +22,7 @@ MODULES = x11/qt5 \
> devel/cmake
>
> LIB_DEPENDS = databases/sqlite3 \
> - editors/qscintilla,qt5>=2.10.2
> + editors/qscintilla
>
> RUN_DEPENDS = x11/gtk+3,-guic \
> devel/desktop-file-utils
> Index: editors/Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/Makefile,v
> retrieving revision 1.137
> diff -u -p -r1.137 Makefile
> --- editors/Makefile 19 Feb 2020 17:35:36 -0000 1.137
> +++ editors/Makefile 22 Feb 2020 06:19:24 -0000
> @@ -51,7 +51,6 @@
> SUBDIR += py-qscintilla
> SUBDIR += py-qscintilla,python3
> SUBDIR += qscintilla
> - SUBDIR += qscintilla,qt5
> SUBDIR += scintilla
> SUBDIR += scite
> SUBDIR += se
> Index: editors/py-qscintilla/Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- editors/py-qscintilla/Makefile 20 Feb 2020 16:10:07 -0000 1.23
> +++ editors/py-qscintilla/Makefile 22 Feb 2020 06:19:25 -0000
> @@ -4,7 +4,7 @@ COMMENT-main = Python binding for the S
> COMMENT-common = common files for py-qscintilla
>
> VERSION = 2.11.4
> -REVISION = 0
> +REVISION = 1
> MODPY_EGG_VERSION = ${VERSION}
> DISTNAME = QScintilla-${VERSION}
>
> @@ -48,7 +48,7 @@ RUN_DEPENDS = devel/py-sip${MODPY_FLAVO
> x11/py-qt5${MODPY_FLAVOR}
> RUN_DEPENDS-main = ${RUN_DEPENDS} \
> editors/py-qscintilla,-common
> -LIB_DEPENDS-main = editors/qscintilla,qt5=${VERSION}
> +LIB_DEPENDS-main = editors/qscintilla=${VERSION}
>
> RUN_DEPENDS-common =
> LIB_DEPENDS-common =
> Index: editors/qscintilla/Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/qscintilla/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- editors/qscintilla/Makefile 19 Feb 2020 17:35:36 -0000 1.25
> +++ editors/qscintilla/Makefile 22 Feb 2020 06:19:25 -0000
> @@ -6,42 +6,24 @@ COMMENT = Qt port of the Scintilla sourc
> VERSION = 2.11.4
> DISTNAME = QScintilla-${VERSION}
> PKGNAME = ${DISTNAME:L}
> +REVISION = 0
> +
> CATEGORIES = editors x11
>
> +SHARED_LIBS += qscintilla2_qt5 1.0 # 15.0
>
> -HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
> +HOMEPAGE = https://www.riverbankcomputing.com/software/qscintilla/
>
> # GPLv2/GPLv3
> PERMIT_PACKAGE = Yes
>
> -MASTER_SITES =
> https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5PrintSupport
> +WANTLIB += Qt5Widgets m
>
> -WANTLIB = ${COMPILER_LIBCXX} m
> -MODULES = devel/qmake
> -FLAVORS = qt5
> -FLAVOR?=
> -
> -# C++11 (at least)
> -COMPILER= base-clang ports-clang ports-gcc
> -CXXFLAGS += -std=c++11
> -
> -.if ${FLAVOR} == "qt5"
> -FULLPKGNAME = qscintilla-qt5-${VERSION}
> -QTVER = qt5
> -MODULES += x11/qt5
> -SHARED_LIBS = qscintilla2_qt5 1.0 # 15.0
> -
> -WANTLIB += GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
> -.else
> -QTVER = qt4
> -MODULES += x11/qt4
> -SHARED_LIBS = qscintilla2_qt4 1.0 # 15.0
> -
> -WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender fontconfig
> -WANTLIB += freetype pthread
> -.endif
> +MASTER_SITES =
> https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
>
> -SUBST_VARS += QTVER
> +MODULES = devel/qmake \
> + x11/qt5
>
> SEPARATE_BUILD = No
>
> Index: editors/qscintilla/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/qscintilla/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- editors/qscintilla/pkg/PLIST 24 Jul 2019 08:49:43 -0000 1.7
> +++ editors/qscintilla/pkg/PLIST 22 Feb 2020 06:19:25 -0000
> @@ -1,77 +1,80 @@
> @comment $OpenBSD: PLIST,v 1.7 2019/07/24 08:49:43 landry Exp $
> -include/X11/${QTVER}/Qsci/
> -include/X11/${QTVER}/Qsci/qsciabstractapis.h
> -include/X11/${QTVER}/Qsci/qsciapis.h
> -include/X11/${QTVER}/Qsci/qscicommand.h
> -include/X11/${QTVER}/Qsci/qscicommandset.h
> -include/X11/${QTVER}/Qsci/qscidocument.h
> -include/X11/${QTVER}/Qsci/qsciglobal.h
> -include/X11/${QTVER}/Qsci/qscilexer.h
> -include/X11/${QTVER}/Qsci/qscilexeravs.h
> -include/X11/${QTVER}/Qsci/qscilexerbash.h
> -include/X11/${QTVER}/Qsci/qscilexerbatch.h
> -include/X11/${QTVER}/Qsci/qscilexercmake.h
> -include/X11/${QTVER}/Qsci/qscilexercoffeescript.h
> -include/X11/${QTVER}/Qsci/qscilexercpp.h
> -include/X11/${QTVER}/Qsci/qscilexercsharp.h
> -include/X11/${QTVER}/Qsci/qscilexercss.h
> -include/X11/${QTVER}/Qsci/qscilexercustom.h
> -include/X11/${QTVER}/Qsci/qscilexerd.h
> -include/X11/${QTVER}/Qsci/qscilexerdiff.h
> -include/X11/${QTVER}/Qsci/qscilexeredifact.h
> -include/X11/${QTVER}/Qsci/qscilexerfortran.h
> -include/X11/${QTVER}/Qsci/qscilexerfortran77.h
> -include/X11/${QTVER}/Qsci/qscilexerhtml.h
> -include/X11/${QTVER}/Qsci/qscilexeridl.h
> -include/X11/${QTVER}/Qsci/qscilexerjava.h
> -include/X11/${QTVER}/Qsci/qscilexerjavascript.h
> -include/X11/${QTVER}/Qsci/qscilexerjson.h
> -include/X11/${QTVER}/Qsci/qscilexerlua.h
> -include/X11/${QTVER}/Qsci/qscilexermakefile.h
> -include/X11/${QTVER}/Qsci/qscilexermarkdown.h
> -include/X11/${QTVER}/Qsci/qscilexermatlab.h
> -include/X11/${QTVER}/Qsci/qscilexeroctave.h
> -include/X11/${QTVER}/Qsci/qscilexerpascal.h
> -include/X11/${QTVER}/Qsci/qscilexerperl.h
> -include/X11/${QTVER}/Qsci/qscilexerpo.h
> -include/X11/${QTVER}/Qsci/qscilexerpostscript.h
> -include/X11/${QTVER}/Qsci/qscilexerpov.h
> -include/X11/${QTVER}/Qsci/qscilexerproperties.h
> -include/X11/${QTVER}/Qsci/qscilexerpython.h
> -include/X11/${QTVER}/Qsci/qscilexerruby.h
> -include/X11/${QTVER}/Qsci/qscilexerspice.h
> -include/X11/${QTVER}/Qsci/qscilexersql.h
> -include/X11/${QTVER}/Qsci/qscilexertcl.h
> -include/X11/${QTVER}/Qsci/qscilexertex.h
> -include/X11/${QTVER}/Qsci/qscilexerverilog.h
> -include/X11/${QTVER}/Qsci/qscilexervhdl.h
> -include/X11/${QTVER}/Qsci/qscilexerxml.h
> -include/X11/${QTVER}/Qsci/qscilexeryaml.h
> -include/X11/${QTVER}/Qsci/qscimacro.h
> -include/X11/${QTVER}/Qsci/qsciprinter.h
> -include/X11/${QTVER}/Qsci/qsciscintilla.h
> -include/X11/${QTVER}/Qsci/qsciscintillabase.h
> -include/X11/${QTVER}/Qsci/qscistyle.h
> -include/X11/${QTVER}/Qsci/qscistyledtext.h
> -@lib lib/libqscintilla2_${QTVER}.so.${LIBqscintilla2_${QTVER}_VERSION}
> -lib/${QTVER}/mkspecs/features/qscintilla2.prf
> -lib/${QTVER}/qsci/
> -lib/${QTVER}/qsci/api/
> -lib/${QTVER}/qsci/api/python/
> -lib/${QTVER}/qsci/api/python/Python-2.4.api
> -lib/${QTVER}/qsci/api/python/Python-2.5.api
> -lib/${QTVER}/qsci/api/python/Python-2.6.api
> -lib/${QTVER}/qsci/api/python/Python-2.7.api
> -lib/${QTVER}/qsci/api/python/Python-3.1.api
> -lib/${QTVER}/qsci/api/python/Python-3.2.api
> -lib/${QTVER}/qsci/api/python/Python-3.3.api
> -lib/${QTVER}/qsci/api/python/Python-3.4.api
> -lib/${QTVER}/qsci/api/python/Python-3.5.api
> -lib/${QTVER}/qsci/api/python/Python-3.6.api
> -lib/${QTVER}/qsci/api/python/Python-3.7.api
> -lib/${QTVER}/qsci/api/python/Python-3.8.api
> -lib/${QTVER}/translations/qscintilla_cs.qm
> -lib/${QTVER}/translations/qscintilla_de.qm
> -lib/${QTVER}/translations/qscintilla_es.qm
> -lib/${QTVER}/translations/qscintilla_fr.qm
> -lib/${QTVER}/translations/qscintilla_pt_br.qm
> +@conflict qscintilla-qt5-*
> +@pkgpath editors/qscintilla,qt5
> +include/X11/qt5/Qsci/
> +include/X11/qt5/Qsci/qsciabstractapis.h
> +include/X11/qt5/Qsci/qsciapis.h
> +include/X11/qt5/Qsci/qscicommand.h
> +include/X11/qt5/Qsci/qscicommandset.h
> +include/X11/qt5/Qsci/qscidocument.h
> +include/X11/qt5/Qsci/qsciglobal.h
> +include/X11/qt5/Qsci/qscilexer.h
> +include/X11/qt5/Qsci/qscilexeravs.h
> +include/X11/qt5/Qsci/qscilexerbash.h
> +include/X11/qt5/Qsci/qscilexerbatch.h
> +include/X11/qt5/Qsci/qscilexercmake.h
> +include/X11/qt5/Qsci/qscilexercoffeescript.h
> +include/X11/qt5/Qsci/qscilexercpp.h
> +include/X11/qt5/Qsci/qscilexercsharp.h
> +include/X11/qt5/Qsci/qscilexercss.h
> +include/X11/qt5/Qsci/qscilexercustom.h
> +include/X11/qt5/Qsci/qscilexerd.h
> +include/X11/qt5/Qsci/qscilexerdiff.h
> +include/X11/qt5/Qsci/qscilexeredifact.h
> +include/X11/qt5/Qsci/qscilexerfortran.h
> +include/X11/qt5/Qsci/qscilexerfortran77.h
> +include/X11/qt5/Qsci/qscilexerhtml.h
> +include/X11/qt5/Qsci/qscilexeridl.h
> +include/X11/qt5/Qsci/qscilexerjava.h
> +include/X11/qt5/Qsci/qscilexerjavascript.h
> +include/X11/qt5/Qsci/qscilexerjson.h
> +include/X11/qt5/Qsci/qscilexerlua.h
> +include/X11/qt5/Qsci/qscilexermakefile.h
> +include/X11/qt5/Qsci/qscilexermarkdown.h
> +include/X11/qt5/Qsci/qscilexermatlab.h
> +include/X11/qt5/Qsci/qscilexeroctave.h
> +include/X11/qt5/Qsci/qscilexerpascal.h
> +include/X11/qt5/Qsci/qscilexerperl.h
> +include/X11/qt5/Qsci/qscilexerpo.h
> +include/X11/qt5/Qsci/qscilexerpostscript.h
> +include/X11/qt5/Qsci/qscilexerpov.h
> +include/X11/qt5/Qsci/qscilexerproperties.h
> +include/X11/qt5/Qsci/qscilexerpython.h
> +include/X11/qt5/Qsci/qscilexerruby.h
> +include/X11/qt5/Qsci/qscilexerspice.h
> +include/X11/qt5/Qsci/qscilexersql.h
> +include/X11/qt5/Qsci/qscilexertcl.h
> +include/X11/qt5/Qsci/qscilexertex.h
> +include/X11/qt5/Qsci/qscilexerverilog.h
> +include/X11/qt5/Qsci/qscilexervhdl.h
> +include/X11/qt5/Qsci/qscilexerxml.h
> +include/X11/qt5/Qsci/qscilexeryaml.h
> +include/X11/qt5/Qsci/qscimacro.h
> +include/X11/qt5/Qsci/qsciprinter.h
> +include/X11/qt5/Qsci/qsciscintilla.h
> +include/X11/qt5/Qsci/qsciscintillabase.h
> +include/X11/qt5/Qsci/qscistyle.h
> +include/X11/qt5/Qsci/qscistyledtext.h
> +@lib lib/libqscintilla2_qt5.so.${LIBqscintilla2_qt5_VERSION}
> +lib/qt5/mkspecs/features/qscintilla2.prf
> +lib/qt5/qsci/
> +lib/qt5/qsci/api/
> +lib/qt5/qsci/api/python/
> +lib/qt5/qsci/api/python/Python-2.4.api
> +lib/qt5/qsci/api/python/Python-2.5.api
> +lib/qt5/qsci/api/python/Python-2.6.api
> +lib/qt5/qsci/api/python/Python-2.7.api
> +lib/qt5/qsci/api/python/Python-3.1.api
> +lib/qt5/qsci/api/python/Python-3.2.api
> +lib/qt5/qsci/api/python/Python-3.3.api
> +lib/qt5/qsci/api/python/Python-3.4.api
> +lib/qt5/qsci/api/python/Python-3.5.api
> +lib/qt5/qsci/api/python/Python-3.6.api
> +lib/qt5/qsci/api/python/Python-3.7.api
> +lib/qt5/qsci/api/python/Python-3.8.api
> +lib/qt5/translations/
> +lib/qt5/translations/qscintilla_cs.qm
> +lib/qt5/translations/qscintilla_de.qm
> +lib/qt5/translations/qscintilla_es.qm
> +lib/qt5/translations/qscintilla_fr.qm
> +lib/qt5/translations/qscintilla_pt_br.qm
> Index: geo/qgis/Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/qgis/Makefile,v
> retrieving revision 1.121
> diff -u -p -r1.121 Makefile
> --- geo/qgis/Makefile 19 Feb 2020 17:38:05 -0000 1.121
> +++ geo/qgis/Makefile 22 Feb 2020 06:19:27 -0000
> @@ -10,7 +10,7 @@ DISTNAME = qgis-3.10.2
> EXTRACT_SUFX = .tar.bz2
> CATEGORIES = geo x11
> DEBUG_PACKAGES =${BUILD_PACKAGES}
> -REVISION = 2
> +REVISION = 3
>
> SHARED_LIBS = qgis_core 39.0 \
> qgis_app 22.0 \
> @@ -63,7 +63,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
> archivers/libzip \
> databases/sqlite3 \
> devel/proj \
> - editors/qscintilla,qt5 \
> + editors/qscintilla \
> security/qtkeychain \
> security/qca-qt5 \
> www/fcgi \
> Index: math/octave/Makefile
> ===================================================================
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.114
> diff -u -p -r1.114 Makefile
> --- math/octave/Makefile 10 Aug 2019 19:41:08 -0000 1.114
> +++ math/octave/Makefile 22 Feb 2020 06:19:31 -0000
> @@ -5,7 +5,7 @@ COMMENT = high-level language for numeri
> VERSION = 5.1.0
> DISTNAME = octave-${VERSION}
> CATEGORIES = math
> -REVISION = 2
> +REVISION = 3
>
> SHARED_LIBS += octave 12.0
> SHARED_LIBS += octgui 6.0
> @@ -58,7 +58,7 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
> devel/glpk \
> devel/pcre \
> devel/readline \
> - editors/qscintilla,qt5 \
> + editors/qscintilla \
> graphics/GraphicsMagick \
> math/arpack \
> math/fftw3 \
>
