diff options
| author | Nikolai Lifanov <lifanov@FreeBSD.org> | 2018-07-24 03:16:31 +0000 |
|---|---|---|
| committer | Nikolai Lifanov <lifanov@FreeBSD.org> | 2018-07-24 03:16:31 +0000 |
| commit | d7fb0db68986086b69803fa57c74f0891d3d6f83 (patch) | |
| tree | da39f9a3faaca2c1a0f06c55ebeb76aacc37dbb6 | |
| parent | - Update to 0.9991 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=475222
| -rw-r--r-- | sysutils/ansible/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/ansible1/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/ansible23/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/ansible24/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/ansible25/Makefile | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 471046b9fd18..46e5807e5f78 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -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} @@ -69,6 +69,10 @@ post-install-EXAMPLES-on: ${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 do-test: diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile index cd8b6ee5200c..0070993aa0c4 100644 --- a/sysutils/ansible1/Makefile +++ b/sysutils/ansible1/Makefile @@ -2,7 +2,7 @@ PKGNAMESUFFIX= 1 PORTVERSION= 1.9.6 -PORTREVISION= 3 +PORTREVISION= 4 CONFLICTS= ansible-* ansible23-* ansible24-* ansible25-* diff --git a/sysutils/ansible23/Makefile b/sysutils/ansible23/Makefile index dca1d8aa1a87..64a8418c6888 100644 --- a/sysutils/ansible23/Makefile +++ b/sysutils/ansible23/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.3.3.0 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 23 CONFLICTS= ansible-* ansible1-* ansible24-* ansible25-* diff --git a/sysutils/ansible24/Makefile b/sysutils/ansible24/Makefile index c483be17fff6..f2fa6e59293d 100644 --- a/sysutils/ansible24/Makefile +++ b/sysutils/ansible24/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.4.4.0 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 24 CONFLICTS= ansible-* ansible1-* ansible23-* ansible25-* diff --git a/sysutils/ansible25/Makefile b/sysutils/ansible25/Makefile index 65501b988767..885934db8c78 100644 --- a/sysutils/ansible25/Makefile +++ b/sysutils/ansible25/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.5.6 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 25 CONFLICTS= ansible-* ansible1-* ansible23-* ansible24-* |