Date: Tue, 24 Jul 2018 03:16:32 +0000 (UTC) From: Nikolai Lifanov <lifanov@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475222 - in head/sysutils: ansible ansible1 ansible23 ansible24 ansible25 Message-ID: <201807240316.w6O3GW8C018767@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lifanov Date: Tue Jul 24 03:16:31 2018 New Revision: 475222 URL: https://svnweb.freebsd.org/changeset/ports/475222 Log: fix symlinks for ansible when non-default version is installed The issue is that before stage, other binaries are links to ansible: bin/ansible-vault -> bin/ansible bin/ansible-playbook -> bin/ansible During stage, these get renamed with a suffix, like 3.6, but the target of the symlink doesn't change: bin/ansible-vault-3.6 -> bin/ansible bin/ansible-playbook-3.6 -> bin/ansible This either creates broken links if the package for the default Python version is not installed or it creates links to the wrong binary if it is. Thank you Andreas Sommer for the fix! PR: 229960 Submitted by: Andreas Sommer Modified: head/sysutils/ansible/Makefile head/sysutils/ansible1/Makefile head/sysutils/ansible23/Makefile head/sysutils/ansible24/Makefile head/sysutils/ansible25/Makefile Modified: head/sysutils/ansible/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Tue Jul 24 02:46:14 2018 (r475221) +++ head/sysutils/ansible/Makefile Tue Jul 24 03:16:31 2018 (r475222) @@ -2,7 +2,7 @@ PORTNAME= ansible PORTVERSION?= 2.6.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -68,6 +68,10 @@ post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR} + +post-stage: + ${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \ + -execdir ${RLN} ansible-${PYTHON_VER} {} \; TEST_WRKSRC=${WRKSRC}/test Modified: head/sysutils/ansible1/Makefile ============================================================================== --- head/sysutils/ansible1/Makefile Tue Jul 24 02:46:14 2018 (r475221) +++ head/sysutils/ansible1/Makefile Tue Jul 24 03:16:31 2018 (r475222) @@ -2,7 +2,7 @@ PKGNAMESUFFIX= 1 PORTVERSION= 1.9.6 -PORTREVISION= 3 +PORTREVISION= 4 CONFLICTS= ansible-* ansible23-* ansible24-* ansible25-* Modified: head/sysutils/ansible23/Makefile ============================================================================== --- head/sysutils/ansible23/Makefile Tue Jul 24 02:46:14 2018 (r475221) +++ head/sysutils/ansible23/Makefile Tue Jul 24 03:16:31 2018 (r475222) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.3.3.0 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 23 CONFLICTS= ansible-* ansible1-* ansible24-* ansible25-* Modified: head/sysutils/ansible24/Makefile ============================================================================== --- head/sysutils/ansible24/Makefile Tue Jul 24 02:46:14 2018 (r475221) +++ head/sysutils/ansible24/Makefile Tue Jul 24 03:16:31 2018 (r475222) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.4.4.0 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 24 CONFLICTS= ansible-* ansible1-* ansible23-* ansible25-* Modified: head/sysutils/ansible25/Makefile ============================================================================== --- head/sysutils/ansible25/Makefile Tue Jul 24 02:46:14 2018 (r475221) +++ head/sysutils/ansible25/Makefile Tue Jul 24 03:16:31 2018 (r475222) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.5.6 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 25 CONFLICTS= ansible-* ansible1-* ansible23-* ansible24-*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807240316.w6O3GW8C018767>