Update ImageMagick to 6.9.0.4.

- Normalize the ImageMagick library name so it stays the same regardless of
  what the 16-bit and HDRI option are set to [1]. Teach cmake to look for
  the new name. Bump ports that link to the libraries due to this.
- As a result do away with the "HALFSUPPORTED" option block, and list
  16-bit and HDRI with the other options.
- ImageMagick ships a basic SVG plugin when not using librsvg2 for SVG
  support. This basic SVG plugin needs libxml2 to work [2]. Make libxml2
  a mandatory dependency (instead of only when the SVG option was selected).
- Don't touch .keep files in the modules directory, there files there so
  it useless.

PR:		194949 [1]
PR:		195227 [2]
Requested by:	many [1]
Submitted by:	software-freebsd@interfasys.ch [2]

Update graphics/giflib to 5.0.5

Differential Revision:	https://reviews.freebsd.org/D1361
Submitted by:	bapt
Reviewed by:	self
Exp-run by:	self

Bump portrevision after png update

Change libpng15.so to libpng.so in LIB_DEPENDS to prepare the upgrade

Cleanup plist

Replace USES=libtool:oldver with USES=libtool or USES=libtool:keepla in
the 32 ports that still use it.  Bump PORTREVISION on their dependent
ports except the ones that depend on these:

audio/libogg
audio/libvorbis
devel/pcre
ftp/curl
graphics/jpeg
graphics/libart_lgpl
graphics/tiff
textproc/expat2
textproc/libxslt

In these cases the same trick as in the recent gettext update is used.

- Revert --without-compress-install option, which seems to affect .el files
  as well
- Uncompress .info files separately in post-install, so bsd.port.mk is able
  to detect them
- Remove traces of SYNC_INPUT option

Reported by:	Scott Allendorf <scott-allendorf at uiowa.edu>
		(via private mail)

- Fix pkg-install script to correctly install emacs games scores files[1]
- Fix building port when ALSA option is enabled[2]
- Depend on desktop-file-utils only when X11 option is enabled[3]
- Bump PORTREVISION to account for these changes

PR:		194624[1], 194862[2]
Submitted by:	crest <crest at sahiro.org>[2]
Reported by:	Joseph Mingrone <jrm at ftfl.ca>[1],
		Richard Kuhns <rjk at wintek.com>[3] (via private email)

Remove * from LIB_DEPENDS lines and specify the default library name
for ImageMagick. Using '*' it is unsupported and potention bugs here.

Fix check-sanity

GNU Emacs Updates

editors/emacs:
 - Update to 24.4[1]
 - Remove all upstreamed diffs[1]
 - Switch to static pkg-plist[1]
 - Add OPTIONs for ACL, file notification, LTO, ALSA, and OSS[1]
 - Reword IGNORE messages for portlint[1]
 - Add fix for a Emacs TRAMP bug
 - Update CANNA patchset[2]

editors/emacs-devel:
 - Update to bzr snapshot revision 118251
 - Add pkg-install, and pkg-deinstall file missed from r364499
 - Switch to static pkg-plist

bump portrevision due to changes in the plist

Fix plist for emacs info files
The dir directory it generated at stage time by install-info but this should be
ignored as now indexinfo
it createing an index at package installation time.

This commit is anyway mostly useless here as emacs info files being installed in
a custom place are not
directly viewable/indexed by the info(1) command

