deskutils/thinkingrock and devel/xdg-utils both install identical versions of /usr/local/bin/xdg-{email,open}. Fix: Attached patch changes deskutils/thinkingrock to stop installing /usr/local/bin/xdg-{email,open} and to add a dependency on devel/xdg-utils. Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->beat Over to maintainer (via the GNATS Auto Assign Tool)
Author: beat Date: Thu Sep 26 13:14:25 2013 New Revision: 328354 URL: http://svnweb.freebsd.org/changeset/ports/328354 Log: - Depend on devel/xdg-utils instead of installing its own version [1] - Support staging - Bump PORTREVISION PR: ports/181920 [1] Submitted by: G. Paul Ziemba <p-fbsd-bugs@ziemba.us> [1] Modified: head/deskutils/thinkingrock/Makefile Modified: head/deskutils/thinkingrock/Makefile ============================================================================== --- head/deskutils/thinkingrock/Makefile Thu Sep 26 12:54:08 2013 (r328353) +++ head/deskutils/thinkingrock/Makefile Thu Sep 26 13:14:25 2013 (r328354) @@ -3,7 +3,7 @@ PORTNAME= thinkingrock PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils java MASTER_SITES= SF/${PORTNAME}/ThinkingRock/TR%20${PORTVERSION} DISTNAME= tr-${PORTVERSION} @@ -11,13 +11,15 @@ DISTNAME= tr-${PORTVERSION} MAINTAINER= beat@FreeBSD.org COMMENT= Application for collecting and processing your thoughts +RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \ + ${LOCALBASE}/bin/xdg-email:${PORTSDIR}/devel/xdg-utils + USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= pkg-message -NO_STAGE= yes .include <bsd.port.pre.mk> post-patch: @@ -29,15 +31,11 @@ post-patch: ${WRKSRC}/bin/tr_w.exe ${WRKSRC}/etc/tr.conf.bak do-install: - @${MKDIR} ${PREFIX}/${PORTNAME} - @${CP} -r ${WRKSRC}/* ${PREFIX}/${PORTNAME} - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${PORTNAME} - @${LN} -sf ${PREFIX}/${PORTNAME}/bin/tr ${PREFIX}/bin/${PORTNAME} - @${LN} -sf ${PREFIX}/${PORTNAME}/bin/xdg-email ${PREFIX}/bin/xdg-email - @${LN} -sf ${PREFIX}/${PORTNAME}/bin/xdg-open ${PREFIX}/bin/xdg-open + @${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME} + @${CP} -r ${WRKSRC}/* ${STAGEDIR}${PREFIX}/${PORTNAME} + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${PREFIX}/${PORTNAME} + @${LN} -sf ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/tr ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${ECHO} bin/${PORTNAME} >> ${TMPPLIST} - @${ECHO} bin/xdg-email >> ${TMPPLIST} - @${ECHO} bin/xdg-open >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} . ! -type d) | ${SORT} | ${SED} "s|^.|${PORTNAME}|" >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} . -type d) | ${SORT} -r | ${SED} "s|^.|@dirrm ${PORTNAME}|" >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} . -type d -empty) | ${SORT} -r | ${SED} "s|^.|@exec mkdir -p ${PORTNAME}|" >> ${TMPPLIST} _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!