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

Update to z-push-2.0.
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Committed previous from wrong tree; was not up to date with the markers.
Written by: Gonzalo L. Rodriguez <gonzalo@openbsd.org>

Update for Gtg to 0.2.9, with some fixes and improves:

* Big refractorization of code, now using liblarch
* Fixed crash traceback when pressing 'delete' key.
* Fixed url autolinking for http(s) schemes.
* Fixed several bugs about hamster integration.

While here, new MASTER_SITES, GROFF is not needed,
delete some patches using perl on Makefile.

Initial update from me with a lot of tweaks by aja@.

Ok aja@
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Simplify setup.
Written by: Christian Weisgerber <naddy@openbsd.org>

maintenance update to 5.0.4
Written by: Marc Espie <espie@openbsd.org>

use TRUEPREFIX to allow correct behavior wrt do-install.
from Christopher Zimmermann
Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>

- update to 0.16.1
Written by: Christian Weisgerber <naddy@openbsd.org>

explicitly include <sys/param.h> before <sys/sysctl.h> and don't rely on
it being pulled in by some other header file
Written by: Pascal Stumpf <pascal@openbsd.org>

Fix a crash on startup when certan options are set in the config file.

Reported by Brett, looks good to laurent@ (maintainer), and confirmed by Ryan
Flannery upstream.
Written by: Martin Pieuchot <mpi@openbsd.org>

Revert the commit that breaks remmina+ssh with OpenBSD servers and add
the URLs to the bugtracker.

ok ajacoutot@, jasper@ (maintainer)
Written by: Marc Espie <espie@openbsd.org>

fix @conflict marker
while there, put common things in Makefile.inc
bump revs according to discrepancies in COMMENT and in @conflict
Written by: Robert Nagy <robert@openbsd.org>

--enable-xml-log is needed for both the client and the server so enable
it by default
Written by: Christian Weisgerber <naddy@openbsd.org>

* explicitly include <limits.h> for INT_MAX
* no need for groff
Written by: Marcus Glocker <mglocker@openbsd.org>

Fix compileall.py -> python dependency by adding
"BUILD_DEPENDS = ${_MODPY_BUILD_DEPENDS}".

Suggested by ajacoutot@
Written by: Stuart Henderson <sthen@openbsd.org>

drop Simon Kuhnle as maintainer, per his request.
Written by: Stuart Henderson <sthen@openbsd.org>

let SpamAssassin work if sslv2 is disabled, from Brad
Written by: Pascal Stumpf <pascal@openbsd.org>

Merge from vendor branch pascal:
GNU ed is a line-oriented text editor. It is used to create, display,
modify and otherwise manipulate text files, both interactively and
via shell scripts. A restricted version of ed, red, can only edit
files in the current directory and cannot execute shell commands.
Ed is the "standard" text editor in the sense that it is the original
editor for Unix, and thus widely available. For most purposes,
however, it is superseded by full-screen editors such as GNU Emacs
or GNU Moe.

ok landry@
Written by: Pascal Stumpf <pascal@openbsd.org>

GNU ed is a line-oriented text editor. It is used to create, display,
modify and otherwise manipulate text files, both interactively and
via shell scripts. A restricted version of ed, red, can only edit
files in the current directory and cannot execute shell commands.
Ed is the "standard" text editor in the sense that it is the original
editor for Unix, and thus widely available. For most purposes,
however, it is superseded by full-screen editors such as GNU Emacs
or GNU Moe.

ok landry@
Written by: Pascal Stumpf <pascal@openbsd.org>

+ ged
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Minor update to gnome-screensaver-3.4.2.