- Update to 2.9

- Fix build on 4.x

4 files changed, 35 insertions, 14 deletions

diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 28581d7442aa..adc4a2ab34da 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	linkchecker
-PORTVERSION=	2.3
+PORTVERSION=	2.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,13 +17,14 @@ COMMENT=	Check HTML documents for broken links
 
 USE_PYTHON=		2.4
 USE_PYDISTUTILS=	yes
-
+USE_REINPLACE=		yes
 MAN1=	linkchecker.1
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on FreeBSD 4.x"
+post-patch:
+	@${REINPLACE_CMD} -e 's/gnu99/gnu89/' ${WRKSRC}/setup.py
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/linkchecker/distinfo b/www/linkchecker/distinfo
index b6a99a4d83cd..22a9cc089cee 100644
--- a/www/linkchecker/distinfo
+++ b/www/linkchecker/distinfo
@@ -1,2 +1,2 @@
-MD5 (linkchecker-2.3.tar.gz) = 922ac3c16355daf5aab836485c59dd2d
-SIZE (linkchecker-2.3.tar.gz) = 518383
+MD5 (linkchecker-2.9.tar.gz) = d20304208b1d44a486e27bcc4622b60b
+SIZE (linkchecker-2.9.tar.gz) = 543831
diff --git a/www/linkchecker/files/patch-setup.py b/www/linkchecker/files/patch-setup.py
index 43b0c46d716d..6f3780a2f7b6 100644
--- a/www/linkchecker/files/patch-setup.py
+++ b/www/linkchecker/files/patch-setup.py
@@ -1,7 +1,15 @@
---- 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']),
+--- setup.py.orig	Wed Apr 13 23:03:04 2005
++++ setup.py	Sun May 22 11:44:58 2005
+@@ -413,7 +413,6 @@
+     # windows does not have unistd.h
+     define_macros.append(('YY_NO_UNISTD_H', None))
+ else:
+-    extra_compile_args.append("-pedantic")
+     if win_compiling:
+         # we are cross compiling with mingw
+         # add directory for pyconfig.h
+@@ -430,7 +429,7 @@
+ data_files = [
           ('share/linkchecker',
               ['config/linkcheckerrc', 'config/logging.conf', ]),
 -         ('share/linkchecker/examples',
@@ -9,7 +17,7 @@
               ['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',
-@@ -250,10 +250,8 @@
+@@ -438,10 +437,8 @@
        ]
  
  if os.name == 'posix':
@@ -20,5 +28,5 @@
 +    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':
+ elif win_compiling:
      data_files.append(('share/linkchecker/doc',
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index 16fbcb272c2e..8a7b689346a2 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -31,9 +31,15 @@ bin/linkchecker
 %%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/httpheaders.py
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/httpheaders.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/checker/httpheaders.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpsurl.py
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpsurl.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/checker/httpsurl.pyo
@@ -67,6 +73,9 @@ bin/linkchecker
 %%PYTHON_SITELIBDIR%%/linkcheck/containers.py
 %%PYTHON_SITELIBDIR%%/linkcheck/containers.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/containers.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/decorators.py
+%%PYTHON_SITELIBDIR%%/linkcheck/decorators.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/decorators.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/__init__.py
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/__init__.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/dns/__init__.pyo
@@ -302,6 +311,9 @@ bin/linkchecker
 %%PYTHON_SITELIBDIR%%/linkcheck/linkparse.py
 %%PYTHON_SITELIBDIR%%/linkcheck/linkparse.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/linkparse.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/lock.py
+%%PYTHON_SITELIBDIR%%/linkcheck/lock.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/lock.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/log.py
 %%PYTHON_SITELIBDIR%%/linkcheck/log.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/log.pyo
@@ -338,6 +350,9 @@ bin/linkchecker
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.py
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/mem.pyo
+%%PYTHON_SITELIBDIR%%/linkcheck/msgfmt.py
+%%PYTHON_SITELIBDIR%%/linkcheck/msgfmt.pyc
+%%PYTHON_SITELIBDIR%%/linkcheck/msgfmt.pyo
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.py
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.pyc
 %%PYTHON_SITELIBDIR%%/linkcheck/robotparser2.pyo
@@ -362,9 +377,6 @@ bin/linkchecker
 %%EXAMPLESDIR%%/linkchecker-completion
 %%DATADIR%%/linkcheckerrc
 %%DATADIR%%/logging.conf
-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/HtmlParser