The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.
Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example
xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have

- Convert ports from korean/, shells/, x11/, x11-clocks/, x11-fm/,
  x11-fonts/, x11-toolkits and x11-wm to new USES=python

Approved by:	portmgr (implicit)

Add missing library libgmodule-2.0

Reported by:	antoine

Remove two libtool fixes from Mk/Uses/libtool.mk.  They don't always work
when an older version of a package is installed.  This is the case when an
executable links with installed libraries and with uninstalled libraries
that link with other uninstalled libraries.  For each of the directly
linked libraries the executable will have an rpath (/usr/local/lib for the
installed libraries and a path under WRKDIR for each of the uninstalled
libraries), but not for the indirect libraries.  Both ld(1) and rtld(1)
search the rpath of the executable first before any rpath of libraries, so
the indirectly linked libraries will be found in /usr/local/lib if they are
installed instead of in WRKDIR.

With this commit executables will overlink with uninstalled indirect
libraries again so their location is added to the rpath of the executable.

This partially reverts r358784.

PR:		191611
Approved by:	portmgr (bapt)

Bump more ports that depend on libsqlite3.so:
- ports that set USE_SQLITE with the *_USE option helper
- ports that depend on libsqlite3 indirectly as reported by pkg rquery

Approved by:	portmgr (implicit)

Add 4 new sed commands to USES=libtool.  The first two apply some of the
changes that Debian made to their libtool.  The first command applies to
libtool versions 1.4 and up.  The second command is somewhat more elaborate
but essentially it uses the sed hold space to move an "elif...fi" block
down.  It applies to 2.x.  Together these reduce overlinking to unpatched
.la files (from ports that don't have USES=libtool yet but also .la files
in the work directory).

The third and fourth command fix relinking.  During staging libtool may
relink libA when it links to another library in the work directory libB.
The reason is that libA created during build phase has its runpath set to
the location of libB in the work directory.  This allows running an
executable that links to libA from within the work directory.  The relink
removes this extra runpath.

When linking a library libA with a library libB using libtool, if libB.la
exists, libtool will add all libraries libB.la refers to (dependency_libs
field) to the linker command line and store them in the dependency_libs
field of libA.la.  So everything that subsequently links with libA will also
link to these extra libraries.  This causes too much overlinking.

This commit modifies Mk/Uses/libtool.mk so it empties the dependency_libs
field in .la libraries during staging.  However, because .la libraries have
very limited use when dependency_libs is empty it makes sense to completely
remove them during staging.

So with this commit USES=libtool is modified to remove .la libraries and a
new form (USES=libtool:keepla) is introduced in case they need to be kept
(dependency_libs is still emptied).

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

Support stage
modernize

Python cleanup:
- USE_PYTHON* = 2.X -> USE_PYTHON* = 2
- USE_PYTHON* = 2.X+ -> USE_PYTHON* = yes
Reviewed by:	python (mva, rm)
Approved by:	portmgr-lurkers (mat)

Restrict python to -2.7

Submitted by:	mva@

- Remove manual creation and removal of share/applications, as it's now in the
mtree (remaining categories)
- Add note on mtree change to CHANGES

Approved by:	portmgr (bdrewery)

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

Add an explicit dependency on pkgconf

- Convert USE_GETTEXT to USES (part 4)

Approved by:	portmgr (bapt)

No longer conflict with mate-panel, bump the PORTREVISION.

Convert almost all gnome@ ports to OptionsNG, trim header, use USES=pathfix
instead of gnomehack and pet portlint.
Add conflicts with future gnome3 versions.

Reviewed by:	miwi, bapt

- update png to 1.5.10

- 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

- Remove --enable-polkit configure option, that doesn't exists anymore
- Move CPPFLAGS out of CONFIGURE_ENV
- Do a better way of patch for Python.

PR:             ports/157126
Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>

Sync to new bsd.autotools.mk

Correct a typo when running gio-querymodules.

PR:             152606
Submitted by:   olgeni

Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.32/

This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.

This release features commits by avl, marcus, mezz and myself.

The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:

Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX

Bump PORTREVISION in a few more ports affected by the libgcrypt
upgrade (they have references to libgcrypt.so.16).

Presenting GNOME 2.30.2. for FreeBSD.

Chase libical update.

Submitted by:   olgeni@

Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.30/ .

