4 files changed, 95 insertions, 53 deletions

diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index d6d70f5dd7be..f57147ab3be0 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	linkchecker
-PORTVERSION=	3.3
+PORTVERSION=	4.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/linkchecker/distinfo b/www/linkchecker/distinfo
index 561ff026b56e..a768ee933e75 100644
--- a/www/linkchecker/distinfo
+++ b/www/linkchecker/distinfo
@@ -1,3 +1,3 @@
-MD5 (linkchecker-3.3.tar.gz) = 84b1ac29c8a638f77f9db5c2b27b5a79
-SHA256 (linkchecker-3.3.tar.gz) = eaa270c16a43b908684323c2c21a60ba64dc560c050a3a3125092d9868f8aaf1
-SIZE (linkchecker-3.3.tar.gz) = 571813
+MD5 (linkchecker-4.5.tar.gz) = 88685a632dd33d3e0dc852e87a9a1c23
+SHA256 (linkchecker-4.5.tar.gz) = 292882c5ef7fd1d053b2aaa8e139862b7cf07d7e3b8e69d6c98074a6eb7be2d3
+SIZE (linkchecker-4.5.tar.gz) = 604680
diff --git a/www/linkchecker/files/patch-setup.py b/www/linkchecker/files/patch-setup.py
index 6f3780a2f7b6..936886bec5fd 100644
--- a/www/linkchecker/files/patch-setup.py
+++ b/www/linkchecker/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	Wed Apr 13 23:03:04 2005
-+++ setup.py	Sun May 22 11:44:58 2005
-@@ -413,7 +413,6 @@
+--- setup.py.orig	Fri Sep 22 12:15:34 2006
++++ setup.py	Fri Nov  3 12:18:45 2006
+@@ -471,7 +471,6 @@
      # windows does not have unistd.h
      define_macros.append(('YY_NO_UNISTD_H', None))
  else:
@@ -8,16 +8,16 @@
      if win_compiling:
          # we are cross compiling with mingw
          # add directory for pyconfig.h
