svn commit: r362645 - in head: . audio/ario audio/pianobar benchmarks/postal databases/freetds databases/freetds-devel deskutils/fusenshi deskutils/taskd deskutils/taskwarrior devel/gsoap devel/gwe...

Tijl Coosemans tijl at FreeBSD.org
Wed Jul 23 09:54:14 UTC 2014 

Author: tijl
Date: Wed Jul 23 09:54:02 2014
New Revision: 362645
URL: http://svnweb.freebsd.org/changeset/ports/362645
QAT: https://qat.redports.org/buildarchive/r362645/

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

Added:
  head/mail/libvmime/files/patch-cmake__FindIconv.cmake   (contents, props changed)
  head/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp   (contents, props changed)
  head/net-im/jabber/files/patch-jabberd-jabberd.h   (contents, props changed)
  head/security/gnomint/files/patch-src__import.c   (contents, props changed)
  head/security/openvas-libraries/files/patch-libopenvas-network.c   (contents, props changed)
  head/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c   (contents, props changed)
  head/sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c   (contents, props changed)
  head/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c   (contents, props changed)
Deleted:
  head/editors/emacs-devel/files/patch-src_Makefile.in
  head/mail/anubis/files/patch-config.h.in
  head/mail/libvmime/files/patch-configure
  head/mail/libvmime/files/patch-src__mailboxField.cpp
  head/mail/libvmime/files/patch-vmime__base.hpp
  head/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp
  head/security/gnutls/files/
  head/security/gnutls3/
Modified:
  head/MOVED
  head/audio/ario/Makefile
  head/audio/pianobar/Makefile
  head/benchmarks/postal/Makefile
  head/databases/freetds-devel/Makefile
  head/databases/freetds/Makefile
  head/deskutils/fusenshi/Makefile
  head/deskutils/taskd/Makefile
  head/deskutils/taskwarrior/Makefile
  head/devel/gsoap/Makefile
  head/devel/gwenhywfar-fox16/Makefile
  head/devel/gwenhywfar-gtk2/Makefile
  head/devel/gwenhywfar-qt4/Makefile
  head/devel/gwenhywfar/Makefile
  head/devel/librelp/Makefile
  head/devel/libvirt/Makefile
  head/editors/emacs-devel/Makefile
  head/editors/emacs-nox11/Makefile
  head/editors/emacs/Makefile
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu/Makefile
  head/emulators/wine-devel/Makefile
  head/emulators/wine/Makefile
  head/ftp/curl/Makefile
  head/ftp/filezilla/Makefile
  head/ftp/lftp/Makefile
  head/ftp/wget/Makefile
  head/ftp/wput/Makefile
  head/games/libggz/Makefile
  head/games/macopix/Makefile
  head/irc/bitlbee/Makefile
  head/irc/ctrlproxy/Makefile
  head/irc/ctrlproxy/files/patch-src_gnutls.c   (contents, props changed)
  head/irc/minbif/Makefile
  head/irc/ngircd/Makefile
  head/irc/scrollz/Makefile
  head/irc/weechat-devel/Makefile
  head/irc/weechat/Makefile
  head/japanese/jd/Makefile
  head/lang/gnustep-base/Makefile
  head/mail/anubis/Makefile
  head/mail/anubis/distinfo
  head/mail/anubis/files/patch-configure.ac
  head/mail/anubis/files/patch-src__headers.h
  head/mail/anubis/pkg-plist
  head/mail/claws-mail/Makefile
  head/mail/courier-imap/Makefile
  head/mail/exim/Makefile
  head/mail/libetpan/Makefile
  head/mail/libvmime/Makefile
  head/mail/libvmime/distinfo
  head/mail/libvmime/pkg-plist
  head/mail/mpop/Makefile
  head/mail/msmtp/Makefile
  head/mail/nullmailer/Makefile
  head/mail/opendkim/Makefile
  head/mail/wmbiff/Makefile
  head/mail/xfce4-mailwatch-plugin/Makefile
  head/multimedia/ffmpeg/Makefile
  head/multimedia/libav/Makefile
  head/multimedia/vlc/Makefile
  head/net-im/finch/Makefile
  head/net-im/gloox/Makefile
  head/net-im/jabber.el/Makefile
  head/net-im/jabber/Makefile
  head/net-im/jabber/files/patch-configure
  head/net-im/jabber/files/patch-jabberd-mio_tls.cc
  head/net-im/libpurple/Makefile
  head/net-im/loudmouth/Makefile
  head/net-p2p/gtk-gnutella/Makefile
  head/net-p2p/ncdc/Makefile
  head/net/csync2/Makefile
  head/net/glib-networking/Makefile
  head/net/gtk-vnc/Makefile
  head/net/libgnetwork/Makefile
  head/net/libvncserver/Makefile
  head/net/morebalance/Makefile
  head/net/net6/Makefile
  head/net/remmina-plugins/Makefile
  head/net/samba4/Makefile
  head/net/samba41/Makefile
  head/net/sixxs-aiccu/Makefile
  head/net/spserver/Makefile
  head/net/tigervnc/Makefile
  head/net/vino/Makefile
  head/net/wireshark/Makefile
  head/news/nzbget/Makefile
  head/print/cups-base/Makefile
  head/security/Makefile
  head/security/gnomint/Makefile
  head/security/gnutls/Makefile
  head/security/gnutls/distinfo
  head/security/gnutls/pkg-descr
  head/security/gnutls/pkg-plist
  head/security/gsasl/Makefile
  head/security/libprelude/Makefile
  head/security/libpreludedb/Makefile
  head/security/openconnect/Makefile
  head/security/openvas-libnasl/Makefile
  head/security/openvas-libraries/Makefile
  head/security/openvas-plugins/Makefile
  head/security/prelude-lml/Makefile
  head/security/prelude-manager/Makefile
  head/security/py-gnutls/Makefile
  head/security/shishi/Makefile
  head/security/xmlsec1/Makefile
  head/sysutils/gkrellm2/Makefile
  head/sysutils/heartbeat/Makefile
  head/sysutils/rsyslog7-devel/Makefile
  head/sysutils/rsyslog7/Makefile
  head/sysutils/rsyslog8-devel/Makefile
  head/sysutils/rsyslog8/Makefile
  head/textproc/iksemel/Makefile
  head/www/aws/Makefile
  head/www/gurlchecker/Makefile
  head/www/hydra/Makefile
  head/www/libmicrohttpd/Makefile
  head/www/mod_gnutls/Makefile
  head/www/retawq/Makefile
  head/www/tntnet/Makefile
  head/www/wwwoffle/Makefile
  head/www/xombrero/Makefile
  head/x11-toolkits/nucleo/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/MOVED	Wed Jul 23 09:54:02 2014	(r362645)
