From d615108ec120ea017af0f5087468f93ce845e066 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 3 Nov 2021 15:43:30 +0000 Subject: [PATCH] remove www/rawdog and net/charm, both of which are py2-only and not seeing recent updates upstream. they block updating py-feedparser to a version which works with python 3.9. ok aja@ --- devel/quirks/Makefile | 4 ++-- devel/quirks/files/Quirks.pm | 4 +++- net/charm/Makefile | 31 -------------------------- net/charm/distinfo | 2 -- net/charm/patches/patch-charm_1 | 12 ---------- net/charm/patches/patch-charmrc_5 | 17 -------------- net/charm/patches/patch-setup_py | 14 ------------ net/charm/pkg/DESCR | 3 --- net/charm/pkg/PLIST | 12 ---------- www/rawdog/Makefile | 37 ------------------------------- www/rawdog/distinfo | 2 -- www/rawdog/pkg/DESCR | 6 ----- www/rawdog/pkg/PLIST | 20 ----------------- 13 files changed, 5 insertions(+), 159 deletions(-) delete mode 100644 net/charm/Makefile delete mode 100644 net/charm/distinfo delete mode 100644 net/charm/patches/patch-charm_1 delete mode 100644 net/charm/patches/patch-charmrc_5 delete mode 100644 net/charm/patches/patch-setup_py delete mode 100644 net/charm/pkg/DESCR delete mode 100644 net/charm/pkg/PLIST delete mode 100644 www/rawdog/Makefile delete mode 100644 www/rawdog/distinfo delete mode 100644 www/rawdog/pkg/DESCR delete mode 100644 www/rawdog/pkg/PLIST diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index e5478b5fa94..068aa8ae21b 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.1320 2021/11/01 16:18:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.1321 2021/11/03 15:43:30 sthen Exp $ COMMENT = exceptions to pkg_add rules CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-4.73 +PKGNAME = quirks-4.74 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index c53474f60f2..e9fda23fdbc 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1336 2021/11/01 16:18:04 sthen Exp $ +# $OpenBSD: Quirks.pm,v 1.1337 2021/11/03 15:43:30 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -1515,6 +1515,8 @@ setup_obsolete_reason( 3 => 'childsplay', 6 => 'py-texscythe', 6 => 'py3-sqlalchemy-migrate', + 13 => 'rawdog', + 13 => 'charm', ); # though it's not yet used, these should be pkgnames, so that eventually diff --git a/net/charm/Makefile b/net/charm/Makefile deleted file mode 100644 index 2d9771f122b..00000000000 --- a/net/charm/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# $OpenBSD: Makefile,v 1.22 2021/02/23 19:39:31 sthen Exp $ - -COMMENT= LiveJournal client for Python - -MODPY_EGG_VERSION=1.9.2 -DISTNAME= charm-${MODPY_EGG_VERSION} -CATEGORIES= net news - -HOMEPAGE= http://ljcharm.sourceforge.net/ - -# GPL -PERMIT_PACKAGE= Yes - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ljcharm/} - -MODULES= lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} -RUN_DEPENDS= textproc/py-feedparser - -NO_TEST= Yes - -DOCSDIR= ${PREFIX}/share/doc/charm - -post-configure: - ${SUBST_CMD} ${WRKSRC}/charm.1 ${WRKSRC}/charmrc.5 - -post-install: - ${INSTALL_DATA_DIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.charm ${DOCSDIR}/README - -.include diff --git a/net/charm/distinfo b/net/charm/distinfo deleted file mode 100644 index 6c22cd9317b..00000000000 --- a/net/charm/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (charm-1.9.2.tar.gz) = ri1TYwPncM6wAvacHnH2qFMsjV3QddL1wb8JrQLDwBU= -SIZE (charm-1.9.2.tar.gz) = 84927 diff --git a/net/charm/patches/patch-charm_1 b/net/charm/patches/patch-charm_1 deleted file mode 100644 index 41c1c80abc9..00000000000 --- a/net/charm/patches/patch-charm_1 +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-charm_1,v 1.3 2015/12/30 16:50:38 jasper Exp $ ---- charm.1.orig Thu Mar 28 04:05:23 2013 -+++ charm.1 Wed Dec 30 17:50:20 2015 -@@ -274,7 +274,7 @@ The default location of the charmrc file for a user. - - .SH MANUAL - There is a full manual for Charm. It can usually be found in --.B /usr/share/doc/charm/charm.html -+.B ${PREFIX}/share/doc/charm/charm.html - - .SH SEE ALSO - charmrc(5) diff --git a/net/charm/patches/patch-charmrc_5 b/net/charm/patches/patch-charmrc_5 deleted file mode 100644 index 4d9fed2e406..00000000000 --- a/net/charm/patches/patch-charmrc_5 +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-charmrc_5,v 1.3 2015/12/30 16:50:38 jasper Exp $ ---- charmrc.5.orig Thu Mar 28 04:14:29 2013 -+++ charmrc.5 Wed Dec 30 17:50:20 2015 -@@ -227,11 +227,11 @@ journal, or put all archived posts under a single dire - - .SH EXAMPLES - There is an example charmrc file. It can usually be found in --.B /usr/share/doc/charm/sample.charmrc -+.B ${PREFIX}/share/examples/charm/sample.charmrc - - .SH MANUAL - There is a full manual for Charm. It can usually be found in --.B /usr/share/doc/charm/charm.html -+.B ${PREFIX}/share/doc/charm/charm.html - - .SH SEE ALSO - charm(1) diff --git a/net/charm/patches/patch-setup_py b/net/charm/patches/patch-setup_py deleted file mode 100644 index df97cd10095..00000000000 --- a/net/charm/patches/patch-setup_py +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-setup_py,v 1.2 2015/12/30 16:50:38 jasper Exp $ ---- setup.py.orig Thu Mar 28 04:14:46 2013 -+++ setup.py Wed Dec 30 17:50:20 2015 -@@ -8,6 +8,7 @@ setup(name = "charm", - url = "http://ljcharm.sourceforge.net/", - py_modules = ["ljcharm"], - scripts = ["charm"], -- data_files = [ ("share/doc/charm", ["charm.html", "sample.charmrc"]), -- ("share/man/man1", ["charm.1"]), -- ("share/man/man5", ["charmrc.5"]) ] ) -+ data_files = [ ("share/doc/charm", ["charm.html"]), -+ ("share/examples/charm", ["sample.charmrc"]), -+ ("man/man1", ["charm.1"]), -+ ("man/man5", ["charmrc.5"]) ] ) diff --git a/net/charm/pkg/DESCR b/net/charm/pkg/DESCR deleted file mode 100644 index 27245554c33..00000000000 --- a/net/charm/pkg/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -Charm is a client for the LiveJournal online diary service, as well as -other journal services that use the LiveJournal framework, such as -DeadJournal and uJournal. diff --git a/net/charm/pkg/PLIST b/net/charm/pkg/PLIST deleted file mode 100644 index 5a94bfb7cea..00000000000 --- a/net/charm/pkg/PLIST +++ /dev/null @@ -1,12 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.3 2015/12/30 16:50:38 jasper Exp $ -bin/charm -lib/python${MODPY_VERSION}/site-packages/charm-1.9.1-py${MODPY_VERSION}.egg-info -lib/python${MODPY_VERSION}/site-packages/ljcharm.py -lib/python${MODPY_VERSION}/site-packages/ljcharm.pyc -@man man/man1/charm.1 -@man man/man5/charmrc.5 -share/doc/charm/ -share/doc/charm/README -share/doc/charm/charm.html -share/examples/charm/ -share/examples/charm/sample.charmrc diff --git a/www/rawdog/Makefile b/www/rawdog/Makefile deleted file mode 100644 index d627e6cde53..00000000000 --- a/www/rawdog/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# $OpenBSD: Makefile,v 1.36 2021/02/23 19:39:48 sthen Exp $ - -COMMENT= RSS Aggregator Without Delusions Of Grandeur - -MODPY_EGG_VERSION= 2.23 -DISTNAME= rawdog-${MODPY_EGG_VERSION} -CATEGORIES= www news - -HOMEPAGE= http://offog.org/code/rawdog.html - -# GPLv2, LGPLv2.1 -PERMIT_PACKAGE= Yes - -MASTER_SITES= http://offog.org/files/ - -MODULES= lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} -MODPY_ADJ_FILES=rawdog - -RUN_DEPENDS= textproc/py-feedparser - -NO_TEST= Yes - -DOCDIR= ${PREFIX}/share/doc/rawdog -EXAMPLESDIR= ${PREFIX}/share/examples/rawdog - -post-patch: - sed -i 's,share/man,man,g' ${WRKSRC}/setup.py - -post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} - ${INSTALL_DATA_DIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/config ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/style.css ${EXAMPLESDIR} - -.include diff --git a/www/rawdog/distinfo b/www/rawdog/distinfo deleted file mode 100644 index dcab986b9a0..00000000000 --- a/www/rawdog/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rawdog-2.23.tar.gz) = V+rVdnovIIei+mmYu2He+whL1q940ju9bdh3XlN43qI= -SIZE (rawdog-2.23.tar.gz) = 69542 diff --git a/www/rawdog/pkg/DESCR b/www/rawdog/pkg/DESCR deleted file mode 100644 index 2531b8d9d3f..00000000000 --- a/www/rawdog/pkg/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -rawdog is an RSS Aggregator Without Delusions Of Grandeur. Written in -Python, it uses Mark Pilgrim's feed parser. It runs from cron, collects -articles from a number of feeds, and generates a static HTML page -listing the newest articles in date order. It supports per-feed -customizable update times, and uses ETags, Last-Modified, and gzip -compression to minimize network bandwidth usage. diff --git a/www/rawdog/pkg/PLIST b/www/rawdog/pkg/PLIST deleted file mode 100644 index 2440d509b64..00000000000 --- a/www/rawdog/pkg/PLIST +++ /dev/null @@ -1,20 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.9 2013/10/04 23:26:51 bcallah Exp $ -bin/rawdog -lib/python${MODPY_VERSION}/site-packages/rawdog-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info -lib/python${MODPY_VERSION}/site-packages/rawdoglib/ -lib/python${MODPY_VERSION}/site-packages/rawdoglib/__init__.py -lib/python${MODPY_VERSION}/site-packages/rawdoglib/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/rawdoglib/feedscanner.py -lib/python${MODPY_VERSION}/site-packages/rawdoglib/feedscanner.pyc -lib/python${MODPY_VERSION}/site-packages/rawdoglib/persister.py -lib/python${MODPY_VERSION}/site-packages/rawdoglib/persister.pyc -lib/python${MODPY_VERSION}/site-packages/rawdoglib/plugins.py -lib/python${MODPY_VERSION}/site-packages/rawdoglib/plugins.pyc -lib/python${MODPY_VERSION}/site-packages/rawdoglib/rawdog.py -lib/python${MODPY_VERSION}/site-packages/rawdoglib/rawdog.pyc -@man man/man1/rawdog.1 -share/doc/rawdog/ -share/doc/rawdog/README -share/examples/rawdog/ -share/examples/rawdog/config -share/examples/rawdog/style.css