The following reply was made to PR ports/182496; it has been noted by GNATS.
From: Mike Carlson
To: bug-follo...@freebsd.org, christer.edwa...@gmail.com
Cc:
Subject: Re: ports/182496: maintainer update: sysutils/py-salt
Date: Mon, 14 Oct 2013 10:43:03 -0700
This is a cryptographically signed message in MIME format.
--ms010600080706010708050202
Content-Type: multipart/alternative;
boundary="070203010902060603070003"
This is a multi-part message in MIME format.
--070203010902060603070003
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable
The patch for setup.py fails (as of today), the first patch block:
--- ./setup.py.orig2013-03-19 08:58:34.0 +0400
+++ ./setup.py2013-03-20 20:15:36.0 +0400
@@ -156,7 +156,7 @@
if 'SYSCONFDIR' in os.environ:
etc_path =3D os.environ['SYSCONFDIR']
else:
-etc_path =3D os.path.join(os.path.dirname(PREFIX), 'etc')
+etc_path =3D os.path.join('%%PREFIX%%', 'etc')
with open(salt_reqs) as f:
lines =3D f.read().split('\n')
Once removed, the port built file with this patch-setup.py:
--- ./setup.py.orig2013-03-19 08:58:34.0 +0400
+++ ./setup.py2013-03-20 20:15:36.0 +0400
@@ -209,7 +209,7 @@
'salt.utils',
],
'package_data': {'salt.modules': ['rh_ip/*.jinja']}=
,
-'data_files': [('share/man/man1',
+'data_files': [('man/man1',
['doc/man/salt-master.1',
'doc/man/salt-key.1',
'doc/man/salt.1',
@@ -219,7 +219,7 @@
'doc/man/salt-run.1',
'doc/man/salt-minion.1',
]),
- ('share/man/man7', ['doc/man/salt.7']=
),
+ ('man/man7', ['doc/man/salt.7']),
],
# Required for esky builds
'install_requires': requirements,
--070203010902060603070003
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
The patch for setup.py fails (as of today), the first patch block:
--- ./setup.py.orig 2013-03-19
08:58:34.0 +0400
+++ ./setup.py 2013-03-20 20:15:36.0=
+0400
@@ -156,7 +156,7 @@
if 'SYSCONFDIR' in os.environ:
etc_path =3D os.environ['SYSCONFD=
IR']
else:
- etc_path =3D os.path.join(os.path.dirn=
ame(PREFIX),
'etc')
+ etc_path =3D os.path.join('%%PREFIX%%'=
, 'etc')
with open(salt_reqs) as f:
lines =3D f.read().split('\n')
Once removed, the port built file with this patch-setup.py:
--- ./setup.py.orig 2013-03-19 08:5=
8:34.0
+0400
+++ ./setup.py 2013-03-20 20:15:36.0=
+0400
@@ -209,7 +209,7 @@
&nbs=
p;=
; 'salt.utils',
&nbs=
p;=
; ],
&nbs=
p; 'package_data': {'salt.modules':
['rh_ip/*.jinja']},
- &nb=
sp; 'data_files': [('share/man/man1',<=
tt>
+ &nb=
sp; 'data_files': [('man/man1',
&nbs=
p;=
;
['doc/man/salt-master.1',
&nbs=
p;=
; 'doc/=
man/salt-key.1',
&nbs=
p;=
; 'doc/=
man/salt.1',
@@ -219,7 +219,7 @@
&nbs=
p;=
; 'doc/=
man/salt-run.1',
&nbs=
p;=
;
'doc/man/salt-minion.1',
&nbs=
p;=
; ]),
- &nb=
sp; &nbs=
p; ('share/man/man7',
['doc/man/salt.7']),
+ &nb=
sp; &nbs=
p; ('man/man7',
['doc/man/salt.7']),
&nbs=
p;=
; ],
&nbs=
p; # Required for esky builds
&nbs=
p; 'install_requires': requirements,<=
/tt>
--070203010902060603070003--
--ms010600080706010708050202
Content-Type: application/pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
Content-Description: S/MIME Cryptographic Signature
MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIITIjCC
BhwwggQEoAMCAQICCGWP9DPVdj3ZMA0GCSqGSIb3DQEBCwUAMEsxDzANBgNVBAMMBlJvb3RD
QTEWMBQGA1UECgwNQmF5IFBob3RvIExhYjETMBEGA1UECAwKQ2FsaWZvcm5