UPDATE: www/linkchecker

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: www/linkchecker

Amit Kulkarni-5
Hi,

Sergey Bronnikov sent the update to me privately. The update works fine.

thanks



Index: Makefile
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile 2 Oct 2013 19:30:38 -0000 1.40
+++ Makefile 29 Nov 2014 18:59:34 -0000
@@ -2,9 +2,8 @@
 
 COMMENT= checks HTML documents for broken links
 
-MODPY_EGG_VERSION=8.4
-DISTNAME= LinkChecker-${MODPY_EGG_VERSION}
-PKGNAME= ${DISTNAME:L}
+DISTNAME= 9.3
+PKGNAME= linkchecker-${DISTNAME}
 
 CATEGORIES=     www
 
@@ -15,17 +14,19 @@ MAINTAINER= Amit Kulkarni <amitkulz@gmai
 # GPLv2+
 PERMIT_PACKAGE_CDROM= Yes
 
-MASTER_SITES= https://github.com/downloads/wummel/linkchecker/ \
+MASTER_SITES= https://github.com//wummel/linkchecker/archive/upstream/ \
  http://distfiles.nl/
 
-EXTRACT_SUFX= .tar.xz
-
 MODULES= lang/python
 
 WANTLIB+= ${MODPY_WANTLIB} pthread
 
+WRKSRC = ${WRKDIR}/linkchecker-upstream-${DISTNAME}
+WRKDIST = ${WRKSRC}
+
 RUN_DEPENDS= devel/desktop-file-utils \
- net/py-dnspython
+ net/py-dnspython \
+ www/py-requests
 
 NO_TEST= Yes
 
Index: distinfo
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- distinfo 2 Oct 2013 19:30:38 -0000 1.20
+++ distinfo 29 Nov 2014 18:59:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (LinkChecker-8.4.tar.xz) = t3ug6KCH6hHvtkIWQns65UN6FTT/2fh2L/0mvJYAwKc=
-SIZE (LinkChecker-8.4.tar.xz) = 655044
+SHA256 (9.3.tar.gz) = wHsJHD5PzH9K1eraSlesDqENclg2t5+nu8P/IzQzshM=
+SIZE (9.3.tar.gz) = 779255
Index: patches/patch-setup_py
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/patches/patch-setup_py,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-setup_py
--- patches/patch-setup_py 26 Jan 2013 14:43:08 -0000 1.13
+++ patches/patch-setup_py 29 Nov 2014 18:59:34 -0000
@@ -1,14 +1,24 @@
---- 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):
+--- setup.py.orig Wed Jul 16 09:37:19 2014
++++ setup.py Fri Nov 28 15:55:33 2014
+@@ -368,6 +368,7 @@ class MyInstallLib (install_lib, object):
              else:
                  val = getattr(cmd_obj, attr)
              if attr == 'install_data':
-+ val = sys.prefix
++                val = sys.prefix
                  cdir = os.path.join(val, "share", "linkchecker")
                  data.append('config_dir = %r' % cnormpath(cdir))
              elif attr == 'install_lib':
