On Sun, Sep 06 2020, Edd Barrett <[email protected]> wrote: > Hi, > > On Sun, Sep 06, 2020 at 02:33:12AM +0200, Jeremie Courreges-Anglas wrote: >> This doesn't catch everything. > > Yeah, I realised shortly after. I think it's because the [^2] part of > the glob doesn't catch cases where the line ends after `security/gnupg`. > I spent a little time trying to figure out the right query, but resorted > to grep. > > Interested to know how ajacoutot@'s script works. Does it use a sqlports > query? > >> + security/p5-GPG (no consumer, not updated since import in 2001) > > ^ Shall we kill this one?
I took a quick look and it doesn't look good. ok jca@ [...] Here's a few things I noted in your diff, > Index: mail/mutt/Makefile > =================================================================== > RCS file: /cvs/ports/mail/mutt/Makefile,v > retrieving revision 1.140 > diff -u -p -r1.140 Makefile > --- mail/mutt/Makefile 31 Aug 2020 16:52:03 -0000 1.140 > +++ mail/mutt/Makefile 5 Sep 2020 15:11:05 -0000 > @@ -4,6 +4,7 @@ COMMENT= tty-based e-mail client > > DISTNAME= mutt-1.14.7 > EPOCH= 3 > +REVISION = 0 > > CATEGORIES= mail > HOMEPAGE= http://www.mutt.org/ > @@ -97,7 +98,7 @@ post-install: > mv -f ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt > cd ${PREFIX}/share/examples/mutt; \ > chmod +x *.sh *.pl mutt_xtitle markdown2html > - sed -i -e 's,gpg ,${LOCALBASE}/bin/gpg2 ,' \ > + sed -i -e 's,gpg ,${LOCALBASE}/bin/gpg ,' \ > ${PREFIX}/share/examples/mutt/gpg.rc > > .include <bsd.port.mk> Maybe just drop the sed -i command? [...] > Index: net/py-slixmpp/Makefile > =================================================================== > RCS file: /cvs/ports/net/py-slixmpp/Makefile,v > retrieving revision 1.19 > diff -u -p -r1.19 Makefile > --- net/py-slixmpp/Makefile 11 Jul 2020 06:49:49 -0000 1.19 > +++ net/py-slixmpp/Makefile 5 Sep 2020 13:02:25 -0000 > @@ -26,6 +26,6 @@ RUN_DEPENDS = devel/py-asn1${MODPY_FLAV > devel/py-asn1-modules${MODPY_FLAVOR} \ > net/py-aiodns${MODPY_FLAVOR} \ > www/py-aiohttp > -TEST_DEPENDS = security/gnupg > +TEST_DEPENDS = security/gnupg2 > > .include <bsd.port.mk> > Index: security/clamav-unofficial-sigs/Makefile > =================================================================== > RCS file: /cvs/ports/security/clamav-unofficial-sigs/Makefile,v > retrieving revision 1.16 > diff -u -p -r1.16 Makefile > --- security/clamav-unofficial-sigs/Makefile 12 Jul 2019 21:15:35 -0000 > 1.16 > +++ security/clamav-unofficial-sigs/Makefile 5 Sep 2020 12:59:33 -0000 No diff for security/Makefile? You'll need to unhook either gnupg or gnupg2, cvs rm of the port isn't enough. No need to include the noise from the cvs rm'd directory in your diffs, btw. :) > Index: security/gpgme/Makefile > =================================================================== > RCS file: /cvs/ports/security/gpgme/Makefile,v > retrieving revision 1.57 > diff -u -p -r1.57 Makefile > --- security/gpgme/Makefile 24 Aug 2020 16:28:30 -0000 1.57 > +++ security/gpgme/Makefile 5 Sep 2020 13:07:48 -0000 > @@ -4,6 +4,7 @@ COMMENT-main = GnuPG Made Easy > COMMENT-qt = Qt bindings for GPGme > > VERSION = 1.14.0 > +REVISION = 0 > DISTNAME = gpgme-${VERSION} > PKGNAME-main = gpgme-${VERSION} > PKGNAME-qt = gpgme-qt-${VERSION} > @@ -38,12 +39,8 @@ NOT_FOR_ARCHS-qt = alpha mips64 sh > > CONFIGURE_STYLE = gnu > > -# Requires gpgsm (gnupg 2.x) during build, but can run with any gnupg. > BUILD_DEPENDS = gnupg->=2:security/gnupg2 > - > -# gnupg-* is normally the default anyway, but gnupg1 overrides PKGSPEC > -# so we must be explicit here. > -RUN_DEPENDS = gnupg-*:security/gnupg > +RUN_DEPENDS = security/gnupg2 > LIB_DEPENDS-main = ${LIB_DEPENDS:N*qt*} \ > devel/gettext,-runtime \ > security/libgpg-error>=1.4 \ You could also drop the TEST_DEPENDS and pre-build block. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