This release brings initial PackageKit support, Upower (replaces power
management part of hal), cuse4bsd integration with HAL and cheese, and a
faster Evolution.

Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This
will also be the last of the 2.x releases. The next release will be the
highly-anticipated GNOME 3.0 which will bring with it a new UI experience.

Currently, there are a few bugs with GNOME 2.30 that may be of note for our
users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at
http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading
instructions, and the up-to-date list of known issues.

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

- update to jpeg-8

- Add support to python2.6 in configure script

Approved by:    kwm (for gnome@)

Allow a BATCH build of gnome-panel to be done without Evo support.

PR:             141699
Submitted by:   Jonathan Chen <jonc@chen.org.nz>

Presenting GNOME 2.28.1 for FreeBSD.  The official release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.

It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.

With help:      marcus and kwm
Pointyhat-exp:  a few times by pav
Tested by:      pgollucci, "Romain Tartière" <romain@blogreen.org>, and
                a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by:    marcus
Approved by:    portmgr

- bump all port that indirectly depends on libjpeg and have not yet been bumped
or updated
Requested by:   edwin

Update to 2.26.3.

Reviewed by:    mezz (GNOME team)
Approved by:    glarkin (mentor)

Update to 2.26.2.

Presenting GNOME 2.26.1 for FreeBSD.

Approved by:    portmgr (marcus)

Presenting GNOME 2.26 for FreeBSD.  See
http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

Update to 2.24.3.

Presenting GNOME 2.24 for FreeBSD.

See http://library.gnome.org/misc/release-notes/2.24/ for the general
release notes.  On the FreeBSD front, this release introduces Fuse support
in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some
long-standing seahorse and gnome-keyring bugs.  The documentation updates
to the website are forthcoming.

This release features commits by adamw, ahze, kwm, mezz, and myself.  It would
not have been possible without are contributors and testers:

Alexander Loginov
Craig Butler [1]
Dmitry Marakasov [6]
Eric L. Chen

- Remove conditional checks for FreeBSD 5.x and older

Approved by:    pav

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 to 2.22.2.

Update to 2.22.1.3.

Update to 2.22.1.3.

- 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)

Update to 2.22.1.1

Update to 2.22.1.

Fix the crash by clock-applet when add to the panel. Bump the PORTREVISION.

PR:             ports/122455
Submitted by:   fukui <fukui.FreeBSD@fanet.net>
Obtained from:  Its SVN

Fix fetch of x11/gnome-panel-reference

Reported by:    pointyhat

The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for
FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

Update to 2.20.3.

Update to 2.20.2.

Presenting GNOME 2.20.1 and all related works for FreeBSD.  The official
GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for

Retire obsolete PARALLEL_PACKAGE_BUILD in favour of PACKAGE_BUILDING.

-Update to 2.18.3.
-Get rid of X11BASE.

Update to 2.18.2.

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

Update to 2.18.1

Presenting GNOME 2.18 for FreeBSD.  GNOME 2.18 is a departure from recent GNOME
releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

Update to 2.16.3.

Update to 2.16.2

I don't want evolution-data-server to be loaded whenever I click on
the clock applet. Add an option for disabling the eds code even if
Evolution is installed.

Presenting GNOME 2.16.1 for FreeBSD.  This release represents a massive
amount of work by the FreeBSD GNOME Team and our testers.

On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE.  This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed.  The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily.  We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.

Back to GNOME 2.16.  This release brings a huge amount of new functionality
to FreeBSD.  The standard release notes can be read at
http://www.gnome.org/start/2.16/ .  But on top of what you will read there,

- Update to 2.14.3

- Add header in these *-reference ports.
- Fix a few of pkg-descr by chase the rename.
- Move all PORTREVISION and PORTEPOCH to top with ?=.
- Put USE_X_PREFIX back in, but under REFERENCE_PORT, and remove PREFIX? and
  USE_XLIB. This fix ports to use the correct mtree when you change the prefix,
  for example:

        Incorrect: (Without USE_X_PREFIX)
        ================================
        # cd /usr/ports/x11-toolkits/gtk20
        # make -V MTREE_FILE
        /etc/mtree/BSD.x11-4.dist
        # make PREFIX=/tmp/foo -V MTREE_FILE
        /etc/mtree/BSD.local.dist <-- Here...
        ================================

Update to 2.14.2.

x11/gnomepanel -> x11/gnome-panel
x11/gnomepanel-reference -> x11/gnome-panel-reference

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

PR:             ports/97985
Repocopy by:    marcus