- Update to 6.3

- Add LICENSE

PR:		ports/154541 (based on)
Submitted by:	Oleg Ginzburg <olevole AT yandex.ru>
Feature safe:	yes

6 files changed, 44 insertions, 37 deletions

diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index f18b354edf91..9002d9ff82b0 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	linkchecker
-PORTVERSION=	5.5
+PORTVERSION=	6.3
 CATEGORIES=	www python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	LinkChecker-${PORTVERSION}
@@ -15,6 +15,12 @@ DISTNAME=	LinkChecker-${PORTVERSION}
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Check HTML documents for broken links
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:${PORTSDIR}/www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}utidy>=0.2:${PORTSDIR}/www/py-utidy
+
+LICENSE=	GPLv2
+
+USE_BZIP2=	yes
 USE_PYTHON=		2.5+
 USE_PYDISTUTILS=	yes
 INSTALLS_EGGINFO=	yes
diff --git a/www/linkchecker/distinfo b/www/linkchecker/distinfo
index da7b55bc68db..184c2ea91b4b 100644
--- a/www/linkchecker/distinfo
+++ b/www/linkchecker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (LinkChecker-5.5.tar.gz) = b5b69c3183fe8da489aee15bc78793506b0ec3a41c664c80ecbc790bc2a96a7e
-SIZE (LinkChecker-5.5.tar.gz) = 623925
+SHA256 (LinkChecker-6.3.tar.bz2) = f952eb66db7cb75d7892ed47be6e8fb4220933abe117da5e800dffee7254dd23
+SIZE (LinkChecker-6.3.tar.bz2) = 493762
diff --git a/www/linkchecker/files/nls-patch-setup.py b/www/linkchecker/files/nls-patch-setup.py
index b644f26a70cf..e1b039419301 100644
--- a/www/linkchecker/files/nls-patch-setup.py
+++ b/www/linkchecker/files/nls-patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py.orig	2009-08-26 15:56:00.000000000 +0200
-+++ setup.py	2009-08-26 15:57:17.000000000 +0200
-@@ -384,6 +386,8 @@
+--- setup.py.orig	2011-02-06 04:07:27.486400241 +0300
++++ setup.py	2011-02-06 04:08:17.222411661 +0300
+@@ -380,6 +380,8 @@
  if os.name == 'posix':
-     data_files.append(('man/man1', ['doc/en/linkchecker.1']))
-     data_files.append(('man/man5', ['doc/en/linkcheckerrc.5']))
-+    data_files.append(('man/de/man1', ['doc/de/linkchecker.1']))
-+    data_files.append(('man/de/man5', ['doc/de/linkcheckerrc.5']))
-     data_files.append(('share/examples/linkchecker',
+               data_files.append(('man/man1', ['doc/en/linkchecker.1']))
+               data_files.append(('man/man5', ['doc/en/linkcheckerrc.5']))
++              data_files.append(('man/de/man1', ['doc/de/linkchecker.1']))
++              data_files.append(('man/de/man5', ['doc/de/linkcheckerrc.5']))
+               data_files.append(('share/examples/linkchecker',
                ['config/linkchecker-completion',
                 'doc/examples/check_blacklist.sh',
diff --git a/www/linkchecker/files/patch-linkcheck-socketutil.py b/www/linkchecker/files/patch-linkcheck-socketutil.py
deleted file mode 100644
index affe5ed98568..000000000000
--- a/www/linkchecker/files/patch-linkcheck-socketutil.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- linkcheck/socketutil.py.orig	2009-08-22 22:24:42.000000000 +0200
-+++ linkcheck/socketutil.py	2009-08-22 22:25:17.000000000 +0200
-@@ -28,9 +28,10 @@
-         has_ipv6 = True
-     except socket.error, msg:
-         # only catch these one:
-+	# socket.error: (43, 'Protocol not supported')
-         # socket.error: (97, 'Address family not supported by protocol')
-         # socket.error: (10047, 'Address family not supported by protocol')
--        if msg.args[0] not in (97, 10047):
-+        if msg.args[0] not in (43, 97, 10047):
-             raise
- 
- 
diff --git a/www/linkchecker/files/patch-setup.py b/www/linkchecker/files/patch-setup.py
index f95092704137..3bc3d33883c0 100644
--- a/www/linkchecker/files/patch-setup.py
+++ b/www/linkchecker/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2009-08-03 23:53:01.000000000 +0200
-+++ setup.py	2009-08-26 15:56:00.000000000 +0200
-@@ -364,17 +361,14 @@
+--- setup.py.orig	2011-02-06 03:58:59.454396452 +0300
++++ setup.py	2011-02-06 04:05:09.118442022 +0300
+@@ -357,17 +357,14 @@
  if os.name == 'nt':
      # windows does not have unistd.h
      define_macros.append(('YY_NO_UNISTD_H', None))
@@ -15,12 +15,12 @@
 -        ['config/linkcheckerrc', 'config/logging.conf',
 -        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
 -    ('share/linkchecker/examples',
-+        ['config/linkcheckerrc', 'config/logging.conf']),
-+    ('share/examples/linkchecker',
++    ['config/linkcheckerrc', 'config/logging.conf']),
++        ('share/examples/linkchecker',
          ['cgi-bin/lconline/leer.html.en',
           'cgi-bin/lconline/leer.html.de',
           'cgi-bin/lconline/index.html',
-@@ -388,11 +382,9 @@
+@@ -381,11 +378,9 @@
  ]
  
  if os.name == 'posix':
@@ -29,9 +29,9 @@
 -    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/linkchecker/examples',
-+    data_files.append(('man/man1', ['doc/en/linkchecker.1']))
-+    data_files.append(('man/man5', ['doc/en/linkcheckerrc.5']))
-+    data_files.append(('share/examples/linkchecker',
++              data_files.append(('man/man1', ['doc/en/linkchecker.1']))
++              data_files.append(('man/man5', ['doc/en/linkcheckerrc.5']))
++              data_files.append(('share/examples/linkchecker',
                ['config/linkchecker-completion',
                 'doc/examples/check_blacklist.sh',
                 'doc/examples/check_for_x_errors.sh',
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index cd9ecd6cee85..441498d28133 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -412,6 +412,9 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/help.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/help.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/help.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/lineedit.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/lineedit.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/lineedit.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_rc.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_rc.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_rc.pyo
@@ -430,9 +433,6 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_progress.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_progress.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_progress.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_properties.py
-%%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_properties.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_properties.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/logger.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/logger.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/logger.pyo
@@ -448,9 +448,18 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/settings.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/settings.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/settings.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/statistics.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/statistics.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/statistics.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/updater.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/updater.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/updater.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/urlmodel.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/urlmodel.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/urlmodel.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/urlsave.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/urlsave.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/urlsave.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.pyo
@@ -520,6 +529,9 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/logger/xmllog.py
 %%PYTHON_SITELIBDIR%%/linkcheck/logger/xmllog.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/logger/xmllog.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/firefox.py
+%%PYTHON_SITELIBDIR%%/linkcheck/firefox.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/firefox.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.py
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.pyo
@@ -545,6 +557,9 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/trace.py
 %%PYTHON_SITELIBDIR%%/linkcheck/trace.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/trace.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/updater.py
+%%PYTHON_SITELIBDIR%%/linkcheck/updater.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/updater.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/url.py
 %%PYTHON_SITELIBDIR%%/linkcheck/url.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/url.pyo