From 8599521c8270268ed42c1a0065e5a5a909e6905c Mon Sep 17 00:00:00 2001 From: jasper Date: Sat, 26 Jan 2013 14:43:08 +0000 Subject: [PATCH] - update to linkchecker-8.3 from amit kulkarni (MAINTAINER) --- www/linkchecker/Makefile | 14 ++++++++------ www/linkchecker/distinfo | 7 ++----- www/linkchecker/patches/patch-setup_py | 22 +++++++++++----------- www/linkchecker/pkg/PLIST | 18 +++++++++++++++--- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile index f1e5fc5dfc8..78c68958b2f 100644 --- a/www/linkchecker/Makefile +++ b/www/linkchecker/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.37 2012/07/05 11:37:51 gonzalo Exp $ +# $OpenBSD: Makefile,v 1.38 2013/01/26 14:43:08 jasper Exp $ COMMENT= checks HTML documents for broken links -MODPY_EGG_VERSION=7.9 +MODPY_EGG_VERSION=8.3 DISTNAME= LinkChecker-${MODPY_EGG_VERSION} PKGNAME= ${DISTNAME:L} CATEGORIES= www -HOMEPAGE= http://linkchecker.sourceforge.net/ +HOMEPAGE= http://wummel.github.com/linkchecker/ MAINTAINER= Amit Kulkarni @@ -18,12 +18,14 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linkchecker/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= https://github.com/downloads/wummel/linkchecker/ \ + http://distfiles.nl/ + +EXTRACT_SUFX= .tar.xz MODULES= lang/python -WANTLIB+= ${MODPY_WANTLIB} +WANTLIB+= ${MODPY_WANTLIB} pthread RUN_DEPENDS= devel/desktop-file-utils \ net/py-dnspython diff --git a/www/linkchecker/distinfo b/www/linkchecker/distinfo index 030be7172fe..2566276f6fe 100644 --- a/www/linkchecker/distinfo +++ b/www/linkchecker/distinfo @@ -1,5 +1,2 @@ -MD5 (LinkChecker-7.9.tar.bz2) = DocrceIpuWUqbLCfqYTQag== -RMD160 (LinkChecker-7.9.tar.bz2) = RZ4E8G+sp8LykaGddGvJo/+jCAA= -SHA1 (LinkChecker-7.9.tar.bz2) = vBVhAVadSg3qw8p3hNaVKjUEArk= -SHA256 (LinkChecker-7.9.tar.bz2) = 015anQJWKdgmThZbUOj4S4Hpzt3LqzTVXyR7dBq9xmU= -SIZE (LinkChecker-7.9.tar.bz2) = 586258 +SHA256 (LinkChecker-8.3.tar.xz) = C4+Fucn4/OgQVGdjMqouU0KP/eczal0rxRrq2D4txwU= +SIZE (LinkChecker-8.3.tar.xz) = 669480 diff --git a/www/linkchecker/patches/patch-setup_py b/www/linkchecker/patches/patch-setup_py index 51cbc807989..861b884a323 100644 --- a/www/linkchecker/patches/patch-setup_py +++ b/www/linkchecker/patches/patch-setup_py @@ -1,6 +1,6 @@ ---- setup.py.orig Sun Jun 10 17:17:44 2012 -+++ setup.py Sun Jul 1 19:54:30 2012 -@@ -314,6 +314,7 @@ class MyInstallLib (install_lib, object): +--- setup.py.orig Tue Jan 22 15:59:18 2013 ++++ setup.py Tue Jan 22 16:06:05 2013 +@@ -355,6 +355,7 @@ class MyInstallLib (install_lib, object): else: val = getattr(cmd_obj, attr) if attr == 'install_data': @@ -8,7 +8,7 @@ cdir = os.path.join(val, "share", "linkchecker") data.append('config_dir = %r' % cnormpath(cdir)) elif attr == 'install_lib': -@@ -609,11 +610,11 @@ data_files = [ +@@ -650,11 +651,11 @@ data_files = [ ] if os.name == 'posix': @@ -25,24 +25,24 @@ ['config/linkchecker-completion', 'doc/examples/check_blacklist.sh', 'doc/examples/check_for_x_errors.sh', -@@ -841,9 +842,6 @@ o a command line, GUI and web interface +@@ -898,9 +899,6 @@ o a command line, GUI and web interface 'py2app': MyPy2app, 'register': MyRegister, }, - package_dir = { -- 'dns': 'third_party/dnspython/dns', +- 'linkcheck_dns.dns': 'third_party/dnspython/dns', - }, packages = [ 'linkcheck', 'linkcheck.bookmarks', -@@ -856,10 +854,6 @@ o a command line, GUI and web interface +@@ -913,10 +911,6 @@ o a command line, GUI and web interface 'linkcheck.HtmlParser', 'linkcheck.logger', 'linkcheck.network', -- 'dns', -- 'dns.rdtypes', -- 'dns.rdtypes.ANY', -- 'dns.rdtypes.IN', +- 'linkcheck_dns.dns', +- 'linkcheck_dns.dns.rdtypes', +- 'linkcheck_dns.dns.rdtypes.ANY', +- 'linkcheck_dns.dns.rdtypes.IN', ], ext_modules = [ Extension('linkcheck.HtmlParser.htmlsax', diff --git a/www/linkchecker/pkg/PLIST b/www/linkchecker/pkg/PLIST index 38bd982f445..97bffffa049 100644 --- a/www/linkchecker/pkg/PLIST +++ b/www/linkchecker/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.21 2012/07/05 11:37:51 gonzalo Exp $ +@comment $OpenBSD: PLIST,v 1.22 2013/01/26 14:43:08 jasper Exp $ bin/linkchecker @comment bin/linkchecker-gui +bin/linkchecker-nagios lib/python${MODPY_VERSION}/site-packages/LinkChecker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/_LinkChecker_configdata.py lib/python${MODPY_VERSION}/site-packages/_LinkChecker_configdata.pyc @@ -15,6 +16,8 @@ lib/python${MODPY_VERSION}/site-packages/linkcheck/__init__.py lib/python${MODPY_VERSION}/site-packages/linkcheck/__init__.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/ansicolor.py lib/python${MODPY_VERSION}/site-packages/linkcheck/ansicolor.pyc +lib/python${MODPY_VERSION}/site-packages/linkcheck/better_exchook2.py +lib/python${MODPY_VERSION}/site-packages/linkcheck/better_exchook2.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/bookmarks/ lib/python${MODPY_VERSION}/site-packages/linkcheck/bookmarks/__init__.py lib/python${MODPY_VERSION}/site-packages/linkcheck/bookmarks/__init__.pyc @@ -31,10 +34,10 @@ lib/python${MODPY_VERSION}/site-packages/linkcheck/bookmarks/safari.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/ lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/__init__.py lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/addrinfo.py -lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/addrinfo.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/connection.py lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/connection.pyc +lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/content.py +lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/content.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/cookie.py lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/cookie.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/robots_txt.py @@ -64,6 +67,8 @@ lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/mailtourl.py lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/mailtourl.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/nntpurl.py lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/nntpurl.pyc +lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/pooledconnection.py +lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/pooledconnection.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/proxysupport.py lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/proxysupport.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/telneturl.py @@ -74,6 +79,10 @@ lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/urlbase.py lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/urlbase.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/clamav.py lib/python${MODPY_VERSION}/site-packages/linkcheck/clamav.pyc +lib/python${MODPY_VERSION}/site-packages/linkcheck/cmdline.py +lib/python${MODPY_VERSION}/site-packages/linkcheck/cmdline.pyc +lib/python${MODPY_VERSION}/site-packages/linkcheck/colorama.py +lib/python${MODPY_VERSION}/site-packages/linkcheck/colorama.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/configuration/ lib/python${MODPY_VERSION}/site-packages/linkcheck/configuration/__init__.py lib/python${MODPY_VERSION}/site-packages/linkcheck/configuration/__init__.pyc @@ -205,6 +214,8 @@ lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/html.py lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/html.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/none.py lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/none.pyc +lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/sitemapxml.py +lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/sitemapxml.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/sql.py lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/sql.pyc lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/text.py @@ -248,6 +259,7 @@ share/examples/linkchecker/check_for_x_errors.sh share/examples/linkchecker/check_urls.sh share/examples/linkchecker/linkchecker-completion share/linkchecker/ +share/linkchecker/ca-certificates.crt share/linkchecker/examples/ share/linkchecker/examples/check.js share/linkchecker/examples/index.html