On 2021/01/05 05:37, Klemens Nanni wrote:
> On Mon, Jan 04, 2021 at 10:33:37PM -0500, Daniel Dickman wrote:
> > Updates work ok for me with my latest diff below. Maybe take a look if it
> > helps?
> >
> > Note I haven't checked the pkgpath and conflict markers carefully enough.
> > And I haven't tested the pylint consumers, but this has been working for
> > me otherwise.
> Yup, I failed to apply @pkgpath for the -gui package because I simply
> misunderstood its meaning and quirks.
>
> I thought pkgpath is really just for packages which continue to provide
> files/features of previous ones, hence why I didn't add a marker;
> I also thought quirks would properly remove obsolete reasons (I made
> that mistake in the past already)...
@pkgpath X means "this package may be considered as a match for
replacing a previously installed package with path X"
other checks are still done, so:
- there still needs to be a reason for picking up a package with this
name, that may be because the name is the same as previously, or because
there's a quirks entry handling the rename (version number checks are
still done in that case), or because some other port depends on it
- if the files conflict, there must be a valid @conflict marker so that
pkg_add knows which order to remove/install files
> Your new diff has correct PLIST bits and upgrade works for me as well.
> Thanks a lot, I committed the update.
>
The @conflict weren't quite right, no harm but there were never any
pylint-main-$VER/pylint3-main-$VER packages so they aren't needed
(it's good to avoid "not needed" things in ports even if they don't
cause an actual problem because crib from existing ports for examples
all the time so they tend to get copied around).
There's no need to rename with MODPY_BIN_SUFFIX any more now it is
py3-only and there's no conflict. Only users are totem (which detects
any of pylint/pylint3/pylint-3) and spyder (imports rather than running
the script).
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pylint/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile 5 Jan 2021 04:37:20 -0000 1.34
+++ Makefile 5 Jan 2021 10:36:01 -0000
@@ -4,6 +4,8 @@ COMMENT = lint-like code checker for Py
MODPY_EGG_VERSION = 2.6.0
DISTNAME= pylint-${MODPY_EGG_VERSION}
+REVISION= 0
+
CATEGORIES= devel
HOMEPAGE= https://www.pylint.org/
@@ -29,10 +31,5 @@ FLAVORS = python3
FLAVOR = python3
FULLPKGNAME = ${PKGNAME:S/pylint/pylint3/}
-
-post-install:
-.for i in epylint pylint pyreverse symilar
- mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}
-.endfor
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pylint/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- pkg/PLIST 5 Jan 2021 04:37:20 -0000 1.1
+++ pkg/PLIST 5 Jan 2021 10:36:01 -0000
@@ -1,17 +1,15 @@
@comment $OpenBSD: PLIST,v 1.1 2021/01/05 04:37:20 kn Exp $
@conflict pylint-*
-@conflict pylint-main-*
@conflict pylint-gui-*
-@conflict pylint3-main-*
@conflict pylint3-gui-*
@pkgpath devel/pylint,-main
@pkgpath devel/pylint,-gui
@pkgpath devel/pylint,-main,python3
@pkgpath devel/pylint,-gui,python3
-bin/epylint${MODPY_BIN_SUFFIX}
-bin/pylint${MODPY_BIN_SUFFIX}
-bin/pyreverse${MODPY_BIN_SUFFIX}
-bin/symilar${MODPY_BIN_SUFFIX}
+bin/epylint
+bin/pylint
+bin/pyreverse
+bin/symilar
lib/python${MODPY_VERSION}/site-packages/pylint/
lib/python${MODPY_VERSION}/site-packages/pylint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pylint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
