4 files changed, 38 insertions, 168 deletions

diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 0d6c0f7c2fbf..7c7430ce6e9f 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	linkchecker
 PORTVERSION=	9.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 DISTNAME=	LinkChecker-${PORTVERSION}
@@ -12,15 +13,14 @@ COMMENT=	Check HTML documents for broken links
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}requests>=2:${PORTSDIR}/www/py-requests
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	LinkChecker
-PYEASYINSTALL_ARCHDEP=	yes
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		CLAMAV EXAMPLES GEOIP GTK2 LOGIN NLS QT4 \
@@ -35,6 +35,7 @@ GTK2_USE=		gnome=pygtk2
 LOGIN_DESC=		Login form submission
 LOGIN_RUN_DEPENDS=	twill:${PORTSDIR}/www/twill
 NLS_USES=		gettext
+QT4_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-noqt-setup.py
 QT4_RUN_DEPENDS=\
 		${PYTHON_PKGNAMEPREFIX}qt4-sql>=${PYQT_VERSION}:${PORTSDIR}/databases/py-qt4-sql \
 		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \
@@ -55,28 +56,9 @@ WSGI_USE=		apache_run=22
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^Icon/s|=.*|=linkchecker|' ${WRKSRC}/doc/*.desktop
+	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/setup.py
 
 post-build:
-	@${MKDIR} ${WRKDIR}/site-packages
-	@${CAT} ${WRKSRC}/_LinkChecker_configdata.py | ${GREP} ^# \
-		> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${ECHO_MSG} "install_purelib = '${PYTHONPREFIX_SITELIBDIR}'" \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${ECHO_MSG} "install_platlib = '${PYTHONPREFIX_SITELIBDIR}'" \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${ECHO_MSG} "install_lib = '${PYTHONPREFIX_SITELIBDIR}'" \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${ECHO_MSG} "install_headers = '${PYTHONPREFIX_INCLUDEDIR}/LinkChecker'" \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${ECHO_MSG} "install_scripts = '${PREFIX}/bin'" \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${ECHO_MSG} "config_dir = '${DATADIR}'" \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${ECHO_MSG} "install_data = '${PREFIX}'" \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
-	@${CAT} ${WRKSRC}/_LinkChecker_configdata.py | \
-		${GREP} -v ^# | ${GREP} -v ^install | ${GREP} -v ^config \
-		>> ${WRKDIR}/site-packages/_LinkChecker_configdata.py
 .if ${PORT_OPTIONS:MNLS}
 .for lang in de es fr
 	(cd ${WRKSRC}/po && msgfmt -c -o ${lang}.mo ${lang}.po)
@@ -84,52 +66,11 @@ post-build:
 .endif
 
 post-install:
-	(cd ${WRKDIR}/site-packages && ${INSTALL_DATA} \
-		_LinkChecker_configdata.py \
-		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR})
-	(cd ${WRKDIR}/site-packages && ${INSTALL_DATA} \
-		_LinkChecker_configdata.py \
-		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG})
-	(cd ${WRKSRC}/doc/en && ${INSTALL_MAN} linkchecker.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1)
-	(cd ${WRKSRC}/doc/en && ${INSTALL_MAN} linkcheckerrc.5 \
-		${STAGEDIR}${MAN5PREFIX}/man/man5)
-	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/de/man1
-	(cd ${WRKSRC}/doc/de && ${INSTALL_MAN} linkchecker.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/de/man1)
-	@${MKDIR} ${STAGEDIR}${MAN5PREFIX}/man/de/man5
-	(cd ${WRKSRC}/doc/de && ${INSTALL_MAN} linkcheckerrc.5 \
-		${STAGEDIR}${MAN5PREFIX}/man/de/man5)
 .for i in 16 32 48 64 128
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 	(cd ${WRKSRC}/doc/html && ${INSTALL_DATA} logo${i}x${i}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/linkchecker.png)
 .endfor
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC}/config && ${INSTALL_DATA} linkcheckerrc \
-		${STAGEDIR}${DATADIR})
-.for i in lccollection.qhc lcdoc.qch
-	(cd ${WRKSRC}/doc/html && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DATADIR})
-.endfor
-	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	(cd ${WRKSRC}/doc && ${INSTALL_DATA} linkchecker.desktop \
-		${STAGEDIR}${DESKTOPDIR})
-.if ${PORT_OPTIONS:MQT4}
-	(cd ${WRKSRC}/doc/en && ${INSTALL_MAN} linkchecker-gui.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1)
-	(cd ${WRKSRC}/doc/de && ${INSTALL_MAN} linkchecker-gui.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/de/man1)
-	(cd ${WRKSRC}/doc && ${INSTALL_DATA} linkchecker-gui.desktop \
-		${STAGEDIR}${DESKTOPDIR})
-.endif
-.if ${PORT_OPTIONS:MNLS}
-.for lang in de es fr
-	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
-	(cd ${WRKSRC}/po && ${INSTALL_DATA} ${lang}.mo \
-		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/linkchecker.mo)
-.endfor
-.endif
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/cgi-bin/lconline && ${INSTALL_DATA} * \
 		${STAGEDIR}${EXAMPLESDIR})