@@ -6267,3 +6267,4 @@ misc/bigboard||2014-07-21|Has expired: g
 net/desktop-data-model||2014-07-21|Has expired: gnome-desktop 2.x will be updated in the GNOME 3 import
 net/online-desktop||2014-07-21|Has expired: Disappeared upstream, depends on expired ports
 x11-toolkits/libgail-gnome||2014-07-21|Has expired: gnome-panel 2.x will be updated in the GNOME 3 import
+security/gnutls3|security/gnutls|2014-07-22|Moved to replace GnuTLS 2.x port

Modified: head/audio/ario/Makefile
==============================================================================
--- head/audio/ario/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/audio/ario/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ario
 PORTVERSION=	1.5.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 

Modified: head/audio/pianobar/Makefile
==============================================================================
--- head/audio/pianobar/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/audio/pianobar/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pianobar
 PORTVERSION=	2013.09.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://6xq.net/projects/${PORTNAME}/
 

Modified: head/benchmarks/postal/Makefile
==============================================================================
--- head/benchmarks/postal/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/benchmarks/postal/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	postal
 PORTVERSION=	0.73
+PORTREVISION=	1
 CATEGORIES=	benchmarks mail
 MASTER_SITES=	http://www.coker.com.au/postal/
 EXTRACT_SUFX=	.tgz

Modified: head/databases/freetds-devel/Makefile
==============================================================================
--- head/databases/freetds-devel/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/databases/freetds-devel/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freetds
 PORTVERSION=	0.92.79
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/

Modified: head/databases/freetds/Makefile
==============================================================================
--- head/databases/freetds/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/databases/freetds/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freetds
 PORTVERSION=	0.64
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}

Modified: head/deskutils/fusenshi/Makefile
==============================================================================
--- head/deskutils/fusenshi/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/deskutils/fusenshi/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fusenshi
 PORTVERSION=	0.9.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.ongs.co.jp/projects/fusenshi/
 EXTRACT_SUFX=	.tgz

Modified: head/deskutils/taskd/Makefile
==============================================================================
--- head/deskutils/taskd/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/deskutils/taskd/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	taskd
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 

Modified: head/deskutils/taskwarrior/Makefile
==============================================================================
--- head/deskutils/taskwarrior/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/deskutils/taskwarrior/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	taskwarrior
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 DISTNAME=	task-${PORTVERSION}

Modified: head/devel/gsoap/Makefile
==============================================================================
--- head/devel/gsoap/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/devel/gsoap/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsoap
 PORTVERSION=	2.8.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP
 DISTNAME=	${PORTNAME}_${PORTVERSION}

Modified: head/devel/gwenhywfar-fox16/Makefile
==============================================================================
--- head/devel/gwenhywfar-fox16/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/devel/gwenhywfar-fox16/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	4
+PORTREVISION=	5
 PKGNAMESUFFIX=	-${SLAVEPORT}
 
 MAINTAINER=	jhale at FreeBSD.org

Modified: head/devel/gwenhywfar-gtk2/Makefile
==============================================================================
--- head/devel/gwenhywfar-gtk2/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/devel/gwenhywfar-gtk2/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-${SLAVEPORT}
 
 MAINTAINER=	jhale at FreeBSD.org

