Date: Mon, 16 Jun 2014 19:36:08 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358036 - in head/www/linkchecker: . files Message-ID: <201406161936.s5GJa8Db085863@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Mon Jun 16 19:36:07 2014 New Revision: 358036 URL: http://svnweb.freebsd.org/changeset/ports/358036 QAT: https://qat.redports.org/buildarchive/r358036/ Log: - Remove easy_install dependency - Convert to PYDISTUTILS_AUTOPLIST - Add missing py-requests RUN_DEPENDS - Bump PORTREVISION to enforce a cleanup for the easy_install references With hat: python@ Approved by: portmgr (implicit) Added: head/www/linkchecker/files/extra-patch-noqt-setup.py (contents, props changed) Deleted: head/www/linkchecker/files/patch-setup.py Modified: head/www/linkchecker/Makefile head/www/linkchecker/pkg-plist Modified: head/www/linkchecker/Makefile ============================================================================== --- head/www/linkchecker/Makefile Mon Jun 16 19:29:40 2014 (r358035) +++ head/www/linkchecker/Makefile Mon Jun 16 19:36:07 2014 (r358036) @@ -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 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> Added: head/www/linkchecker/files/extra-patch-noqt-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/linkchecker/files/extra-patch-noqt-setup.py Mon Jun 16 19:36:07 2014 (r358036) @@ -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.") Modified: head/www/linkchecker/pkg-plist ============================================================================== --- head/www/linkchecker/pkg-plist Mon Jun 16 19:29:40 2014 (r358035) +++ head/www/linkchecker/pkg-plist Mon Jun 16 19:36:07 2014 (r358036) @@ -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/linkcheck 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406161936.s5GJa8Db085863>