@@ -141,11 +82,5 @@ post-install:
 	(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${i} \
 		${STAGEDIR}${EXAMPLESDIR})
 .endfor
-	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
-		-d ${PYTHONPREFIX_SITELIBDIR} \
-		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
-	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O -m compileall \
-		-d ${PYTHONPREFIX_SITELIBDIR} \
-		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
 .include <bsd.port.mk>
diff --git a/www/linkchecker/files/extra-patch-noqt-setup.py b/www/linkchecker/files/extra-patch-noqt-setup.py
new file mode 100644
index 000000000000..3bec9f062f7b
--- /dev/null
+++ b/www/linkchecker/files/extra-patch-noqt-setup.py
@@ -0,0 +1,31 @@
+--- setup.py.orig	2014-04-23 22:52:23.000000000 +0200
++++ setup.py	2014-06-16 21:07:43.000000000 +0200
+@@ -627,7 +627,7 @@
+ # libraries
+ libraries = []
+ # scripts
+-scripts = ['linkchecker', 'linkchecker-gui']
++scripts = ['linkchecker']
+ 
+ if os.name == 'nt':
+     # windows does not have unistd.h
+@@ -658,9 +658,9 @@
+ ]
+ 
+ if os.name == 'posix':
+-    data_files.append(('share/man/man1', ['doc/en/linkchecker.1', 'doc/en/linkchecker-gui.1']))
++    data_files.append(('share/man/man1', ['doc/en/linkchecker.1']))
+     data_files.append(('share/man/man5', ['doc/en/linkcheckerrc.5']))
+-    data_files.append(('share/man/de/man1', ['doc/de/linkchecker.1', 'doc/de/linkchecker-gui.1']))
++    data_files.append(('share/man/de/man1', ['doc/de/linkchecker.1']))
+     data_files.append(('share/man/de/man5', ['doc/de/linkcheckerrc.5']))
+     data_files.append(('share/linkchecker/examples',
+               ['config/linkchecker-completion',
+@@ -668,7 +668,6 @@
+                'doc/examples/check_for_x_errors.sh',
+                'doc/examples/check_urls.sh']))
+     data_files.append(('share/applications', ['doc/linkchecker.desktop']))
+-    data_files.append(('share/applications', ['doc/linkchecker-gui.desktop']))
+ if 'py2app' in sys.argv[1:]:
+     if not has_py2app:
+         raise SystemExit("py2app module could not be imported.")
diff --git a/www/linkchecker/files/patch-setup.py b/www/linkchecker/files/patch-setup.py
deleted file mode 100644
index eab5a26e59ca..000000000000
--- a/www/linkchecker/files/patch-setup.py
+++ /dev/null
@@ -1,72 +0,0 @@
---- setup.py.orig
-+++ setup.py
-@@ -328,15 +328,6 @@
- class MyInstallLib (install_lib, object):
-     """Custom library installation."""
- 
--    def install (self):
--        """Install the generated config file."""
--        outs = super(MyInstallLib, self).install()
--        infile = self.create_conf_file()
--        outfile = os.path.join(self.install_dir, os.path.basename(infile))
--        self.copy_file(infile, outfile)
--        outs.append(outfile)
--        return outs
--
-     def create_conf_file (self):
-         """Create configuration file."""
-         cmd_obj = self.distribution.get_command_obj("install")
-@@ -390,7 +381,6 @@
- 
-     def run (self):
-         """Adjust permissions on POSIX systems."""
--        self.add_message_files()
-         super(MyInstallData, self).run()
-         self.fix_permissions()
- 
-@@ -588,7 +578,6 @@
-     def run (self):
-         """Check MANIFEST and build message files before building."""
-         check_manifest()
--        self.build_message_files()
-         build.run(self)
- 
- 
-@@ -632,8 +621,6 @@
- if os.name == 'nt':
-     # windows does not have unistd.h
-     define_macros.append(('YY_NO_UNISTD_H', None))
--else:
--    extra_compile_args.append("-pedantic")
- 
- if sys.platform == 'darwin':
-     define_macros.extend([('HAVE_STRLCPY', None), ('HAVE_STRLCAT', None)])
-@@ -900,9 +887,6 @@
-         'py2exe': MyPy2exe,
-         'py2app': MyPy2app,
-     },
--    package_dir = {
--        'linkcheck_dns.dns': 'third_party/dnspython/dns',
--    },
-     packages = [
-         'linkcheck',
-         'linkcheck.bookmarks',
-@@ -917,10 +901,6 @@
-         'linkcheck.network',
-         'linkcheck.parser',
-         'linkcheck.plugins',
--        'linkcheck_dns.dns',
--        'linkcheck_dns.dns.rdtypes',
--        'linkcheck_dns.dns.rdtypes.ANY',
--        'linkcheck_dns.dns.rdtypes.IN',
-     ],
-     ext_modules = [
-         Extension('linkcheck.HtmlParser.htmlsax',
-@@ -945,7 +925,6 @@
-         ),
-     ],
-     scripts = scripts,
--    data_files = data_files,
-     classifiers = [
-         'Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking',
-         'Development Status :: 5 - Production/Stable',
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index 53f263aa2255..837a296e9e4d 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -1,17 +1,3 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_LinkChecker_configdata.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_LinkChecker_configdata.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_LinkChecker_configdata.pyo
-%%PYTHON_SITELIBDIR%%/_LinkChecker_configdata.py
-%%PYTHON_SITELIBDIR%%/_LinkChecker_configdata.pyc
-%%PYTHON_SITELIBDIR%%/_LinkChecker_configdata.pyo
-man/de/man1/linkchecker.1.gz
-%%QT4%%man/de/man1/linkchecker-gui.1.gz
-man/de/man5/linkcheckerrc.5.gz
-man/man1/linkchecker.1.gz
-%%QT4%%man/man1/linkchecker-gui.1.gz
-man/man5/linkcheckerrc.5.gz
-share/applications/linkchecker.desktop
-%%QT4%%share/applications/linkchecker-gui.desktop
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/check.js
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/check_blacklist.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/check_for_x_errors.sh
@@ -30,14 +16,4 @@ share/icons/hicolor/16x16/apps/linkchecker.png
 share/icons/hicolor/32x32/apps/linkchecker.png
 share/icons/hicolor/48x48/apps/linkchecker.png
 share/icons/hicolor/64x64/apps/linkchecker.png
-%%DATADIR%%/lccollection.qhc
-%%DATADIR%%/lcdoc.qch
-%%DATADIR%%/linkcheckerrc
-%%NLS%%share/locale/de/LC_MESSAGES/linkchecker.mo
-%%NLS%%share/locale/es/LC_MESSAGES/linkchecker.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/linkchecker.mo
-@dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry man/de/man5
-@dirrmtry man/de/man1
-@dirrmtry man/de