Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Aug 2017 16:08:36 +0200
From:      Romain =?iso-8859-1?Q?Tarti=E8re?= <romain@FreeBSD.org>
To:        Baptiste Daroussin <bapt@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, sobomax@FreeBSD.org
Subject:   Re: svn commit: r448610 - in head/devel/leatherman: . files
Message-ID:  <20170823140836.GB13824@blogreen.org>
In-Reply-To: <20170823134934.rjje72qwomm7sd6c@ivaldir.net>
References:  <201708231317.v7NDHEGS099253@repo.freebsd.org> <20170823132505.s7kakyqgyb5tdy42@ivaldir.net> <20170823134551.GA13824@blogreen.org> <20170823134934.rjje72qwomm7sd6c@ivaldir.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--v9Ux+11Zm5mwPlX6
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Aug 23, 2017 at 03:49:34PM +0200, Baptiste Daroussin wrote:
> What is wrong with make makepatch? I am not aware of patchtool.py it prob=
ably
> predate make makpatch has become acutally useful :)

I am not sure that something is actually "wrong" with it=E2=80=A6  I usualy=
 use
patchtool :-/

Running `make makepatch` in the current "sysutils/facter" seems to
update all patches to change dates, e.g.:

---------------------------------- 8< ----------------------------------
---- cmake/FindCPPHOCON.cmake.orig      2017-06-27 17:42:22 UTC
+--- cmake/FindCPPHOCON.cmake.orig      2017-08-16 19:04:37 UTC
---------------------------------- 8< ----------------------------------

I guess that if a file which is patched has been modified upstream
between two releases, the patch will have to be regenerated with a new
timestamp (what make makepatch does and patchtool does not)?


Another point with `make makepatch`: in the post-patch target, I alter
the patched source code.  `make makepatch` wants the combined patches to
be combined:

---------------------------------- 8< ----------------------------------
-+        return "%%PREFIX%%/etc/facter/facter.conf";
++        return "/usr/local/etc/facter/facter.conf";
---------------------------------- 8< ----------------------------------

https://svnweb.freebsd.org/ports/head/sysutils/facter/files/patch-lib_src_u=
til_config_posix_config.cc?view=3Dmarkup&pathrev=3D448483
https://svnweb.freebsd.org/ports/head/sysutils/facter/Makefile?revision=3D4=
48483&view=3Dmarkup&pathrev=3D448483#l36

Is it possible to avoid this?

> Anyway the issue is why adding keywords on top of patches in files, it is
> inconsistent with the rest of the ports tree

I'll work on fixing this and avoid it to happen again=E2=80=A6

Thanks

--=20
Romain Tarti=C3=A8re <romain@FreeBSD.org>  http://people.FreeBSD.org/~romai=
n/
pgp: 8234 9A78 E7C0 B807 0B59  80FF BA4D 1D95 5112 336F (ID: 0x5112336F)
(plain text =3Dnon-HTML=3D PGP/GPG encrypted/signed e-mail much appreciated)

--v9Ux+11Zm5mwPlX6
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQGzBAEBCAAdFiEEgjSaeOfAuAcLWYD/uk0dlVESM28FAlmdjGQACgkQuk0dlVES
M29C8QwAwDs2+z5+VF1dJMJ4huaHLKV6vs3mRfNk/ONoXZURCx3newiHDumqRIrW
8bMDATxktXHdYsE6gSIXsSpviyCk3kyW+RdrZXk4Cm+Fv37p/3zDcRt889SXxRBV
JwG6zBsPulNMspCLDSnMlPaFA47tjYB9PdO3YFPWlzYScJMFWJTyDBIg+X6aFTtm
m7E55wNCyKdtUa72ixbqU6P3Ay9p9nQsfKSF0ZKsNDg53fe9vpsXjTKkCpNN+WW5
k4rcvgpghRG7jrKBgrTaMSo5ZcaYLlP4mD8Nf/2J7+34w/NKk1tcy7n75vK+kI6T
NRSh1NTNtxYOQ4ZeRvFwYW2FooHZz6GQO4iudTN5pHme75PODETEdRtNG8+F6YAo
pz5PBA7wEydG7chQYJC+R052NDN6ltDIZW0H54pgbCf3KKxNKF/DXrl4QqT/jBFR
vZVGl10GGJDv+mMM2LclZvVdtZqNOEBj1J1cIFPbmguhInd+r/ZxZCzu5uhQn9K1
HGFRiMXk
=S7Sm
-----END PGP SIGNATURE-----

--v9Ux+11Zm5mwPlX6--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170823140836.GB13824>