* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which

  are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
  in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
  eliminate pkg-config run dependency completely, a second phase is needed
  and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
  Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
  versions for some ports.
* Fix other ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo

2 files changed, 15 insertions, 18 deletions

diff --git a/news/pan/Makefile b/news/pan/Makefile
index 1795f7669274..9edd9728561e 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	pan2
-# Date created:				19 August 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/news/pan/Makefile,v 1.7 2008/01/19 22:45:42 mezz Exp $
-#
 
 PORTNAME=	pan
-PORTVERSION=	0.135
-PORTREVISION=	3
+PORTVERSION=	0.139
 CATEGORIES=	news gnome
 MASTER_SITES=	http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/
 DIST_SUBDIR=	gnome2
@@ -18,8 +13,8 @@ COMMENT=	Threaded GTK+ newsreader based on Agent for Windows
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
-		gmime-2.4.6:${PORTSDIR}/mail/gmime24
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
+		gmime-2.4:${PORTSDIR}/mail/gmime24
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -29,12 +24,14 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex
 
-OPTIONS=	GTKSPELL "Enable spell checking support (gtk+2 only)" on \
-		GTK3 "Build with gtk+3 based UI instead of gtk+2" off
+OPTIONS_DEFINE=	GTKSPELL GTK3
+OPTIONS_DEFAULT=GTKSPELL
+GTKSPELL_DESC=	Spell checking support (gtk+2 only)
+GTK3_DESC=	Use gtk+3 based UI instead of gtk+2
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GTK3)
+.if ${PORT_OPTIONS:MGTK3}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=--without-gtk3
 .else
@@ -42,10 +39,10 @@ USE_GNOME+=	gtk30
 CONFIGURE_ARGS+=--with-gtk3
 .endif
 
-.if defined(WITHOUT_GTKSPELL) || defined(WITH_GTK3)
+.if !${PORT_OPTIONS:MGTKSPELL} || ${PORT_OPTIONS:MGTK3}
 CONFIGURE_ARGS+=	--without-gtkspell
 .else
-LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
+LIB_DEPENDS+=		gtkspell:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=	--with-gtkspell
 .endif
 
@@ -53,4 +50,4 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in"| ${XARGS} ${REINPLACE_CMD} -e \
 		's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/news/pan/distinfo b/news/pan/distinfo
index d4142348d2d4..a754784bc14d 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/pan-0.135.tar.bz2) = ba73fb8b1f867f9d18ec5ecf19d60e902041b4fcb1584d49a320037de93bc929
-SIZE (gnome2/pan-0.135.tar.bz2) = 1404420
+SHA256 (gnome2/pan-0.139.tar.bz2) = bf5f320f997f582d7ac823e3e854393307161a92e7014d2135e6e2674d144bb9
+SIZE (gnome2/pan-0.139.tar.bz2) = 1523907