Date: Sat, 7 Sep 2013 21:49:13 GMT From: "G. Paul Ziemba" <p-fbsd-bugs@ziemba.us> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181920: thinkingrock installs xdg-open, conflicts with xdg-utils port Message-ID: <201309072149.r87LnDmJ038202@oldred.freebsd.org> Resent-Message-ID: <201309072150.r87Lo02U046556@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181920
>Category: ports
>Synopsis: thinkingrock installs xdg-open, conflicts with xdg-utils port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 07 21:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: G. Paul Ziemba
>Release: 9.1-STABLE
>Organization:
>Environment:
FreeBSD hairball.ziemba.us 9.1-STABLE FreeBSD 9.1-STABLE #4 r249454: Sat Apr 13 22:31:42 PDT 2013 root@hairball:/usr/obj/usr/src/sys/GPZ-130412 amd64
>Description:
deskutils/thinkingrock and devel/xdg-utils both install identical versions of /usr/local/bin/xdg-{email,open}.
>How-To-Repeat:
>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:
--- deskutils/thinkingrock/Makefile.orig 2012-12-10 05:24:55.000000000 -0800
+++ deskutils/thinkingrock/Makefile 2013-09-07 14:10:15.000000000 -0700
@@ -15,6 +15,9 @@
JAVA_VERSION= 1.6+
NO_BUILD= yes
+RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
+ ${LOCALBASE}/bin/xdg-email:${PORTSDIR}/devel/xdg-utils
+
SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
@@ -32,11 +35,7 @@
@${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
@${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}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309072149.r87LnDmJ038202>