-@@ -430,7 +429,7 @@
+@@ -488,7 +487,7 @@
  data_files = [
           ('share/linkchecker',
               ['config/linkcheckerrc', 'config/logging.conf', ]),
 -         ('share/linkchecker/examples',
 +         ('share/examples/linkchecker',
-              ['cgi/lconline/leer.html.en', 'cgi/lconline/leer.html.de',
-               'cgi/lconline/index.html', 'cgi/lconline/lc_cgi.html.en',
-               'cgi/lconline/lc_cgi.html.de', 'cgi/lconline/check.js',
-@@ -438,10 +437,8 @@
+              ['cgi-bin/lconline/leer.html.en',
+               'cgi-bin/lconline/leer.html.de',
+               'cgi-bin/lconline/index.html',
+@@ -500,10 +499,8 @@
        ]
  
  if os.name == 'posix':
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index ead083f2314a..b8654ceed00b 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -1,4 +1,16 @@
 bin/linkchecker
+%%DATADIR%%/linkcheckerrc
+%%DATADIR%%/logging.conf
+%%EXAMPLESDIR%%/check.js
+%%EXAMPLESDIR%%/index.html
+%%EXAMPLESDIR%%/lc.cgi
+%%EXAMPLESDIR%%/lc.fcgi
+%%EXAMPLESDIR%%/lc_cgi.html.de
+%%EXAMPLESDIR%%/lc_cgi.html.en
+%%EXAMPLESDIR%%/leer.html.de
+%%EXAMPLESDIR%%/leer.html.en
+%%EXAMPLESDIR%%/linkcheck-cron.sh
+%%EXAMPLESDIR%%/linkchecker-completion
 %%PYTHON_SITELIBDIR%%/_linkchecker_configdata.py
 %%PYTHON_SITELIBDIR%%/linkcheck/HtmlParser/__init__.py
 %%PYTHON_SITELIBDIR%%/linkcheck/HtmlParser/__init__.pyc
@@ -13,33 +25,39 @@ bin/linkchecker
 %%PYTHON_SITELIBDIR%%/linkcheck/ansicolor.py
 %%PYTHON_SITELIBDIR%%/linkcheck/ansicolor.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/ansicolor.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/__init__.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/__init__.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/__init__.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/addrinfo.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/addrinfo.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/addrinfo.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/connection.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/connection.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/connection.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/cookie.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/cookie.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/cookie.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/geoip.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/geoip.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/geoip.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/robots_txt.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/robots_txt.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/robots_txt.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/urlqueue.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/urlqueue.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cache/urlqueue.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/__init__.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/__init__.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/__init__.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/cache.py
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/cache.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/cache.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/consumer.py
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/consumer.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/consumer.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/errorurl.py
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/errorurl.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/errorurl.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/fileurl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/fileurl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/fileurl.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/ftpurl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/ftpurl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/ftpurl.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/geoip.py
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/geoip.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/geoip.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/gopherurl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/gopherurl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/gopherurl.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/internpaturl.py
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/internpaturl.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/internpaturl.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpheaders.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpheaders.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpheaders.pyo
@@ -49,36 +67,63 @@ bin/linkchecker
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpurl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpurl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpurl.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/ignoredurl.py
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/ignoredurl.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/ignoredurl.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/internpaturl.py
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/internpaturl.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/internpaturl.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/mailtourl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/mailtourl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/mailtourl.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/nntpurl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/nntpurl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/nntpurl.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/pool.py
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/pool.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/checker/pool.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/proxysupport.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/proxysupport.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/proxysupport.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/telneturl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/telneturl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/telneturl.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/unknownurl.py
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/unknownurl.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/unknownurl.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/urlbase.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/urlbase.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/urlbase.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/configuration.py
-%%PYTHON_SITELIBDIR%%/linkcheck/configuration.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/configuration.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/configuration/__init__.py
+%%PYTHON_SITELIBDIR%%/linkcheck/configuration/__init__.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/configuration/__init__.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/configuration/confparse.py
+%%PYTHON_SITELIBDIR%%/linkcheck/configuration/confparse.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/configuration/confparse.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/containers.py
 %%PYTHON_SITELIBDIR%%/linkcheck/containers.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/containers.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/cookies.py
+%%PYTHON_SITELIBDIR%%/linkcheck/cookies.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/cookies.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/decorators.py
 %%PYTHON_SITELIBDIR%%/linkcheck/decorators.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/decorators.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/director/__init__.py
+%%PYTHON_SITELIBDIR%%/linkcheck/director/__init__.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/director/__init__.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/director/aggregator.py
+%%PYTHON_SITELIBDIR%%/linkcheck/director/aggregator.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/director/aggregator.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/director/checker.py
+%%PYTHON_SITELIBDIR%%/linkcheck/director/checker.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/director/checker.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/director/console.py
+%%PYTHON_SITELIBDIR%%/linkcheck/director/console.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/director/console.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/director/logger.py
+%%PYTHON_SITELIBDIR%%/linkcheck/director/logger.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/director/logger.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/director/status.py
+%%PYTHON_SITELIBDIR%%/linkcheck/director/status.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/director/status.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/director/task.py
+%%PYTHON_SITELIBDIR%%/linkcheck/director/task.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/director/task.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/__init__.py
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/__init__.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/__init__.pyo
@@ -292,13 +337,16 @@ bin/linkchecker
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/zone.py
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/zone.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/zone.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/fcgi.py
+%%PYTHON_SITELIBDIR%%/linkcheck/fcgi.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/fcgi.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/fileutil.py
+%%PYTHON_SITELIBDIR%%/linkcheck/fileutil.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/fileutil.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/ftpparse/__init__.py
 %%PYTHON_SITELIBDIR%%/linkcheck/ftpparse/__init__.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/ftpparse/__init__.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/ftpparse/_ftpparse.so
-%%PYTHON_SITELIBDIR%%/linkcheck/fcgi.py
-%%PYTHON_SITELIBDIR%%/linkcheck/fcgi.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/fcgi.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.pyo
@@ -374,29 +422,23 @@ bin/linkchecker
 %%PYTHON_SITELIBDIR%%/linkcheck/threader.py
 %%PYTHON_SITELIBDIR%%/linkcheck/threader.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/threader.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/trace.py
+%%PYTHON_SITELIBDIR%%/linkcheck/trace.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/trace.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/url.py
 %%PYTHON_SITELIBDIR%%/linkcheck/url.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/url.pyo
-%%EXAMPLESDIR%%/check.js
-%%EXAMPLESDIR%%/index.html
-%%EXAMPLESDIR%%/lc.cgi
-%%EXAMPLESDIR%%/lc.fcgi
-%%EXAMPLESDIR%%/lc_cgi.html.de
-%%EXAMPLESDIR%%/lc_cgi.html.en
-%%EXAMPLESDIR%%/leer.html.de
-%%EXAMPLESDIR%%/leer.html.en
-%%EXAMPLESDIR%%/linkcheck-cron.sh
-%%EXAMPLESDIR%%/linkchecker-completion
-%%DATADIR%%/linkcheckerrc
-%%DATADIR%%/logging.conf
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/linkcheck/HtmlParser
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes/IN
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/cache
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/checker
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/configuration
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/director
 @dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes/ANY
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes/IN
 @dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes
 @dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns
 @dirrm %%PYTHON_SITELIBDIR%%/linkcheck/ftpparse
 @dirrm %%PYTHON_SITELIBDIR%%/linkcheck/logger
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/checker
 @dirrm %%PYTHON_SITELIBDIR%%/linkcheck