- Update to 5.1

6 files changed, 48 insertions, 30 deletions

diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index dcff6bf94ad6..193d67b44b0d 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	linkchecker
-PORTVERSION=	5.0.1
+PORTVERSION=	5.1
 CATEGORIES=	www python
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}/
 DISTNAME=	LinkChecker-${PORTVERSION}
 
 MAINTAINER=	beat@FreeBSD.org
@@ -34,13 +34,8 @@ PLIST_SUB+=	NLS="@comment "
 post-patch:
 .if !defined(WITHOUT_NLS)
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/nls-patch-setup.py
-.endif
-
-.if !defined(WITHOUT_NLS)
-post-install:
-	${CP} ${WRKSRC}/build/share/locale/de/LC_MESSAGES/LinkChecker.mo ${PREFIX}/share/locale/de/LC_MESSAGES/
-	${CP} ${WRKSRC}/build/share/locale/es/LC_MESSAGES/LinkChecker.mo ${PREFIX}/share/locale/es/LC_MESSAGES/
-	${CP} ${WRKSRC}/build/share/locale/fr/LC_MESSAGES/LinkChecker.mo ${PREFIX}/share/locale/fr/LC_MESSAGES/
+.else
+	@${RM} ${WRKSRC}/po/*.po
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/linkchecker/distinfo b/www/linkchecker/distinfo
index 9cd9fd295d99..2c9c066a007c 100644
--- a/www/linkchecker/distinfo
+++ b/www/linkchecker/distinfo
@@ -1,3 +1,3 @@
-MD5 (LinkChecker-5.0.1.tar.gz) = 51ee3d92afa01ec06ddb89873c418b09
-SHA256 (LinkChecker-5.0.1.tar.gz) = d1db5c115bdec734e9bd4aca8192acc01380726687a3c8e658caea03c34914f8
-SIZE (LinkChecker-5.0.1.tar.gz) = 634481
+MD5 (LinkChecker-5.1.tar.gz) = 1b7f7614b6367778e78e4c11fb3920b7
+SHA256 (LinkChecker-5.1.tar.gz) = acd555a9a00d733e33db465d9cca8443abc32ef744190c6d611c512cf6fb0bfb
+SIZE (LinkChecker-5.1.tar.gz) = 699526
diff --git a/www/linkchecker/files/nls-patch-setup.py b/www/linkchecker/files/nls-patch-setup.py
index 010247ce03d0..b644f26a70cf 100644
--- a/www/linkchecker/files/nls-patch-setup.py
+++ b/www/linkchecker/files/nls-patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2008-02-07 21:27:59.000000000 +0100
-+++ setup.py	2008-02-07 21:28:56.000000000 +0100
-@@ -501,6 +501,8 @@
+--- 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 @@
  if os.name == 'posix':
      data_files.append(('man/man1', ['doc/en/linkchecker.1']))
      data_files.append(('man/man5', ['doc/en/linkcheckerrc.5']))
diff --git a/www/linkchecker/files/patch-linkcheck-socketutil.py b/www/linkchecker/files/patch-linkcheck-socketutil.py
index 6e05d1083d19..affe5ed98568 100644
--- a/www/linkchecker/files/patch-linkcheck-socketutil.py
+++ b/www/linkchecker/files/patch-linkcheck-socketutil.py
@@ -1,14 +1,14 @@
---- linkcheck/socketutil.py.orig	2009-01-27 20:14:15.000000000 +0100
-+++ linkcheck/socketutil.py	2009-01-27 20:13:08.000000000 +0100
+--- 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: (43, 'Protocol not supported')
          # socket.error: (97, 'Address family not supported by protocol')
          # socket.error: (10047, 'Address family not supported by protocol')
--        if msg[0] not in (97, 10047):
-+        if msg[0] not in (43, 97, 10047):
+-        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 45dba4b4b606..f95092704137 100644
--- a/www/linkchecker/files/patch-setup.py
+++ b/www/linkchecker/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2009-01-26 22:51:22.000000000 +0100
-+++ setup.py	2009-01-26 22:52:37.000000000 +0100
-@@ -344,8 +344,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 @@
  if os.name == 'nt':
      # windows does not have unistd.h
      define_macros.append(('YY_NO_UNISTD_H', None))
@@ -9,16 +9,18 @@
  
  myname = "Bastian Kleineidam"
  myemail = "calvin@users.sourceforge.net"
-@@ -353,7 +351,7 @@
+ 
  data_files = [
      ('share/linkchecker',
-         ['config/linkcheckerrc', 'config/logging.conf', ]),
+-        ['config/linkcheckerrc', 'config/logging.conf',
+-        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
 -    ('share/linkchecker/examples',
++        ['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',
-@@ -367,11 +365,9 @@
+@@ -388,11 +382,9 @@
  ]
  
  if os.name == 'posix':
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index 27c73b53b0b6..ababb983cf4c 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -14,7 +14,7 @@ bin/linkchecker-gui
 %%EXAMPLESDIR%%/leer.html.de
 %%EXAMPLESDIR%%/leer.html.en
 %%EXAMPLESDIR%%/linkchecker-completion
-%%EXAMPLESDIR%%/linkchecker.apache.conf
+%%EXAMPLESDIR%%/linkchecker.apache2.conf
 %%PYTHON_SITELIBDIR%%/_LinkChecker_configdata.py
 %%PYTHON_SITELIBDIR%%/_LinkChecker_configdata.pyc
 %%PYTHON_SITELIBDIR%%/_LinkChecker_configdata.pyo
@@ -343,9 +343,6 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/rrset.py
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/rrset.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/rrset.pyo
-%%PYTHON_SITELIBDIR%%/linkcheck/dns/set.py
-%%PYTHON_SITELIBDIR%%/linkcheck/dns/set.pyc
-%%PYTHON_SITELIBDIR%%/linkcheck/dns/set.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/tokenizer.py
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/tokenizer.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/tokenizer.pyo
@@ -382,6 +379,15 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/__init__.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/checker.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/checker.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/checker.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/contextmenu.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/contextmenu.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/contextmenu.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/help.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/help.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/help.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_rc.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_rc.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_rc.pyo
@@ -391,6 +397,18 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_options.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_options.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gui/linkchecker_ui_options.pyo
+%%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/logger.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/logger.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/logger.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/options.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/options.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/options.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/progress.py
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/progress.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/gui/progress.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.py
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/gzip2.pyo
@@ -473,6 +491,9 @@ bin/linkchecker-gui
 %%PYTHON_SITELIBDIR%%/linkcheck/network/__init__.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/network/__init__.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/network/_network.so
+%%PYTHON_SITELIBDIR%%/linkcheck/network/iputil.py
+%%PYTHON_SITELIBDIR%%/linkcheck/network/iputil.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/network/iputil.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.py
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.pyo