- Update to 8.4

PR:		176531
Submitted by:	Ports Fury

www/linkchecker/Makefile

@@ -2,41 +2,94 @@
 # $FreeBSD$
 
 PORTNAME=	linkchecker
-PORTVERSION=	6.6
+PORTVERSION=	8.4
 CATEGORIES=	www python
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	GHC
 DISTNAME=	LinkChecker-${PORTVERSION}
 
 MAINTAINER=	ports@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
-
-OPTIONS_DEFINE=	GUI NLS
-
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
-USE_PYTHON=		2.5+
-USE_PYDISTUTILS=	yes
-INSTALLS_EGGINFO=	yes
-PYDISTUTILS_EGGINFO=	LinkChecker-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython
 
-MAN1=	linkchecker.1
-MAN5=	linkcheckerrc.5
+OPTIONS_DEFINE=	CLAMAV GEOIP GTK2 LOGIN QT4 SQLITE3 SYNTAX WSGI NLS EXAMPLES
+OPTIONS_DEFAULT=SQLITE3 SYNTAX
+CLAMAV_DESC=	Clam Antivirus
+LOGIN_DESC=	Login form submission
+SYNTAX_DESC=	HTML/CSS syntax check
+WSGI_DESC=	WSGI Web interface
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	wummel
+
+USE_XZ=		yes
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGNAME=	LinkChecker
+PYEASYINSTALL_ARCHDEP=	yes
+INSTALLS_ICONS=	yes
+
+MANLANG=	"" de
+MAN1=		linkchecker.1
+MAN5=		linkcheckerrc.5
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGUI}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \
+# For Virus checking
+.if ${PORT_OPTIONS:MCLAMAV}
+RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
+.endif
+
+# For displaying country codes
+.if ${PORT_OPTIONS:MGEOIP}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}GeoIP>0:${PORTSDIR}/net/py-GeoIP
+.endif
+
+# For GNOME proxy setting parsing
+.if ${PORT_OPTIONS:MGTK2}
+USE_GNOME+=	pygtk2
+.endif
+
+# For login form submission
+.if ${PORT_OPTIONS:MLOGIN}
+RUN_DEPENDS+=	twill:${PORTSDIR}/www/twill
+.endif
+
+# For Graphical User Interface
+.if ${PORT_OPTIONS:MQT4}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-sql>=${PYQT_VERSION}:${PORTSDIR}/databases/py-qt4-sql \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PYTHON_PKGNAMEPREFIX}qt4-help>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-help \
 		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=${QSCI2_VERSION}:${PORTSDIR}/devel/py-qt4-qscintilla2
+PLIST_SUB+=	QT4=""
+MAN1+=		linkchecker-gui.1
+.else
+PLIST_SUB+=	QT4="@comment "
+.endif
+
+# For parsing bookmark files
+.if ${PORT_OPTIONS:MSQLITE3}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+.endif
+
+# For HTML/CSS syntax checks
+.if ${PORT_OPTIONS:MSYNTAX}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:${PORTSDIR}/www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}utidy>=0.2:${PORTSDIR}/www/py-utidy
+.endif
+
+# To run the WSGI Web interface
+.if ${PORT_OPTIONS:MWSGI}
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_wsg>0:${PORTSDIR}/www/mod_wsgi
+USE_APACHE_RUN=	22
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-MANLANG=	"" de
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -44,10 +97,94 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^Icon/s|=.*|=linkchecker|' ${WRKSRC}/doc/*.desktop
+
+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
+	@${PYTHON_CMD} -m compileall ${WRKDIR}/site-packages
+	@${PYTHON_CMD} -O -m compileall ${WRKDIR}/site-packages
 .if ${PORT_OPTIONS:MNLS}
