Date: Sat, 22 Mar 2014 14:01:14 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348794 - head/net-im/cjc Message-ID: <201403221401.s2ME1E2E035646@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Sat Mar 22 14:01:14 2014 New Revision: 348794 URL: http://svnweb.freebsd.org/changeset/ports/348794 QAT: https://qat.redports.org/buildarchive/r348794/ Log: - Change dependency for net-im/py-pyxmpp - Change DOCS, remove from pkg-plist - Change REINPLACE, install conditional DOCS PR: ports/179201 Submitted by: nemysis (self) Modified: head/net-im/cjc/Makefile head/net-im/cjc/pkg-plist Modified: head/net-im/cjc/Makefile ============================================================================== --- head/net-im/cjc/Makefile Sat Mar 22 13:00:54 2014 (r348793) +++ head/net-im/cjc/Makefile Sat Mar 22 14:01:14 2014 (r348794) @@ -11,9 +11,7 @@ COMMENT= Console Jabber Client LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.1.0:${PORTSDIR}/net-im/py-pyxmpp - -OPTIONS_DEFINE= DOCS +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:${PORTSDIR}/net-im/py-pyxmpp USE_GITHUB= yes GH_ACCOUNT= Jajcus @@ -24,17 +22,34 @@ USES= shebangfix SHEBANG_FILES= cjc.in cjc.py cjc/main.py USE_PYTHON= 2 +PORTDOCS= * + +DOCSRCDIR1= ${WRKSRC} +DOC_FILES1= ChangeLog README + +DOCSRCDIR2= ${WRKSRC}/doc +DOCSDIR2= ${DOCSDIR}/doc +DOC_FILES2= manual.html + +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e \ - "s|prefix=.*|prefix=${PREFIX}| ; \ - /^DOCS/s|COPYING|| ; \ - s|INSTALL=.*|INSTALL=${INSTALL}| ; \ - s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}| ; \ - s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g ; \ - /compileall/d" ${WRKSRC}/Makefile + 's|prefix=.*|prefix=${PREFIX}|; \ + s|$$(INSTALL_DIR) $$(DESTDIR)$$(pkg_docdir)||; \ + s|$$(INSTALL_DATA) $$(DOCS) $$(DESTDIR)$$(pkg_docdir)||; \ + s|INSTALL=.*|INSTALL=${INSTALL}|; \ + s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}|; \ + s|^INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|; \ + /compileall/d' ${WRKSRC}/Makefile post-install: (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \ -d ${PREFIX} -f ${DATADIR_REL}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} + .include <bsd.port.mk> Modified: head/net-im/cjc/pkg-plist ============================================================================== --- head/net-im/cjc/pkg-plist Sat Mar 22 13:00:54 2014 (r348793) +++ head/net-im/cjc/pkg-plist Sat Mar 22 14:01:14 2014 (r348794) @@ -95,11 +95,6 @@ bin/cjc %%DATADIR%%/plugins/version.pyc %%DATADIR%%/plugins/xmlconsole.py %%DATADIR%%/plugins/xmlconsole.pyc -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/manual.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/cjc/ui @dirrm %%DATADIR%%/cjc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403221401.s2ME1E2E035646>