- Move /var/games/emacs stuff from pkg-plist into pkg-{de,}install as it's
  not installed in $PREFIX, which causes issues with `check-plist' target
- Remove extraneous @dirrmtry entries
- Bump PORTREVISION due to pkg-plist change

Reported by:		rpaulo

- Replace security/gnutls with security/gnutls3 and update to 3.2.15
- Bump PORTREVISION on all ports that depend on security/gnutls and
  adjust all ports that depend on security/gnutls3
- Update mail/anubis to version 4.2 which supports gnutls 3.x
- Update mail/libvmime to a development snapshot (recommended by upstream
  developers)

PR:		191274
Exp-run by:	antoine
Approved by:	portmgr (antoine)

Fix build without texinfo in base

Update to 6.8.9-3 [1][3].

Use USES=compiler:openmp for the OPENMP option[2]
Ditch the use of perl for patching etc [4] and silence perl threaded check [6]
-delay option spurious message should be fixed [5]

JASPER option was replace by JPEG2000 for JP2k support.
Put 16BIT_PIXEL and HDRI option separate option block. These options change
  the library name, so the user needs to take this into consideration.
Use new LIB_DEPENDS syntax.
Use @sample for config files.
Sprinkle some USES=pkgconfig for some ports, since we don't pull it in
  anymore at run-time.

PR:		185462 [1]

- Fix building on 10.x when CANNA option is enabled, by updating CANNA
  patchset

PR:				190711
Submitted by:	Noboyoshi SATO <nobu-s at iwate-pu.ac.jp>

- Fix CONFLICTS to silence portlint warnings
- Add 'USES=shebangfix' to fix perl path of grep-changelog.[1][2]
- Convert 'USE_XZ' to 'USES=tar.xz'.[1][2]
- Convert to new LIB_DEPENDS format.[1][2]
- Remove deprecated and needless MAN1 setting.[1][2]

PR:		ports/188583[1], ports/188720[2]
Submitted by:	swills[1], Yasuhiro KIMURA <yasu@utahmime.org>[2]

The FreeBSD x11@ and graphics team proudly presents
a zeising, kwm production, with help from dumbbell, bdrewery:

NEW XORG ON FREEBSD 9-STABLE AND 10-STABLE

This update switches over to use the new xorg stack by default on FreeBSD 9
and 10 stable, on osversions where vt(9) is available.
It is still possible to use the old stack by specifying WITHOUT_NEW_XORG in
/etc/make.conf .
FreeBSD 8-STABLE and released versions of FreeBSD still use
the old version.
A package repository with binary packages for new xorg will
be available soon.

This patch also contains updates of libxcb and related ports, pixman, as well

- Update the diff to fix building on Sparc and ARM platforms

Submitted by:	Nicolas Edel <nicolas.edel@gmail.com> (via private email)

- Fix the logic in updating emacs.desktop file, from the regression introduced
  in r338450

PR:		ports/185468
Submitted by:	rakuco

- Update CONFLICTS, in accordance with PKGNAME changes

Reported by:	jgh

- Add PKGNAMESUFFIX
- Add STAGE support
- Use OptionsNG helpers
- Rename X11TOOLKIT option to X11
- Add OPTIONS for emacs-nox11 slave
- Install info manuals to their own directory to avoid conflicts[1][3][4]
- Add a patch from upstream to fix building on non-X11 platforms[2]
- Add a patch from upstream to fix building on 9.x and later platforms
  due to C11 support
- Explicitly depend on GCC for i386 platforms, broken due to clang bug# 18171
- Mark port as MAKE_JOBS_SAFE

PR:		ports/183064[2], ports/181758[3], ports/179843[4]
Reported by:	Jay Borkenhagen <jayb at braeburn.org>[1]

- Remove manual creation and removal of share/applications, as it's now in the
mtree (categories starting with [bce])

Approved by:	portmgr (bdrewery)

Add NO_STAGE all over the place in preparation for the staging support (cat:
editors)

Add an explicit dependency on pkgconf

- Remove MAKE_JOBS_SAFE variable

Approved by:	portmgr (bdrewery)

Convert from USE_MOTIF to USES=motif

Convert USE_NCURSES by USES=ncurses
Convert USE_READLINE by USES=readline

- Fix brokenness on SPARC platforms

Reported by:	tabthorpe
Approved by:	portmgr

- Fix dependency on GTK2 for GTK2 option

PR:		ports/177518
Submitted by:	Roland Smith <rsmith at xs4all.nl>
Approved by:	portmgr

- Move INSTALLS_ICONS to X11 block since it pulls X11 dependencies

PR:		ports/177502
Submitted by:	Neil Darlow  <neil at darlow.co.uk>
Approved by:	portmgr

GNU Emacs updates

editors/emacs:
 - Update to 24.3
 - Update CANNA patchset[1]
 - Unbreak ARM support by using the patch from emacs-devel port
 - Add missing INSTALLS_ICONS[2]
 - Remove a patch which is already integrated upstream
 - Fix Makefile header

editors/emacs-devel:
 - Update to bzr revision 112178
 - Fix Makefile header
 - Add missing INSTALLS_ICONS[2]

- Fix SOUND support[1]
- Make GSETTINGS option depend on DBUS option, as GSettings requires
  DBus to be functional[2]
- Remove ABI versions from LIB_DEPENDS

PR:		ports/176055[1], ports/175990[2]
Submitted by:	Zeus Panchenko <zeus.panchenko at gmail.com>[1],
		Fabian Keil <fk at fabiankeil.de>[2]

- Change the type of PORTREVISION variable assignment, to prevent
  editors/emacs-nox11 port from being inconsistent.

Reported by:	      Steven Levin <steven.levin at moosellc.com>

- Add UPDATING entry for gnutls update
- Chase shlib version bump for dependant ports

- Bump port after MagickCore bump.

- Update to version 24.2

Submitted by:	John Hein <jhein at symmetricom.com> (via private email)

Mark as broken on ARM.

Approved by:	maintainer

GNU Emacs updates

editors/emacs
- Update to v. 24.1[1]
- Update CANNA patch to v. 24.1[2]
- Convert OPTIONS to OptionsNG
- Remove patch to VC to make it work with Subversion 1.7
- Add patch to implement process support for FreeBSD from Emacs bug# 5243
- Add patch to fix segfault on Terminal (from NetBSD emacs port)[2]

editors/emacs23
- Convert OPTIONS to OptionsNG
- Bump PORTREVISION of editors/emacs23 port
- Remove PORTEPOCH, as port needs to be explicitly installed/upgraded
- Connect repocopied editors/emacs23 to build

- fix version numbers going backwards for slave ports

- update png to 1.5.10

- Update to version 23.4
- Remove dependency on libungif[1]
- Import a diff from bzr repository to make VC work with Subversion 1.7[2]

PR:             ports/165298[1], ports/162191[2]
Submitted by:   olgeni[1], Yasuhiro KIMURA <yasu@utahime.org>[2]

- Disable OPTIONS for editors/emacs-nox11 slave port
- Bump PORTREVISION of editors/emacs-nox11

Thanks to dougb, and eadler for showing the way

Reported by:    bz

- Track ncurses dependency

PR:             ports/161497
Submitted by:   Nali Toja <nalitoja@gmail.com>

- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead

PR:             157936
Submitted by:   myself
Exp-runs by:    pav
Approved by:    pav

- Restrict INSTALLS_ICONS knob to GTK2 section as it installs GTK+
  dependencies

Reported by:    Yue Wu <vanopen@gmail.com> (via private email)

- Add fix for GNU Emacs bug report# 8522 which affects users of euc-japan
  keyboard-coding-system[1]
- Fix portlint warnings
- Update PATCH_SITES

Submitted by:   hrs[1]

- Update distfile URL with new distfile which contains missing source files
  for CEDET parsers. More details at:
  http://lists.gnu.org/archive/html/emacs-devel/2011-07/msg01155.html
- Bump PORTREVISION

PR:             ports/160196

- Bump PORTREVISION

PR:             ports/159594, ports/159530
Reported by:    pgolluci

- Apply INSTALLS_ICONS fix to prevent editors/emacs from installing X11
  when WITHOUT_X11 is defined

PR:             ports/159594, ports/159530
Submitted by:   olgeni (via private email)

- Update emacs.desktop to launch Emacs in Terminal when WITHOUT_X11 is
  defined.[1]
- Emacs picks up giflib if available instead of libungif. Account for
  this.[2]
- Include 'alloca' fix.[2]

PR:             ports/156167[1]
Submitted by:   Zhihao Yuan <lichray@gmail.com>[1]
                Herbert J. Skuhra <h.skuhra@gmail.com>[2] (via private email)

- Update to version 23.3
- Update CANNA support[1]
- Fix bug in plist generation

Submitted by:   Yuji TAKANO <takachan@running-dog.net>[1] (via private email)

- Get Rid MD5 support

- Restore GTK2 option.

Approved by:    tabthorpe (mentor)
Reported by:    stas

- Add CANNA support to the port, provided by Yuji TAKANO.
- Update CONFLICTS to conflict with 24.x.
- Include the license file to the port.
- Update descriptions of the OPTIONS.
- Fix building of port on 6.x/9.x with DBUS option enabled, provided
  by swell.k@gmail.com .
- Remove unneeded dependencies on gettext and dbus-glib.
- Remove ALSA checks.
- Clean up pkg-plist.

PR:             ports/146979
Approved by:    tabthorpe (mentor)

- Change my maintainer address.

Approved by:       pgj (mentor)

- Support for SOUND even when X11 support is disabled.
- Disables gettext support with the help of WITHOUT_NLS knob.
- LICENSE.

PR:             147087
Submitted by:   Ashish SHUKLA <wahjava@gmail.com> (maintainer)

Bounce PORTREVISION for gettext-related ports.  Have fun, ya'll.

When dbus is already installed on FreeBSD 6.X and Emacs builds
without X11 support, it may pick dbus up as a dependency and fail
to link with the proper threading libraries.

Approved by:    Ashish SHUKLA <wahjava@gmail.com> (maintainer)

. update to version 23.2;
. introduce OPTIONS.

PR:             ports/146458
Submitted by:   Ashish SHUKLA <wahjava at gmail.com> (maintainer)

Ashish SHUKLA is very active in patching the emacs22, emacs and
emacs-devel ports.  My own time is now limited due to personal
reasons.  Since Ashish has agreed to take over the maintainership
of the ports from me, change MAINTAINER= for the following ports:

    editors/emacs22
    editors/emacs
    editors/emacs-devel

Many thanks to Ashish for taking over...

- Bump PORTREVISION to chase the update of m17n-lib

PR:             ports/146249
Submitted by:   Nikola Lecic <nikola.lecic@anthesphoria.net>

- update patch png14
PR:             145171

- fix build for png-1.4.1
Submitted by:   Andreas Tobler

- fix build for png-1.4.1

- update to 1.4.1
Reviewed by:    exp8 run on pointyhat
Supported by:   miwi

. items in emacs 23.1/GTK menus don't get updated, fix it;  [1]
. bump PORTREVISION.

PR:             ports/144309  [1]
Submitted by:   Robert Jenssen <robertjenssen@ozemail.com.au>  [1]
Approved by:    keramida@ceid.upatras.gr (maintainer timeout, 17 days)

- update to jpeg-8

- fix utmp.h -> utmpx.h
  fixes are included in upstream e-mail so this is temporary

PR:             ports/143113
Submitted by:   Giorgos Keramidas <keramida@freebsd.org> (maintainer)

Assign LATEST_LINK to apropriate directory names for ports:
. editors/emacs;
. editors/emacs-devel;
. editors/emacs-nox11;
. editors/emacs22.

Approved by:    keramida (maintainer via e-mail)

Changes to editors/emacs and Mk/bsd.emacs.mk were taken from
PR/137956 by Ashish SHUKLA (thanks!).  [1]

Those ports which define EMACS_PORT_NAME to be "emacs21" were
not touched (this time). They may be converted to the new
world order by removing the above mentioned assignment.

Four ports were marked as BROKEN with EMACS_PORT_NAME=emacs23
(they do not compile):
. lang/bigloo;
. mail/wanderlust;
. mail/wanderlust-devel;
. www/emacs-w3m.

Three ports were marked as IGNORE with EMACS_PORT_NAME=emacs23:

. backout previous commit (revert editors/emacs to version 22.3)
  since the commit broke dependencies and the ports infrastructure
  was not fully prepared (a new emacs/editors22 port is needed
  for compatibility reasons);
. bump PORTEPOCH.

Reported by:    Jan Henrik Sylvester <me at janh.de>, kostik
Pointy hat to:  bsam (me)

Updat GNU Emacs to v. 23.1.

Emacs 23 has a wide variety of new features, including:

* Improved Unicode support.
* Font rendering with Fontconfig and Xft.
* Support for using X displays and text terminals in one session,
  and for running as a daemon.
* Support for multi-file commits in distributed version-control
   systems (VC-dir).
* New modes and packages for viewing PDF and postscript files
  (Doc-view mode), connecting to processes through D-Bus (dbus),
  connecting to the GNU Privacy Guard (EasyPG), editing XML
  documents (nXML mode), editing Ruby programs (Ruby mode), and more.

Detailed list is available at: http://www.gnu.org/software/emacs/NEWS.23.1

PR:             ports/137956
Submitted by:   Ashish SHUKLA <wahjava at gmail.com>
Approved by:    keramida@ceid.upatras.gr (maintainer tineout, 19 days)

- update to jpeg7
Tested by:      pav on pointyhat

- Do not explicitly set LATEST_LINK to the default value. Slave ports need to
  be able to override this.

. update to version 22.3 (includes a security fix in the way Emacs
  interacts with Python);
. change EMACS_VER at bsd.emacs.mk.

While I'm here: remove old PORTREVISION.

PR:             127168
Submitted by:   keramida (maintainer)

Update CONFIGURE_ARGS for how we pass CONFIGURE_TARGET to configure script.
Specifically, newer autoconf (> 2.13) has different semantic of the
configure target. In short, one should use --build=CONFIGURE_TARGET
instead of CONFIGURE_TARGET directly. Otherwise, you will get a warning
and the old semantic may be removed in later autoconf releases.

To workaround this issue, many ports hack the CONFIGURE_TARGET variable
so that it contains the ``--build='' prefix.

To solve this issue, under the fact that some ports still have
configure script generated by the old autoconf, we use runtime detection
in the do-configure target so that the proper argument can be used.

Changes to Mk/*:
 - Add runtime detection magic in bsd.port.mk

Bump portrevision due to upgrade of devel/gettext.

The affected ports are the ones with gettext as a run-dependency
according to ports/INDEX-7 (5007 of them) and the ones with USE_GETTEXT
in Makefile (29 of them).

PR:             ports/124340
Submitted by:   edwin@
Approved by:    portmgr (pav)

- Update editors/emacs to 22.2.
- Change bsd.emacs.mk accordingly.
- Fix comment about emacs-devel in bsd.emacs.mk.
- Some lisp directories are changed, add a note to UPDATING.

PR:             122783
Submitted by:   KIMURA Yasuhiro <yasu at utahime.org>
Approved by:    keramida (maintainer timeout, 6 weeks)

As pointed out by mjl @ #bsdports: The patch I commited was a patch
on itself. Extracted the patch and recommit it.

PR:             ports/120370

[patch] editors/emacs build on arm

PR:             ports/120370
Submitted by:   Matthew Luckie <mjl@luckie.org.nz>
Approved by:    Giorgos Keramidas <keramida@ceid.upatras.gr>

- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
        Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
        ehaupt, nox, itetcu, flz, pav

PR:             116263
Tested on:      pointyhat
Approved by:    portmgr (pav)

Port the gmalloc.c allocator from the CVS trunk of Emacs.

This includes various enhancements and fixes, including a
serious bug caused by using gmalloc's allocation and free
functions and the system version of posix_memalign().

PR:             ports/114993
Submitted by:   Gardner Bell
Reviewed by:    pav

- Kill packaged info files, they are splitted. We need to generate our own,
  non-splitted, from texinfo.

PR:             ports/115209
Submitted by:   NIIMI Satoshi <sa2c@sa2c.net>
Approved by:    maintainer timeout (keramida; 7 weeks)

- Remove --mandir and --infodir from CONFIGURE_ARGS. They are now default
  in bsd.port.mk.

Tested with:    my tinderbox on i386 6
Approved by:    portmgr

Update to 22.1.
Hand over maintainership to keramida.

- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

Add emacs-22.* to CONFLICTS.

PR:             ports/111814
Submitted by:   NIIMI Satoshi <sa2c@sa2c.net>

Change PATCH_SITES.

SHA256ify (manually updated and checked)

Approved by: krion@

Remove emacs20 from CONFLICTS.

PR:             ports/90475
Submitted by:   NIIMI Satoshi <sa2c@sa2c.net>

- Add .info suffix to filename of info files.
- Use INFO macro.

Requested by:   edwin

Mass-conversion to the USE_AUTOTOOLS New World Order.  The code present
in bsd.autotools.mk essentially makes this a no-op given that all the
old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in
exactly the same way as USE_AUTOTOOLS itself.

Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME
team -- all GNOME 2.12.x ports use it.

Preliminary documentation can be found at:
        http://people.FreeBSD.org/~ade/autotools.txt

which is in the process of being SGMLized before introduction into the
Porters Handbook.

Light blue touch-paper.  Run.

Fix build error.

PR:             ports/85508
Submitted by:   NIIMI Satoshi <sa2c@sa2c.net>

Add powerpc support.

PR:             ports/83074
Submitted by:   Dario Freni <saturnero@freesbie.org>

Disable optimization on ia64 to avoid elisp processing errors.

Submitted by:   yoichi

Bump PORTREVISION to reflect changes in rev. 1.59 in package building.

Pointed out by: yoichi

Add CONFLICTS variable, since this port conflicts with other
emacs/xemacs ports.

Approved by:    nobutaka (maintainer)