-	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/nls-patch-setup.py
-.else
-	@${RM} ${WRKSRC}/po/*.po
+.for lang in de es fr
+	(cd ${WRKSRC}/po && msgfmt -c -o ${lang}.mo ${lang}.po)
+.endfor
+.endif
+
+post-install:
+	(cd ${WRKDIR}/site-packages && ${INSTALL_DATA} \
+		_LinkChecker_configdata.py* \
+		${PYTHONPREFIX_SITELIBDIR})
+	(cd ${WRKDIR}/site-packages && ${INSTALL_DATA} \
+		_LinkChecker_configdata.py* \
+		${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG})
+	(cd ${WRKSRC}/doc/en && ${INSTALL_MAN} linkchecker.1 \
+		${MAN1PREFIX}/man/man1)
+	(cd ${WRKSRC}/doc/en && ${INSTALL_MAN} linkcheckerrc.5 \
+		${MAN5PREFIX}/man/man5)
+	@${MKDIR} ${MAN1PREFIX}/man/de/man1
+	(cd ${WRKSRC}/doc/de && ${INSTALL_MAN} linkchecker.1 \
+		${MAN1PREFIX}/man/de/man1)
+	@${MKDIR} ${MAN5PREFIX}/man/de/man5
+	(cd ${WRKSRC}/doc/de && ${INSTALL_MAN} linkcheckerrc.5 \
+		${MAN5PREFIX}/man/de/man5)
+.for i in 16 32 48 64 128
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+	(cd ${WRKSRC}/doc/html && ${INSTALL_DATA} logo${i}x${i}.png \
+		${PREFIX}/share/icons/hicolor/${i}x${i}/apps/linkchecker.png)
+.endfor
+	@${MKDIR} ${DATADIR}
+.for i in ca-certificates.crt linkcheckerrc
+	(cd ${WRKSRC}/config && ${INSTALL_DATA} ${i} ${DATADIR})
+.endfor
+.for i in lccollection.qhc lcdoc.qch
+	(cd ${WRKSRC}/doc/html && ${INSTALL_DATA} ${i} ${DATADIR})
+.endfor
+	@${MKDIR} ${DESKTOPDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} linkchecker.desktop \
+		${DESKTOPDIR})
+.if ${PORT_OPTIONS:MQT4}
+	(cd ${WRKSRC}/doc/en && ${INSTALL_MAN} linkchecker-gui.1 \
+		${MAN1PREFIX}/man/man1)
+	(cd ${WRKSRC}/doc/de && ${INSTALL_MAN} linkchecker-gui.1 \
+		${MAN1PREFIX}/man/de/man1)
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} linkchecker-gui.desktop \
+		${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 \
+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/linkchecker.mo)
+.endfor
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/cgi-bin/lconline && ${INSTALL_DATA} * ${EXAMPLESDIR})
+.for i in linkchecker.apache2.conf linkchecker-completion
+	(cd ${WRKSRC}/config && ${INSTALL_DATA} ${i} ${EXAMPLESDIR})
+.endfor
+.for i in check_blacklist.sh check_for_x_errors.sh check_urls.sh
+	(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${i} ${EXAMPLESDIR})
+.endfor
 .endif
 
 .include <bsd.port.mk>

www/linkchecker/distinfo

@@ -1,2 +1,2 @@
-SHA256 (LinkChecker-6.6.tar.bz2) = 774593139c2c735a8e6afe6f5203fbecbe8ffbebea84e7e720e51d74c20af05b
-SIZE (LinkChecker-6.6.tar.bz2) = 503061
+SHA256 (LinkChecker-8.4.tar.xz) = b77ba0e8a087ea11efb64216427b3ae5437a1534ffd9f8762ffd26bc9600c0a7
+SIZE (LinkChecker-8.4.tar.xz) = 655044

www/linkchecker/files/nls-patch-setup.py

@@ -1,11 +0,0 @@
---- 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',
-               ['config/linkchecker-completion',
-                'doc/examples/check_blacklist.sh',

www/linkchecker/files/patch-setup.py

@@ -1,6 +1,38 @@
---- 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 @@
+--- setup.py.orig
++++ setup.py
+@@ -326,15 +326,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")
+@@ -385,7 +376,6 @@
+ 
+     def run (self):
+         """Adjust permissions on POSIX systems."""
+-        self.add_message_files()
+         super(MyInstallData, self).run()
+         self.fix_permissions()
+ 
+@@ -583,7 +573,6 @@
+     def run (self):
+         """Check MANIFEST and build message files before building."""
+         check_manifest()
+-        self.build_message_files()
+         build.run(self)
+ 
+ 
+@@ -627,8 +616,6 @@
  if os.name == 'nt':
      # windows does not have unistd.h
      define_macros.append(('YY_NO_UNISTD_H', None))
@@ -8,30 +40,33 @@
 -    extra_compile_args.append("-pedantic")
  
  myname = "Bastian Kleineidam"
- myemail = "calvin@users.sourceforge.net"
- 
- data_files = [
-     ('share/linkchecker',
--        ['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',
-@@ -381,11 +378,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/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/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',
-               ['config/linkchecker-completion',
-                'doc/examples/check_blacklist.sh',
-                'doc/examples/check_for_x_errors.sh',
+ myemail = "bastian.kleineidam@web.de"
+@@ -898,9 +885,6 @@
+         'py2app': MyPy2app,
+         'register': MyRegister,
+     },
+-    package_dir = {
+-        'linkcheck_dns.dns': 'third_party/dnspython/dns',
+-    },
+     packages = [
+         'linkcheck',
+         'linkcheck.bookmarks',
+@@ -913,10 +897,6 @@
+         'linkcheck.HtmlParser',
+         'linkcheck.logger',
+         'linkcheck.network',
+-        'linkcheck_dns.dns',
+-        'linkcheck_dns.dns.rdtypes',
+-        'linkcheck_dns.dns.rdtypes.ANY',
+-        'linkcheck_dns.dns.rdtypes.IN',
+     ],
+     ext_modules = [
+         Extension('linkcheck.HtmlParser.htmlsax',
+@@ -941,7 +921,6 @@
+         ),
+     ],
+     scripts = scripts,
+-    data_files = data_files,
+     classifiers = [
+         'Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking',
+         'Development Status :: 5 - Production/Stable',

www/linkchecker/pkg-descr

@@ -17,4 +17,4 @@ Features :
      * command line interface
      * (Fast)CGI web interface
 
-WWW: http://linkchecker.sourceforge.net/
+WWW: http://wummel.github.com/linkchecker/