Modified: head/devel/gwenhywfar-qt4/Makefile
==============================================================================
--- head/devel/gwenhywfar-qt4/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/devel/gwenhywfar-qt4/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-${SLAVEPORT}
 
 MAINTAINER=	jhale at FreeBSD.org

Modified: head/devel/gwenhywfar/Makefile
==============================================================================
--- head/devel/gwenhywfar/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/devel/gwenhywfar/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gwenhywfar
 PORTVERSION=	4.3.3
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	devel net security
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
 

Modified: head/devel/librelp/Makefile
==============================================================================
--- head/devel/librelp/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/devel/librelp/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	librelp
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.rsyslog.com/librelp/
 

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/devel/libvirt/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/editors/emacs-devel/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -55,7 +55,7 @@ INFO=		ada-mode auth autotype bovine cal
 OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
 		XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY
 
-OPTIONS_SINGLE=	X11 SOUND GNUTLS
+OPTIONS_SINGLE=	X11 SOUND
 
 ACL_DESC=		ACL support
 GSETTINGS_DESC=		GSettings support
@@ -69,15 +69,12 @@ M17N_DESC=		M17N support for text-shapin
 OTF_DESC=		Opentype fonts suport
 FILENOTIFY_DESC=	File notification support
 LTO_DESC=		Enable link-time optimization (requires GCC 4.6+)
-GNUTLS2_DESC=		GnuTLS 2.x
-GNUTLS3_DESC=		GnuTLS 3.x
 
 OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
 OPTIONS_SINGLE_SOUND=		ALSA OSS
-OPTIONS_SINGLE_GNUTLS=		GNUTLS2 GNUTLS3
 
 OPTIONS_DEFAULT=ACL DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF \
-		SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11 GNUTLS3
+		SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11
 
 OPTIONS_SUB=		SOURCES
 
@@ -88,11 +85,9 @@ OSS_CONFIGURE_ON=		--with-sound=oss
 DBUS_LIB_DEPENDS=		libdbus-1.so:${PORTSDIR}/devel/dbus
 DBUS_CONFIGURE_WITH=		dbus
 
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
-GNUTLS3_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls3
-GNUTLS2_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
-
 XML_USE=		GNOME=libxml2
 XML_CONFIGURE_WITH=	xml2
 
@@ -216,25 +211,15 @@ LDFLAGS+=	-ltinfo
 BROKEN=	Emacs 24.X does not currently build on ia64
 .endif
 
