Index: head/net-im/gajim/Makefile
===================================================================
--- head/net-im/gajim/Makefile	(revision 345146)
+++ head/net-im/gajim/Makefile	(revision 345147)
@@ -1,83 +1,88 @@
 # Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
 # $FreeBSD$
 
 PORTNAME=	gajim
 PORTVERSION=	0.15.4
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://gajim.org/downloads/0.15/
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Jabber client based on a plugin system
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}asn1>=0:${PORTSDIR}/devel/py-asn1
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USES=		gmake pathfix
 USE_BZIP2=	yes
 USE_DOS2UNIX=	src/plugins/plugins_i18n.py
 USE_GNOME=	pygtk2
 USE_PYTHON=	2
 USE_XORG=	x11 xext xscrnsaver
 MAN1=		gajim.1 gajim-remote.1 gajim-history-manager.1
 
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	AVAHI CRYPTO DBUS DOCS GUPNP KEYRING NLS SPELL
 OPTIONS_DEFAULT=DBUS NLS SPELL
 CRYPTO_DESC=	End to end encryption support
 KEYRING_DESC=	Gnome Keyring support
 SPELL_DESC=	Spell checking support
 
 PORTDOCS=	AUTHORS ChangeLog README.html
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-common_resolver.py
+.endif
 
 .if ! ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
 RUN_DEPENDS+=	avahi-discover:${PORTSDIR}/net/py-avahi
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus
 .endif
 
 .if ${PORT_OPTIONS:MGUPNP}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gupnp/__init__.py:${PORTSDIR}/net/gupnp-igd
 .endif
 
 .if ${PORT_OPTIONS:MCRYPTO}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
 .endif
 
 .if ${PORT_OPTIONS:MKEYRING}
 USE_GNOME+=	pygnomedesktop
 .endif
 
 .if ${PORT_OPTIONS:MSPELL}
 LIB_DEPENDS=	gtkspell:${PORTSDIR}/textproc/gtkspell
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 pre-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 
 .include <bsd.port.mk>
Index: head/net-im/gajim/files/extra-patch-src-common_resolver.py
===================================================================
--- head/net-im/gajim/files/extra-patch-src-common_resolver.py	(nonexistent)
+++ head/net-im/gajim/files/extra-patch-src-common_resolver.py	(revision 345147)
@@ -0,0 +1,37 @@
+--- src/common/resolver.py.orig	2014-02-03 11:03:20.000000000 -0500
++++ src/common/resolver.py	2014-02-04 09:37:37.000000000 -0500
+@@ -238,8 +238,8 @@
+         return hosts
+ 
+     def _parse_srv_result_posix(self, fqdn, result):
+-        # typical output of bind-tools nslookup command:
+-        # _xmpp-client._tcp.jabber.org    service = 30 30 5222 jabber.org.
++        # typical output of host lookup command
++        # _xmpp-client._tcp.jabber.org has SRV record 30 30 5222 jabber.org.
+         if not result:
+             return []
+         ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name
+@@ -255,11 +255,12 @@
+                 line = helpers.decode_string(line)
+                 domain = ufqdn # For nslookup 9.6
+             if domain:
+-                rest = line[len(domain):].split('=')
++                # add 4 for ' has' after domain name
++                rest = line[len(domain)+4:].split('record')
+                 if len(rest) != 2:
+                     continue
+                 answer_type, props_str = rest
+-                if answer_type.strip() != 'service':
++                if answer_type.strip() != 'SRV':
+                     continue
+                 props = props_str.strip().split(' ')
+                 if len(props) < 4:
+@@ -309,7 +310,7 @@
+             return
+ 
+     def _compose_command_args(self):
+-        return ['nslookup', '-type=' + self.type, self.host]
++        return ['host', '-t', self.type, self.host]
+ 
+     def _return_result(self):
+         if self.result_handler:

Property changes on: head/net-im/gajim/files/extra-patch-src-common_resolver.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property