-@@ -650,11 +651,11 @@ data_files = [
+@@ -654,8 +655,7 @@ myemail = "[hidden email]"
+
+ data_files = [
+     ('share/linkchecker',
+-        ['config/linkcheckerrc',
+-        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
++        ['config/linkcheckerrc',]),
+     ('share/linkchecker/examples',
+         ['cgi-bin/lconline/leer.html.en',
+          'cgi-bin/lconline/leer.html.de',
+@@ -669,11 +669,9 @@ data_files = [
  ]
 
  if os.name == 'posix':
@@ -19,15 +29,13 @@
 -    data_files.append(('share/linkchecker/examples',
 +    data_files.append(('man/man1', ['doc/en/linkchecker.1', 'doc/en/linkchecker-gui.1']))
 +    data_files.append(('man/man5', ['doc/en/linkcheckerrc.5']))
-+#    data_files.append(('share/man/de/man1', ['doc/de/linkchecker.1', 'doc/de/linkchecker-gui.1']))
-+#    data_files.append(('share/man/de/man5', ['doc/de/linkcheckerrc.5']))
 +    data_files.append(('share/examples/linkchecker',
                ['config/linkchecker-completion',
                 'doc/examples/check_blacklist.sh',
                 'doc/examples/check_for_x_errors.sh',
-@@ -898,9 +899,6 @@ o a command line, GUI and web interface
+@@ -896,9 +894,6 @@ args = dict(
+         'py2exe': MyPy2exe,
          'py2app': MyPy2app,
-         'register': MyRegister,
      },
 -    package_dir = {
 -        'linkcheck_dns.dns': 'third_party/dnspython/dns',
@@ -35,10 +43,10 @@
      packages = [
          'linkcheck',
          'linkcheck.bookmarks',
-@@ -913,10 +911,6 @@ o a command line, GUI and web interface
-         'linkcheck.HtmlParser',
-         'linkcheck.logger',
+@@ -913,10 +908,6 @@ args = dict(
          'linkcheck.network',
+         'linkcheck.parser',
+         'linkcheck.plugins',
 -        'linkcheck_dns.dns',
 -        'linkcheck_dns.dns.rdtypes',
 -        'linkcheck_dns.dns.rdtypes.ANY',
Index: pkg/PLIST
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 PLIST
--- pkg/PLIST 2 Oct 2013 19:30:39 -0000 1.23
+++ pkg/PLIST 29 Nov 2014 18:59:34 -0000
@@ -1,8 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.23 2013/10/02 19:30:39 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-9.3-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/_LinkChecker_configdata.py
 lib/python${MODPY_VERSION}/site-packages/_LinkChecker_configdata.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/
@@ -34,12 +33,8 @@ lib/python${MODPY_VERSION}/site-packages
 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/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/results.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/results.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/robots_txt.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/robots_txt.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/urlqueue.py
@@ -55,10 +50,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/fileurl.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/ftpurl.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/ftpurl.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpheaders.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpheaders.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpsurl.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpsurl.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpurl.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpurl.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/ignoreurl.py
@@ -69,8 +60,6 @@ lib/python${MODPY_VERSION}/site-packages
 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
@@ -79,8 +68,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/unknownurl.pyc
 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
@@ -103,10 +90,10 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/aggregator.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/checker.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/checker.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/director/cleanup.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/director/cleanup.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/console.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/console.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/director/interrupt.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/director/interrupt.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/logger.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/logger.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/status.py
@@ -119,8 +106,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/fileutil.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/ftpparse.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/ftpparse.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/geoip.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/geoip.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/gui/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/gui/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/gui/__init__.pyc
@@ -179,22 +164,26 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/formsearch.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/formsearch.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkname.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkname.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkparse.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkparse.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/httplib2.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/httplib2.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/httputil.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/httputil.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/i18n.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/i18n.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lc_cgi.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lc_cgi.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/loader.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/loader.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lock.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lock.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/log.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/log.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/logconf.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/logconf.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/__init__.pyc
@@ -228,12 +217,40 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/mem.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/memoryutil.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/memoryutil.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/mimeutil.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/mimeutil.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/_network.so
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/iputil.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/iputil.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/__init__.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/sitemap.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/sitemap.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/__init__.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/anchorcheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/anchorcheck.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/httpheaderinfo.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/httpheaderinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/locationinfo.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/locationinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parsepdf.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parsepdf.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parseword.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parseword.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/regexcheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/regexcheck.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/sslcertcheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/sslcertcheck.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/syntaxchecks.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/syntaxchecks.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/viruscheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/viruscheck.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/robotparser2.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/robotparser2.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/socketutil.py
@@ -261,7 +278,6 @@ share/examples/linkchecker/check_for_x_e
 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
@@ -271,8 +287,6 @@ share/linkchecker/examples/lc_cgi.html.e
 share/linkchecker/examples/leer.html.de
 share/linkchecker/examples/leer.html.en
 share/linkchecker/examples/linkchecker.apache2.conf
-share/linkchecker/lccollection.qhc
-share/linkchecker/lcdoc.qch
 share/linkchecker/linkcheckerrc
 share/locale/de/LC_MESSAGES/linkchecker.mo
 share/locale/es/LC_MESSAGES/linkchecker.mo

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: www/linkchecker

Stuart Henderson-6
On 2014/11/29 13:20, Amit Kulkarni wrote:
> -MODPY_EGG_VERSION=8.4

keep the version number in MODPY_EGG_VERSION..

> -DISTNAME= LinkChecker-${MODPY_EGG_VERSION}
> -PKGNAME= ${DISTNAME:L}
> +DISTNAME= 9.3

9.3.tar.gz is a bad filename; use the GH_* mechanism so it gets
renamed to a valid name.

> +WRKSRC = ${WRKDIR}/linkchecker-upstream-${DISTNAME}
> +WRKDIST = ${WRKSRC}

no need to set WRKSEC, just set WRKDIST.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: www/linkchecker second try

Amit Kulkarni-5
In reply to this post by Amit Kulkarni-5
Hi all,

After feedback from kirby@ (sent privately) and sthen@ to change over to the new GH_ variables, here's the second try. Both caught the bad DISTNAME. Thanks for the careful review guys.

-- amit


Index: Makefile
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile 2 Oct 2013 19:30:38 -0000 1.40
+++ Makefile 30 Nov 2014 00:29:50 -0000
@@ -2,31 +2,33 @@
 
 COMMENT= checks HTML documents for broken links
 
-MODPY_EGG_VERSION=8.4
-DISTNAME= LinkChecker-${MODPY_EGG_VERSION}
-PKGNAME= ${DISTNAME:L}
+V= 9.3
+MODPY_EGG_VERSION=${V}
+GH_ACCOUNT= wummel
+GH_PROJECT= linkchecker
+GH_TAGNAME= upstream/$V
+GH_COMMIT= 85dadc1f1a1d1379d6e3565fc20697adb6f69521
 
+DISTNAME= ${GH_PROJECT}-upstream-${V}
+PKGNAME= ${DISTNAME:S/-upstream//}
 CATEGORIES=     www
 
-HOMEPAGE= http://wummel.github.com/linkchecker/
+HOMEPAGE= https://github.com/wummel/linkchecker
 
 MAINTAINER= Amit Kulkarni <[hidden email]>
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM= Yes
 
-MASTER_SITES= https://github.com/downloads/wummel/linkchecker/ \
- http://distfiles.nl/
-
-EXTRACT_SUFX= .tar.xz
+WANTLIB+= ${MODPY_WANTLIB} pthread
 
 MODULES= lang/python
 
-WANTLIB+= ${MODPY_WANTLIB} pthread
-
 RUN_DEPENDS= devel/desktop-file-utils \
- net/py-dnspython
+ net/py-dnspython \
+ www/py-requests
 
+WRKDIST= ${WRKDIR}/${DISTNAME}
 NO_TEST= Yes
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- distinfo 2 Oct 2013 19:30:38 -0000 1.20
+++ distinfo 30 Nov 2014 00:31:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (LinkChecker-8.4.tar.xz) = t3ug6KCH6hHvtkIWQns65UN6FTT/2fh2L/0mvJYAwKc=
-SIZE (LinkChecker-8.4.tar.xz) = 655044
+SHA256 (linkchecker-upstream-9.3.tar.gz) = wHsJHD5PzH9K1eraSlesDqENclg2t5+nu8P/IzQzshM=
+SIZE (linkchecker-upstream-9.3.tar.gz) = 779255
Index: patches/patch-setup_py
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/patches/patch-setup_py,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-setup_py
--- patches/patch-setup_py 26 Jan 2013 14:43:08 -0000 1.13
+++ patches/patch-setup_py 29 Nov 2014 18:59:34 -0000
@@ -1,14 +1,24 @@
---- 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):
+--- setup.py.orig Wed Jul 16 09:37:19 2014
++++ setup.py Fri Nov 28 15:55:33 2014
+@@ -368,6 +368,7 @@ class MyInstallLib (install_lib, object):
              else:
                  val = getattr(cmd_obj, attr)
              if attr == 'install_data':
-+ val = sys.prefix
++                val = sys.prefix
                  cdir = os.path.join(val, "share", "linkchecker")
                  data.append('config_dir = %r' % cnormpath(cdir))
              elif attr == 'install_lib':
-@@ -650,11 +651,11 @@ data_files = [
+@@ -654,8 +655,7 @@ myemail = "[hidden email]"
+
+ data_files = [
+     ('share/linkchecker',
+-        ['config/linkcheckerrc',
+-        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
++        ['config/linkcheckerrc',]),
+     ('share/linkchecker/examples',
+         ['cgi-bin/lconline/leer.html.en',
+          'cgi-bin/lconline/leer.html.de',
+@@ -669,11 +669,9 @@ data_files = [
  ]
 
  if os.name == 'posix':
@@ -19,15 +29,13 @@
 -    data_files.append(('share/linkchecker/examples',
 +    data_files.append(('man/man1', ['doc/en/linkchecker.1', 'doc/en/linkchecker-gui.1']))
 +    data_files.append(('man/man5', ['doc/en/linkcheckerrc.5']))
-+#    data_files.append(('share/man/de/man1', ['doc/de/linkchecker.1', 'doc/de/linkchecker-gui.1']))
-+#    data_files.append(('share/man/de/man5', ['doc/de/linkcheckerrc.5']))
 +    data_files.append(('share/examples/linkchecker',
                ['config/linkchecker-completion',
                 'doc/examples/check_blacklist.sh',
                 'doc/examples/check_for_x_errors.sh',
-@@ -898,9 +899,6 @@ o a command line, GUI and web interface
+@@ -896,9 +894,6 @@ args = dict(
+         'py2exe': MyPy2exe,
          'py2app': MyPy2app,
-         'register': MyRegister,
      },
 -    package_dir = {
 -        'linkcheck_dns.dns': 'third_party/dnspython/dns',
@@ -35,10 +43,10 @@
      packages = [
          'linkcheck',
          'linkcheck.bookmarks',
-@@ -913,10 +911,6 @@ o a command line, GUI and web interface
-         'linkcheck.HtmlParser',
-         'linkcheck.logger',
+@@ -913,10 +908,6 @@ args = dict(
          'linkcheck.network',
+         'linkcheck.parser',
+         'linkcheck.plugins',
 -        'linkcheck_dns.dns',
 -        'linkcheck_dns.dns.rdtypes',
 -        'linkcheck_dns.dns.rdtypes.ANY',
Index: pkg/PLIST
===================================================================
RCS file: /home/amit/all/openbsd_cvsync/ports/www/linkchecker/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 PLIST
--- pkg/PLIST 2 Oct 2013 19:30:39 -0000 1.23
+++ pkg/PLIST 30 Nov 2014 00:24:48 -0000
@@ -1,7 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.23 2013/10/02 19:30:39 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
@@ -34,12 +33,8 @@ lib/python${MODPY_VERSION}/site-packages
 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/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/results.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/results.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/robots_txt.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/robots_txt.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/cache/urlqueue.py
@@ -55,10 +50,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/fileurl.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/ftpurl.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/ftpurl.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpheaders.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpheaders.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpsurl.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpsurl.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpurl.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/httpurl.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/ignoreurl.py
@@ -69,8 +60,6 @@ lib/python${MODPY_VERSION}/site-packages
 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
@@ -79,8 +68,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/checker/unknownurl.pyc
 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
@@ -103,10 +90,10 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/aggregator.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/checker.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/checker.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/director/cleanup.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/director/cleanup.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/console.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/console.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/director/interrupt.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/director/interrupt.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/logger.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/logger.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/director/status.py
@@ -119,8 +106,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/fileutil.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/ftpparse.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/ftpparse.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/geoip.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/geoip.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/gui/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/gui/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/gui/__init__.pyc
@@ -179,22 +164,26 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/formsearch.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/formsearch.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkname.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkname.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkparse.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/htmlutil/linkparse.pyc
-lib/python${MODPY_VERSION}/site-packages/linkcheck/httplib2.py
-lib/python${MODPY_VERSION}/site-packages/linkcheck/httplib2.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/httputil.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/httputil.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/i18n.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/i18n.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lc_cgi.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lc_cgi.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/loader.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/loader.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lock.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/lock.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/log.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/log.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/logconf.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/logconf.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/logger/__init__.pyc
@@ -228,12 +217,40 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/linkcheck/mem.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/memoryutil.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/memoryutil.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/mimeutil.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/mimeutil.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/__init__.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/_network.so
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/iputil.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/network/iputil.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/__init__.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/sitemap.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/parser/sitemap.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/__init__.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/anchorcheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/anchorcheck.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/httpheaderinfo.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/httpheaderinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/locationinfo.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/locationinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parsepdf.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parsepdf.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parseword.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/parseword.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/regexcheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/regexcheck.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/sslcertcheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/sslcertcheck.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/syntaxchecks.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/syntaxchecks.pyc
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/viruscheck.py
+lib/python${MODPY_VERSION}/site-packages/linkcheck/plugins/viruscheck.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/robotparser2.py
 lib/python${MODPY_VERSION}/site-packages/linkcheck/robotparser2.pyc
 lib/python${MODPY_VERSION}/site-packages/linkcheck/socketutil.py
@@ -261,7 +278,6 @@ share/examples/linkchecker/check_for_x_e
 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
@@ -271,8 +287,6 @@ share/linkchecker/examples/lc_cgi.html.e
 share/linkchecker/examples/leer.html.de
 share/linkchecker/examples/leer.html.en
 share/linkchecker/examples/linkchecker.apache2.conf
-share/linkchecker/lccollection.qhc
-share/linkchecker/lcdoc.qch
 share/linkchecker/linkcheckerrc
 share/locale/de/LC_MESSAGES/linkchecker.mo
 share/locale/es/LC_MESSAGES/linkchecker.mo