-.if ${PORT_OPTIONS:MGNUTLS3}
-GNUTLS3_RPATH=	-Wl,-rpath,${LOCALBASE}/lib/gnutls3
-.else
-GNUTLS3_RPATH=
-.endif
-
 post-patch:
 	@${RM} -f ${WRKSRC}/info/*
 	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
 .if empty(PORT_OPTIONS:MX11)
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 .endif
-.if ${PORT_OPTIONS:MGNUTLS3}
-	@${REINPLACE_CMD} -e '/HAVE_GNUTLS3=yes/s/gnutls >=/gnutls3 >=/' ${WRKSRC}/configure.ac
-.endif
 
 post-configure:
 	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
-			  -e 's|%%GNUTLS3_RPATH%%|${GNUTLS3_RPATH}|g' \
 			  ${WRKSRC}/src/Makefile
 
 add-plist-data:

Modified: head/editors/emacs-nox11/Makefile
==============================================================================
--- head/editors/emacs-nox11/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/editors/emacs-nox11/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-nox11
 
-PORTREVISION=	10
+PORTREVISION=	11
 
 OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
 		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/editors/emacs/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION?=	5
+PORTREVISION?=	6
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/emulators/qemu-devel/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.0.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot

Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/emulators/qemu/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.11.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://bellard.org/qemu/

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/emulators/wine-devel/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.7.22
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \

Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/emulators/wine/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/ftp/curl/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.37.1
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet

Modified: head/ftp/filezilla/Makefile
==============================================================================
--- head/ftp/filezilla/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/ftp/filezilla/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	filezilla
 PORTVERSION=	3.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
 DISTNAME=	FileZilla_${PORTVERSION}_src

Modified: head/ftp/lftp/Makefile
==============================================================================
--- head/ftp/lftp/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/ftp/lftp/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	lftp
 PORTVERSION=	4.5.3
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://lftp.yar.ru/ftp/ \
 		http://lftp.yar.ru/ftp/old/ \

Modified: head/ftp/wget/Makefile
==============================================================================
--- head/ftp/wget/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/ftp/wget/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wget
 DISTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget

Modified: head/ftp/wput/Makefile
==============================================================================
--- head/ftp/wput/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/ftp/wput/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wput
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 

Modified: head/games/libggz/Makefile
==============================================================================
--- head/games/libggz/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/games/libggz/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libggz
 PORTVERSION=	${GGZ_VERSION}
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	games
 
 MAINTAINER=	ports at FreeBSD.org

Modified: head/games/macopix/Makefile
==============================================================================
--- head/games/macopix/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/games/macopix/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	macopix
 PORTVERSION=	1.7.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}

Modified: head/irc/bitlbee/Makefile
==============================================================================
--- head/irc/bitlbee/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/bitlbee/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -2,6 +2,7 @@
 
 PORTNAME=	bitlbee
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		${MASTER_SITE_LOCAL}

Modified: head/irc/ctrlproxy/Makefile
==============================================================================
--- head/irc/ctrlproxy/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/ctrlproxy/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ctrlproxy
 PORTVERSION=	3.0.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	irc
 MASTER_SITES=	http://launchpadlibrarian.net/50016234/ \
 		LOCAL/ashish/

Modified: head/irc/ctrlproxy/files/patch-src_gnutls.c
==============================================================================
--- head/irc/ctrlproxy/files/patch-src_gnutls.c	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/ctrlproxy/files/patch-src_gnutls.c	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- src/gnutls.c.orig
 +++ src/gnutls.c
 @@ -18,7 +18,6 @@
@@ -11,6 +8,21 @@ $FreeBSD$
  #include <gnutls/gnutls.h>
  #include <gnutls/x509.h>
  
+@@ -47,11 +46,11 @@
+ static gboolean
+ verify_certificate (gnutls_session session, const char *hostname, GError **err)
+ {
+-	int status;
++	int res, status;
+ 
+-	status = gnutls_certificate_verify_peers (session);
++	res = gnutls_certificate_verify_peers2 (session, &status);
+ 
+-	if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
++	if (res < 0 || status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
+ 		g_set_error (err, SSL_ERROR,
+ 			     SSL_ERROR_CERTIFICATE,
+ 			     "No SSL certificate was sent.");
 @@ -452,9 +451,6 @@
  static void
  _gnutls_init (void)

Modified: head/irc/minbif/Makefile
==============================================================================
--- head/irc/minbif/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/minbif/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	minbif
 PORTVERSION=	1.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc net-im
 MASTER_SITES=	https://symlink.me/attachments/download/148/
 

Modified: head/irc/ngircd/Makefile
==============================================================================
--- head/irc/ngircd/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/ngircd/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ngircd
 PORTVERSION=	21.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://arthur.barton.de/pub/%SUBDIR%/ \

Modified: head/irc/scrollz/Makefile
==============================================================================
--- head/irc/scrollz/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/scrollz/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
  
 PORTNAME=	scrollz
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://www.netraam.net/scrollz/download/ \
 		http://www.scrollz.org/download/

Modified: head/irc/weechat-devel/Makefile
==============================================================================
--- head/irc/weechat-devel/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/weechat-devel/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -2,7 +2,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	20140213
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/weechat-devel/ \
 		${MASTER_SITE_LOCAL}

Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/irc/weechat/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	0.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/ \
 		http://perturb.me.uk/distfiles/weechat/:mandocs \

Modified: head/japanese/jd/Makefile
==============================================================================
--- head/japanese/jd/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/japanese/jd/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	jd
 PORTVERSION=	2.8.8
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	SFJP
 MASTER_SITE_SUBDIR=	jd4linux/61281

Modified: head/lang/gnustep-base/Makefile
==============================================================================
--- head/lang/gnustep-base/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/lang/gnustep-base/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnustep-base
 PORTVERSION=	1.24.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core

Modified: head/mail/anubis/Makefile
==============================================================================
--- head/mail/anubis/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/anubis/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	anubis
-PORTVERSION=	4.1.1
-PORTREVISION=	10
+PORTVERSION=	4.2
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	jhale at FreeBSD.org
 COMMENT=	Outgoing SMTP mail processor
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	NLS EXAMPLES GUILE GPGME GNUTLS GSASL \
 		GDBM MYSQL PGSQL PCRE PAM SOCKS LIBWRAP
@@ -23,11 +22,12 @@ GSASL_DESC=	GSASL support (required for 
 GDBM_DESC=	GDBM backend
 SOCKS_DESC=	SOCKS proxy support
 
-USES=		makeinfo pkgconfig shebangfix
+USES=		charsetfix makeinfo pkgconfig shebangfix
+CHARSETFIX_MAKEFILEIN=	gnulib.mk
 SHEBANG_FILES=	contrib/msg2smtp.pl
 USE_RC_SUBR=	anubis
 USE_AUTOTOOLS=	aclocal autoheader autoconf automake
-ACLOCAL_ARGS=	-I m4 -I am
+ACLOCAL_ARGS=	-I m4 -I gint -I am
 AUTOMAKE_ARGS=	--force --add-missing
 
 INFO=		anubis

Modified: head/mail/anubis/distinfo
==============================================================================
--- head/mail/anubis/distinfo	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/anubis/distinfo	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,2 +1,2 @@
-SHA256 (anubis-4.1.1.tar.gz) = 93ef7a2d8bc3b50cd2e228cfe27e296ee14accadf8533bad9b2beee88a96e8fa
-SIZE (anubis-4.1.1.tar.gz) = 1104272
+SHA256 (anubis-4.2.tar.gz) = 5f3a2dd77c5ef52a593428c5b6d0042c1746eb8262c31bde9ee67455f8aad6d6
+SIZE (anubis-4.2.tar.gz) = 1623768

Modified: head/mail/anubis/files/patch-configure.ac
==============================================================================
--- head/mail/anubis/files/patch-configure.ac	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/anubis/files/patch-configure.ac	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,27 +1,14 @@
 --- ./configure.ac.orig	2008-12-16 11:21:54.000000000 -0500
 +++ ./configure.ac	2011-02-09 20:52:34.000000000 -0500
-@@ -77,7 +77,6 @@
+@@ -78,7 +78,6 @@
  ])
  
  AC_CHECK_LIB(socket, socket)
 -AC_CHECK_LIB(nsl, gethostbyaddr)
  
- AC_SUBST(INCLUDES)
+ AC_SUBST(ADD_INCLUDES)
  case $build in
-@@ -143,10 +142,10 @@
- else
-  AC_PATH_PROG(GPG, gpg)
-  findgpgmedir() { :
--  if test -f "$1/include/gpgme.h"; then
-+  if test -f "$1/include/gpgme/gpgme.h"; then
-    gpgmedir=1
-    INCLUDES="$INCLUDES -I$1/include"
--   AC_MSG_CHECKING(for $1/include/gpgme.h)
-+   AC_MSG_CHECKING(for $1/include/gpgme/gpgme.h)
-    AC_MSG_RESULT([yes])
-    return 0
-   fi
-@@ -158,7 +157,7 @@
+@@ -137,7 +136,7 @@
   if test $gpgmedir; then
    AC_DEFINE(HAVE_GPGME_H, 1, [Define to 1 if HAVE_GPGME_H is requested.])
   else
@@ -30,15 +17,7 @@
   fi
   ANUBIS_GPGFILES='$(GPGFILES)'
   M4_DEFS="$M4_DEFS -DWITH_GPG"
-@@ -189,6 +188,7 @@
- WITH_MYSQL=no
- WITH_POSTGRES=no
- WITH_GDBM=no
-+WITH_GSASL=no
- 
- dnl Use option --with-gsasl to compile GSASL library support.
- MU_CHECK_GSASL(0.2.3, [
-@@ -199,11 +199,21 @@
+@@ -179,11 +178,21 @@
      ANUBIS_BIN_ADM='$(adm_bin_programs)'
      M4_DEFS="$M4_DEFS -DWITH_GSASL"
  
@@ -61,17 +40,7 @@
  
      AC_ARG_WITH(mysql,
  	AC_HELP_STRING([--with-mysql],
-@@ -277,7 +287,8 @@
- if test $with_gnutls = yes; then
-   AC_CHECK_HEADERS(gnutls/gnutls.h)
-   if test $ac_cv_header_gnutls_gnutls_h != no; then
--    AM_PATH_LIBGNUTLS("1.0.0",
-+    PKG_CHECK_MODULES([LIBGNUTLS],
-+                      [gnutls >= 1.0.0],
-                       [M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
-                       AC_DEFINE(USE_GNUTLS, 1,
-                                 [Define to 1 if USE_GNUTLS is requested.])],
-@@ -327,8 +338,8 @@
+@@ -285,8 +294,8 @@
  	[with_pam=no])
  if test "$with_pam" = "yes"; then
   AC_CHECK_LIB(pam, main,, with_pam=no)
@@ -82,7 +51,7 @@
  fi
  if test "$with_pam" = "yes"; then
   AC_MSG_RESULT([Enabling PAM support...])
-@@ -342,7 +353,6 @@
+@@ -300,7 +309,6 @@
  	[with_tcp_wrappers=no])
  if test "$with_tcp_wrappers" = "yes"; then
   AC_CHECK_LIB(wrap, main,, with_tcp_wrappers=no)

Modified: head/mail/anubis/files/patch-src__headers.h
==============================================================================
--- head/mail/anubis/files/patch-src__headers.h	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/anubis/files/patch-src__headers.h	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,9 +1,9 @@
 --- ./src/headers.h.orig	2008-12-16 11:21:54.000000000 -0500
 +++ ./src/headers.h	2011-02-09 20:52:34.000000000 -0500
-@@ -51,11 +51,11 @@
- # else
- #  error POSIX Regular Expressions are required!
- # endif	/* HAVE_REGEX_H and HAVE_REGCOMP */
+@@ -43,11 +43,11 @@
+ #   define HAVE_PCRE
+ #  endif /* HAVE_PCRE_H or HAVE_PCRE_PCRE_H */
+ # endif	/* HAVE_LIBPCRE */
 -# if defined(HAVE_LIBPAM) && defined(HAVE_LIBPAM_MISC)
 -#  if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_PAM_MISC_H)
 +# if defined(HAVE_LIBPAM)
