4 files changed, 40 insertions, 35 deletions

diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index a34e055a0b50..6f417316e4f7 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	linkchecker
-PORTVERSION=	1.13.5
+PORTVERSION=	2.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/linkchecker/distinfo b/www/linkchecker/distinfo
index 3cc296d3bd0a..fbb79173bf6b 100644
--- a/www/linkchecker/distinfo
+++ b/www/linkchecker/distinfo
@@ -1,2 +1,2 @@
-MD5 (linkchecker-1.13.5.tar.gz) = ac0fd09278fe0f6e3aa0af5d69786d49
-SIZE (linkchecker-1.13.5.tar.gz) = 404157
+MD5 (linkchecker-2.1.tar.gz) = 9f2df450cdf5bbdedd89f017d1106cbb
+SIZE (linkchecker-2.1.tar.gz) = 497638
diff --git a/www/linkchecker/files/patch-setup.py b/www/linkchecker/files/patch-setup.py
index 79cfddef2c83..43b0c46d716d 100644
--- a/www/linkchecker/files/patch-setup.py
+++ b/www/linkchecker/files/patch-setup.py
@@ -1,18 +1,24 @@
---- setup.py.orig	Mon Sep 20 11:05:17 2004
-+++ setup.py	Wed Oct 13 09:54:32 2004
-@@ -234,13 +234,13 @@
+--- setup.py.orig	Tue Jan 11 13:04:34 2005
++++ setup.py	Sat Jan 15 16:24:38 2005
+@@ -242,7 +242,7 @@
               ['share/locale/nl/LC_MESSAGES/linkchecker.mo']),
-          ('share/linkchecker', ['config/linkcheckerrc',
-                                 'config/logging.conf', ]),
+          ('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',
-               'cgi/lc.cgi', 'cgi/lc.fcgi',
-               'config/linkchecker-completion', 'config/linkcheck-cron.sh']),
--         ('share/man/man1', ['linkchecker.1']),
-+         ('man/man1', ['linkchecker.1']),
-       ],
-       classifiers = [
-         'Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking',
+@@ -250,10 +250,8 @@
+       ]
+ 
+ if os.name == 'posix':
+-    data_files.append(('share/man/man1', ['doc/en/linkchecker.1']))
+-    data_files.append(('share/man/de/man1', ['doc/de/linkchecker.1']))
+-    data_files.append(('share/man/fr/man1', ['doc/fr/linkchecker.1']))
+-    data_files.append(('share/linkchecker/examples',
++    data_files.append(('man/man1', ['doc/en/linkchecker.1']))
++    data_files.append(('share/examples/linkchecker',
+               ['config/linkchecker-completion', 'config/linkcheck-cron.sh']))
+ elif os.name == 'nt':
+     data_files.append(('share/linkchecker/doc',
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index 3a2dbfba47e7..31bdf41de9a3 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -1,8 +1,4 @@
-@comment $FreeBSD$
 bin/linkchecker
-share/locale/de/LC_MESSAGES/linkchecker.mo
-share/locale/fr/LC_MESSAGES/linkchecker.mo
-share/locale/nl/LC_MESSAGES/linkchecker.mo
 %%PYTHON_SITELIBDIR%%/_linkchecker_configdata.py
 %%PYTHON_SITELIBDIR%%/linkcheck/HtmlParser/__init__.py
 %%PYTHON_SITELIBDIR%%/linkcheck/HtmlParser/__init__.pyc
@@ -416,9 +412,6 @@ share/locale/nl/LC_MESSAGES/linkchecker.mo
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.py
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/optcomplete.py
-%%PYTHON_SITELIBDIR%%/linkcheck/optcomplete.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/optcomplete.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.py
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.pyo
@@ -434,6 +427,9 @@ share/locale/nl/LC_MESSAGES/linkchecker.mo
 %%PYTHON_SITELIBDIR%%/linkcheck/tests/test_containers.py
 %%PYTHON_SITELIBDIR%%/linkcheck/tests/test_containers.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/tests/test_containers.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/tests/test_filenames.py
+%%PYTHON_SITELIBDIR%%/linkcheck/tests/test_filenames.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/tests/test_filenames.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/tests/test_linkname.py
 %%PYTHON_SITELIBDIR%%/linkcheck/tests/test_linkname.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/tests/test_linkname.pyo
@@ -458,17 +454,6 @@ share/locale/nl/LC_MESSAGES/linkchecker.mo
 %%PYTHON_SITELIBDIR%%/linkcheck/url.py
 %%PYTHON_SITELIBDIR%%/linkcheck/url.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/url.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/HtmlParser
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/checker
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes/ANY
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes/IN
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/tests
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/ftests
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/logger
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/tests
-@dirrm %%PYTHON_SITELIBDIR%%/linkcheck
 %%EXAMPLESDIR%%/check.js
 %%EXAMPLESDIR%%/index.html
 %%EXAMPLESDIR%%/lc.cgi
@@ -477,9 +462,23 @@ share/locale/nl/LC_MESSAGES/linkchecker.mo
 %%EXAMPLESDIR%%/lc_cgi.html.en
 %%EXAMPLESDIR%%/leer.html.de
 %%EXAMPLESDIR%%/leer.html.en
-%%EXAMPLESDIR%%/linkchecker-completion
 %%EXAMPLESDIR%%/linkcheck-cron.sh
+%%EXAMPLESDIR%%/linkchecker-completion
 %%DATADIR%%/linkcheckerrc
 %%DATADIR%%/logging.conf
-@dirrm %%EXAMPLESDIR%%
+share/locale/de/LC_MESSAGES/linkchecker.mo
+share/locale/fr/LC_MESSAGES/linkchecker.mo
+share/locale/nl/LC_MESSAGES/linkchecker.mo
 @dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/tests
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/logger
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/ftests
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/tests
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes/IN
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes/ANY
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns/rdtypes
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/dns
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/checker
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck/HtmlParser
+@dirrm %%PYTHON_SITELIBDIR%%/linkcheck