cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move py-qscintilla to py3-only, from kn@

Browse Source 
merge old py-qscintilla-common into py3-scintilla, from me, ok kn@
This commit is contained in:
sthen 2020-10-02 21:40:25 +00:00
parent 0939f746a2
commit 5a25d18a36
8 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1047 2020/09/25 21:40:55 bcallah Exp $
# $OpenBSD: Makefile,v 1.1048 2020/10/02 21:40:25 sthen Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.439
PKGNAME = quirks-3.440
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

5
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1065 2020/09/25 21:40:55 bcallah Exp $
# $OpenBSD: Quirks.pm,v 1.1066 2020/10/02 21:40:25 sthen Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -342,7 +342,6 @@ my $stem_extensions = {
# 6.7
'py-jaraco-functoolsjaraco.functools' => 'py-jaraco-functools',
'py3-jaraco-functoolsjaraco.functools' => 'py3-jaraco-functools',
'py3-qscintilla-qt5' => 'py3-qscintilla',
'py-netmiko' => 'py3-netmiko',
'py-napalm' => 'py3-napalm',
'py-IOSXR' => 'py3-IOSXR',
@ -479,6 +478,8 @@ my $stem_extensions = {
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
'py-dtfabric' => 'py3-dtfabric',
# 6.9
'py-qscintilla' => 'py3-qscintilla',
};
my $obsolete_reason = {

3
editors/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.141 2020/06/28 21:25:18 rsadowski Exp $
# $OpenBSD: Makefile,v 1.142 2020/10/02 21:40:25 sthen Exp $
SUBDIR =
SUBDIR += abiword
@ -51,7 +51,6 @@
SUBDIR += nvi,iconv
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
SUBDIR += py-qscintilla
SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += scintilla

36
editors/py-qscintilla/Makefile
View File

@ -1,16 +1,12 @@
# $OpenBSD: Makefile,v 1.25 2020/07/03 21:12:53 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2020/10/02 21:40:25 sthen Exp $
COMMENT-main = Python binding for the Scintilla source code editor
COMMENT-common = common files for py-qscintilla
COMMENT = Python binding for the Scintilla source code editor
VERSION = 2.11.4
REVISION = 2
REVISION = 3
MODPY_EGG_VERSION = ${VERSION}
DISTNAME = QScintilla-${VERSION}
PKGNAME-main = py-qscintilla-${VERSION}
FULLPKGNAME-common = py-qscintilla-common-${VERSION}
FULLPKGPATH-common = editors/py-qscintilla,-common
PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
@ -21,12 +17,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
WANTLIB-main += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
WANTLIB-main += Qt5Widgets qscintilla2_qt5
WANTLIB-common +=
MULTI_PACKAGES = -main -common
WANTLIB += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
WANTLIB += Qt5Widgets qscintilla2_qt5
MODULES = lang/python \
x11/qt5
@ -35,23 +27,13 @@ PYQTVER = PyQt5
SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
FLAVORS = python3
FLAVOR ?=
.if ${FLAVOR:Mpython3}
FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
.endif
FLAVOR = python3
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR}
RUN_DEPENDS-main = ${RUN_DEPENDS} \
editors/py-qscintilla,-common
LIB_DEPENDS-main = editors/qscintilla=${VERSION}
RUN_DEPENDS-common =
LIB_DEPENDS-common =
LIB_DEPENDS = editors/qscintilla=${VERSION}
COMPILER = base-clang ports-gcc base-gcc
@ -68,6 +50,6 @@ CONFIGURE_ARGS += --pyqt=${PYQTVER} -w \
--qmake=${MODQT5_QMAKE} \
--sip=${LOCALBASE}/bin/sip${MODPY_BIN_SUFFIX}
MAKE_ENV = INSTALL_ROOT="${WRKINST}"
SUBST_VARS += QTVER PYQTVER SIPDIR
SUBST_VARS += QTVER PYQTVER SIPDIR MODPY_FLAVOR
.include <bsd.port.mk>

0
editors/py-qscintilla/pkg/DESCR-main → editors/py-qscintilla/pkg/DESCR
View File

1
editors/py-qscintilla/pkg/DESCR-common
View File

@ -1 +0,0 @@
Common files for py-qscintilla.

8
editors/py-qscintilla/pkg/PLIST-main → editors/py-qscintilla/pkg/PLIST
View File

@ -1,5 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.1 2020/02/19 17:35:36 juanfra Exp $
@comment $OpenBSD: PLIST,v 1.8 2020/10/02 21:40:25 sthen Exp $
@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
@conflict py-qscintilla-common-*
@conflict py-qscintilla-*
@pkgpath editors/py-qscintilla,-common
@pkgpath editors/py-qscintilla,-main
@pkgpath editors/py-qscintilla,-main,python3
@pkgpath editors/py-qscintilla,${QTVER}
@pkgpath editors/py-qscintilla
lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
@ -8,6 +13,7 @@ lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-in
lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/INSTALLER
lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/${QTVER}/qsci/api/python/QScintilla2.api
${SIPDIR}/Qsci/
${SIPDIR}/Qsci/qsciabstractapis.sip
${SIPDIR}/Qsci/qsciapis.sip

7
editors/py-qscintilla/pkg/PLIST-common
View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-common,v 1.1 2020/02/19 17:35:36 juanfra Exp $
@conflict py3-qscintilla-${QTVER}-*
@pkgpath editors/py-qscintilla,${QTVER}
lib/${QTVER}/qsci/
lib/${QTVER}/qsci/api/
lib/${QTVER}/qsci/api/python/
lib/${QTVER}/qsci/api/python/QScintilla2.api