@@ -16,7 +16,7 @@
  # if defined(HAVE_LIBWRAP) && defined(HAVE_TCPD_H)
  #  define USE_LIBWRAP
  # endif	/* HAVE_LIBWRAP and HAVE_TCPD_H */
-@@ -121,7 +121,7 @@
+@@ -111,7 +111,7 @@
  
  #ifdef HAVE_PAM
  # include <security/pam_appl.h>

Modified: head/mail/anubis/pkg-plist
==============================================================================
--- head/mail/anubis/pkg-plist	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/anubis/pkg-plist	Wed Jul 23 09:54:02 2014	(r362645)
@@ -9,7 +9,10 @@ man/man1/anubis.1.gz
 %%GUILE%%share/anubis/rot-13.scm
 %%NLS%%share/locale/da/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/de/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/es/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/id/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/it/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/anubis.mo
@@ -18,8 +21,10 @@ man/man1/anubis.1.gz
 %%NLS%%share/locale/pl/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/anubis.mo
 @dirrm share/anubis

Modified: head/mail/claws-mail/Makefile
==============================================================================
--- head/mail/claws-mail/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/claws-mail/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client

Modified: head/mail/courier-imap/Makefile
==============================================================================
--- head/mail/courier-imap/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/courier-imap/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	courier-imap
 PORTVERSION=	4.15
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/exim/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
 MASTER_SITE_SUBDIR=	exim4/:exim

