Fix mis-merge in last commit, restoring some route operations which got broken.
Thanks to Mattieu Baptiste for reporting the problem and testing the fix.

Written by: Stuart Henderson <sthen@openbsd.org>
Update to 1.5.4

ok avsm@

Written by: chrisz <chrisz@cvs.openbsd.org>
Install documentation

ok avsm@

Written by: chrisz <chrisz@cvs.openbsd.org>
Update to josm svn r7643.

with maintainer Holger Mikolon, ok bcallah@ ian@ on a previous update to r7632.

Written by: Landry Breuil <landry@openbsd.org>
Update to gtk+3-3.14.4.

Written by: Antoine Jacoutot <ajacoutot@openbsd.org>
add PORTROACH annotation to restrict to stable 1.10.X version.

Written by: Kirill Bychkov <kirby@openbsd.org>
add PORTROACH annotation to restrict to stable 2.0.X branch.

Written by: Kirill Bychkov <kirby@openbsd.org>
update to mcollective-puppet-agent-1.9.0

Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>
update to puppetdb-2.2.2

Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>
Update to lumina-0.7.0.1413916751.

Written by: Antoine Jacoutot <ajacoutot@openbsd.org>
Use a 2000lbs hammer in post-patch to "fix" the translation keys/strings
instead of having to carry a huge patch, which is a pain to update at
each release.

please, someone do something better than my horror mixing pipes,
subshells, grep, sed, cut and perl.

ok bentley@ (MAINTAINER)

Written by: Landry Breuil <landry@openbsd.org>
switch to working maintainer address

Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>
--disable-openexr to prevent it from being picked up; spotted by landry@

Written by: Antoine Jacoutot <ajacoutot@openbsd.org>
unify maintainer addresses

ok chrisz@

Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>
unify maintainer addresses

ok MAINTAINER

Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>
unify email/name

Written by: gonzalo <gonzalo@cvs.openbsd.org>
unify email/name

Written by: gonzalo <gonzalo@cvs.openbsd.org>
unify email/name

Written by: gonzalo <gonzalo@cvs.openbsd.org>
unify maintainer addresses

ok giovanni@

Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>
unify maintainer addresses

ok gsoares@

Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>