Modified: head/mail/libetpan/Makefile
==============================================================================
--- head/mail/libetpan/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/libetpan/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libetpan
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 
 MAINTAINER=	pawel at FreeBSD.org

Modified: head/mail/libvmime/Makefile
==============================================================================
--- head/mail/libvmime/Makefile	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/libvmime/Makefile	Wed Jul 23 09:54:02 2014	(r362645)
@@ -2,38 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	libvmime
-PORTVERSION=	0.9.1
-PORTREVISION=	8
+PORTVERSION=	0.9.2.s20140721
 CATEGORIES=	mail
-MASTER_SITES=	SF/vmime/vmime/0.9
 
 MAINTAINER=	delphij at FreeBSD.org
 COMMENT=	All-in-one Internet mail library
 
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
-LIB_DEPENDS+=	libgsasl.so:${PORTSDIR}/security/gsasl
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		iconv gmake pkgconfig tar:bzip2 libtool
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include -D_GLIBCXX__PTHREADS
-CXXFLAGS+=	${CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.ifndef	DEBUG
-CONFIGURE_ARGS+=--disable-debug
-.endif
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgsasl.so:${PORTSDIR}/security/gsasl
 
-CONFIGURE_ENV+=	EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls"
+USE_GITHUB=	yes
+GH_ACCOUNT=	kisli
+GH_PROJECT=	vmime
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	03a0e36
 
-DOCSDIR=	${PREFIX}/share/doc/vmime
-
-.include <bsd.port.pre.mk>
+USES=		cmake:outsource compiler:c++11-lib iconv pkgconfig
+USE_LDCONFIG=	yes
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+CMAKE_ARGS=	-DLIB_SUFFIX:STRING="" \
+		-DVMIME_BUILD_SAMPLES:BOOL=NO \
+		-DVMIME_SHARED_PTR_USE_BOOST:BOOL=NO \
+		-DVMIME_SHARED_PTR_USE_CXX:BOOL=YES
+
+post-patch:
+	@${REINPLACE_CMD} 's,$${VMIME_INSTALL_LIBDIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
+		${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/mail/libvmime/distinfo
==============================================================================
--- head/mail/libvmime/distinfo	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/libvmime/distinfo	Wed Jul 23 09:54:02 2014	(r362645)
@@ -1,2 +1,2 @@
-SHA256 (libvmime-0.9.1.tar.bz2) = 3b66cb76d9bc7da80ef1f271cc29d3a183b5ff8b560ef60e85ff006bffb4d1ae
-SIZE (libvmime-0.9.1.tar.bz2) = 522546
+SHA256 (libvmime-0.9.2.s20140721.tar.gz) = 42e759982bfcc00c9348eba681840788e584cdca344d9342edb1a3f1690a23a0
+SIZE (libvmime-0.9.2.s20140721.tar.gz) = 527233

Added: head/mail/libvmime/files/patch-cmake__FindIconv.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/libvmime/files/patch-cmake__FindIconv.cmake	Wed Jul 23 09:54:02 2014	(r362645)
@@ -0,0 +1,11 @@
+--- cmake/FindIconv.cmake.orig	2014-06-30 22:48:42.000000000 +0200
++++ cmake/FindIconv.cmake	2014-07-22 12:50:55.000000000 +0200
+@@ -18,7 +18,7 @@
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ 	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
+ ELSE()
+-	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
++	FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2)
+ ENDIF()
+ 
+ IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)

Added: head/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp	Wed Jul 23 09:54:02 2014	(r362645)
@@ -0,0 +1,21 @@
+--- src/vmime/platforms/posix/posixHandler.cpp.orig	2014-07-22 15:24:26.000000000 +0200
++++ src/vmime/platforms/posix/posixHandler.cpp	2014-07-22 15:59:33.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <errno.h>
+ 
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/stat.h>
+ 
+ #if VMIME_HAVE_SYSCALL
+@@ -238,7 +239,9 @@
+ #elif VMIME_HAVE_SYSCALL && VMIME_HAVE_SYSCALL_GETTID
+ 	return static_cast <unsigned int>(::syscall(SYS_gettid));
+ #else
+-	#error We have no implementation of getThreadId() for this platform!
++	long id;
++	::syscall(SYS_thr_self, &id);
++	return static_cast <unsigned int>(id);
+ #endif
+ }
+ 

Modified: head/mail/libvmime/pkg-plist
==============================================================================
--- head/mail/libvmime/pkg-plist	Wed Jul 23 09:41:11 2014	(r362644)
+++ head/mail/libvmime/pkg-plist	Wed Jul 23 09:54:02 2014	(r362645)
@@ -8,6 +8,11 @@ include/vmime/bodyPart.hpp
 include/vmime/bodyPartAttachment.hpp
 include/vmime/charset.hpp
 include/vmime/charsetConverter.hpp
+include/vmime/charsetConverterOptions.hpp
+include/vmime/charsetConverter_iconv.hpp
+include/vmime/charsetConverter_icu.hpp
+include/vmime/charsetConverter_idna.hpp
+include/vmime/charsetConverter_win.hpp
 include/vmime/component.hpp
 include/vmime/config.hpp
 include/vmime/constants.hpp
@@ -15,14 +20,21 @@ include/vmime/contentDisposition.hpp
 include/vmime/contentDispositionField.hpp
 include/vmime/contentHandler.hpp
 include/vmime/contentTypeField.hpp
+include/vmime/context.hpp
 include/vmime/dateTime.hpp
 include/vmime/defaultAttachment.hpp
 include/vmime/disposition.hpp
+include/vmime/emailAddress.hpp
 include/vmime/emptyContentHandler.hpp
 include/vmime/encoding.hpp
 include/vmime/exception.hpp
+include/vmime/export-shared.hpp
+include/vmime/export-static.hpp
+include/vmime/export.hpp
 include/vmime/fileAttachment.hpp
+include/vmime/fileContentHandler.hpp
 include/vmime/generatedMessageAttachment.hpp
+include/vmime/generationContext.hpp
 include/vmime/header.hpp
 include/vmime/headerField.hpp
 include/vmime/headerFieldFactory.hpp
@@ -44,68 +56,104 @@ include/vmime/messageId.hpp
 include/vmime/messageIdSequence.hpp
 include/vmime/messageParser.hpp
 include/vmime/misc/importanceHelper.hpp
+include/vmime/net/defaultTimeoutHandler.hpp
 include/vmime/net/events.hpp
+include/vmime/net/fetchAttributes.hpp
 include/vmime/net/folder.hpp
+include/vmime/net/folderAttributes.hpp
+include/vmime/net/folderStatus.hpp
+include/vmime/net/imap/IMAPCommand.hpp
 include/vmime/net/imap/IMAPConnection.hpp
 include/vmime/net/imap/IMAPFolder.hpp
+include/vmime/net/imap/IMAPFolderStatus.hpp
 include/vmime/net/imap/IMAPMessage.hpp
+include/vmime/net/imap/IMAPMessagePart.hpp
 include/vmime/net/imap/IMAPMessagePartContentHandler.hpp
+include/vmime/net/imap/IMAPMessageStructure.hpp
 include/vmime/net/imap/IMAPParser.hpp
-include/vmime/net/imap/IMAPPart.hpp
 include/vmime/net/imap/IMAPSStore.hpp
 include/vmime/net/imap/IMAPServiceInfos.hpp
 include/vmime/net/imap/IMAPStore.hpp
-include/vmime/net/imap/IMAPStructure.hpp
 include/vmime/net/imap/IMAPTag.hpp
 include/vmime/net/imap/IMAPUtils.hpp
+include/vmime/net/imap/imap.hpp
+include/vmime/net/maildir/maildir.hpp
 include/vmime/net/maildir/maildirFolder.hpp
+include/vmime/net/maildir/maildirFolderStatus.hpp
 include/vmime/net/maildir/maildirFormat.hpp
 include/vmime/net/maildir/maildirMessage.hpp
+include/vmime/net/maildir/maildirMessagePart.hpp
+include/vmime/net/maildir/maildirMessageStructure.hpp
 include/vmime/net/maildir/maildirServiceInfos.hpp
 include/vmime/net/maildir/maildirStore.hpp
 include/vmime/net/maildir/maildirUtils.hpp
 include/vmime/net/maildir/format/courierMaildirFormat.hpp
 include/vmime/net/maildir/format/kmailMaildirFormat.hpp
 include/vmime/net/message.hpp
+include/vmime/net/messageSet.hpp
+include/vmime/net/pop3/POP3Command.hpp
+include/vmime/net/pop3/POP3Connection.hpp
 include/vmime/net/pop3/POP3Folder.hpp
+include/vmime/net/pop3/POP3FolderStatus.hpp
 include/vmime/net/pop3/POP3Message.hpp
+include/vmime/net/pop3/POP3Response.hpp
 include/vmime/net/pop3/POP3SStore.hpp
 include/vmime/net/pop3/POP3ServiceInfos.hpp
 include/vmime/net/pop3/POP3Store.hpp
 include/vmime/net/pop3/POP3Utils.hpp
+include/vmime/net/pop3/pop3.hpp
+include/vmime/net/sendmail/sendmail.hpp
 include/vmime/net/sendmail/sendmailServiceInfos.hpp
 include/vmime/net/sendmail/sendmailTransport.hpp
 include/vmime/net/service.hpp
 include/vmime/net/serviceFactory.hpp
 include/vmime/net/serviceInfos.hpp
 include/vmime/net/session.hpp
+include/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
+include/vmime/net/smtp/SMTPCommand.hpp
+include/vmime/net/smtp/SMTPCommandSet.hpp
+include/vmime/net/smtp/SMTPConnection.hpp
+include/vmime/net/smtp/SMTPExceptions.hpp
 include/vmime/net/smtp/SMTPResponse.hpp
 include/vmime/net/smtp/SMTPSTransport.hpp
 include/vmime/net/smtp/SMTPServiceInfos.hpp
 include/vmime/net/smtp/SMTPTransport.hpp
+include/vmime/net/smtp/smtp.hpp
 include/vmime/net/socket.hpp
 include/vmime/net/store.hpp
 include/vmime/net/timeoutHandler.hpp
+include/vmime/net/tls/TLSProperties.hpp
 include/vmime/net/tls/TLSSession.hpp
 include/vmime/net/tls/TLSSocket.hpp
 include/vmime/net/tls/TLSSecuredConnectionInfos.hpp
+include/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp
+include/vmime/net/tls/openssl/OpenSSLInitializer.hpp
+include/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
+include/vmime/net/tracer.hpp
 include/vmime/net/transport.hpp
 include/vmime/net/connectionInfos.hpp
 include/vmime/net/defaultConnectionInfos.hpp
 include/vmime/net/securedConnectionInfos.hpp
 include/vmime/object.hpp
-include/vmime/options.hpp
 include/vmime/parameter.hpp
 include/vmime/parameterizedHeaderField.hpp
 include/vmime/parsedMessageAttachment.hpp
 include/vmime/parserHelpers.hpp
+include/vmime/parsingContext.hpp
 include/vmime/path.hpp
 include/vmime/plainTextPart.hpp
 include/vmime/platform.hpp
 include/vmime/platforms/posix/posixChildProcess.hpp
+include/vmime/platforms/posix/posixCriticalSection.hpp
 include/vmime/platforms/posix/posixFile.hpp
 include/vmime/platforms/posix/posixHandler.hpp
 include/vmime/platforms/posix/posixSocket.hpp
+include/vmime/platforms/windows/windowsCodepages.hpp
+include/vmime/platforms/windows/windowsCriticalSection.hpp
 include/vmime/platforms/windows/windowsFile.hpp
 include/vmime/platforms/windows/windowsHandler.hpp
 include/vmime/platforms/windows/windowsSocket.hpp
@@ -117,6 +165,8 @@ include/vmime/security/cert/certificate.
 include/vmime/security/cert/certificateChain.hpp
 include/vmime/security/cert/certificateVerifier.hpp
 include/vmime/security/cert/defaultCertificateVerifier.hpp
+include/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp
+include/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp
 include/vmime/security/defaultAuthenticator.hpp
 include/vmime/security/digest/md5/md5MessageDigest.hpp
 include/vmime/security/digest/messageDigest.hpp
@@ -140,8 +190,8 @@ include/vmime/utility/encoder/binaryEnco
 include/vmime/utility/encoder/encoder.hpp
 include/vmime/utility/encoder/sevenBitEncoder.hpp
 include/vmime/utility/encoder/b64Encoder.hpp
-include/vmime/utility/encoder/defaultEncoder.hpp
 include/vmime/utility/encoder/encoderFactory.hpp
+include/vmime/utility/encoder/noopEncoder.hpp
 include/vmime/utility/encoder/uuEncoder.hpp
 include/vmime/utility/encoder/qpEncoder.hpp
 include/vmime/utility/encoder/eightBitEncoder.hpp
@@ -149,14 +199,30 @@ include/vmime/utility/childProcess.hpp
 include/vmime/utility/datetimeUtils.hpp
 include/vmime/utility/file.hpp
 include/vmime/utility/filteredStream.hpp
+include/vmime/utility/inputStream.hpp
+include/vmime/utility/inputStreamAdapter.hpp
+include/vmime/utility/inputStreamByteBufferAdapter.hpp
+include/vmime/utility/inputStreamPointerAdapter.hpp
+include/vmime/utility/inputStreamSocketAdapter.hpp
+include/vmime/utility/inputStreamStringAdapter.hpp
+include/vmime/utility/inputStreamStringProxyAdapter.hpp
+include/vmime/utility/outputStream.hpp
+include/vmime/utility/outputStreamAdapter.hpp

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list