Index: head/devel/mercurial/Makefile
===================================================================
--- head/devel/mercurial/Makefile	(revision 300711)
+++ head/devel/mercurial/Makefile	(revision 300712)
@@ -1,101 +1,103 @@
 # Ports collection makefile for:	mercurial
 # Date created:				11 July 2005
 # Whom:					Andreas Kohn
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	A fast, lightweight source control management system
 
 LICENSE=	GPLv2
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
 
 CONTRIB_FILES=	bash_completion \
 		casesmash.py \
 		check-code.py \
 		convert-repo \
 		debugcmdserver.py \
 		debugshell.py \
 		dumprevlog \
 		hg-ssh \
 		hgfixes/__init__.py \
 		hgfixes/fix_bytes.py \
 		hgfixes/fix_bytesmod.py \
 		hgfixes/fix_leftover_imports.py \
 		hgk \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
 		mercurial.el \
 		mergetools.hgrc \
 		mq.el \
 		perf.py \
 		pylintrc \
 		python-hook-examples.py \
 		sample.hgrc \
 		shrink-revlog.py \
 		simplemerge \
 		tcsh_completion \
 		tcsh_completion_build.sh \
 		tmplrewrite.py \
 		undumprevlog \
 		zsh_completion \
 		vim/HGAnnotate.vim \
 		vim/hg-menu.vim \
 		vim/hgcommand.vim \
 		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
 
 DOCS=	CONTRIBUTORS COPYING README
 
 MAN1=	hg.1
 MAN5=	hgignore.5 hgrc.5
 
 SUB_FILES=	pkg-message
 
 post-patch:
 .if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} '/^build.sub_co.*$$/d' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
+.else
+	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${PREFIX}/man/man5/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${DOCS}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \
 	done
 .endif
 .if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
 	${MKDIR} ${DATADIR}/contrib
 	${MKDIR} ${DATADIR}/contrib/hgfixes
 	${MKDIR} ${DATADIR}/contrib/hgsh
 	${MKDIR} ${DATADIR}/contrib/vim
 	for f in ${CONTRIB_FILES}; do \
 		${CP} -p ${WRKSRC}/contrib/$${f} ${DATADIR}/contrib/$${f}; \
 	done
 	${MKDIR} ${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/*.cgi ${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.fcgi ${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.wsgi ${DATADIR}/www
 
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/devel/mercurial/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property
Index: head/devel/mercurial/distinfo
===================================================================
--- head/devel/mercurial/distinfo	(revision 300711)
+++ head/devel/mercurial/distinfo	(revision 300712)
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.2.2.tar.gz) = 3489110ec11fefbd2cbdefb8d715d0a869cef3dd729aaf4d5141108f8be1600a
-SIZE (mercurial-2.2.2.tar.gz) = 3430037
+SHA256 (mercurial-2.2.3.tar.gz) = 7c61e38585ba252b31f75df6006bdcf1ff11030321f9fc628f0e1c61929d677b
+SIZE (mercurial-2.2.3.tar.gz) = 3441501
\ No newline at end of file

Property changes on: head/devel/mercurial/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/devel/mercurial/files/patch-setup.py
===================================================================
--- head/devel/mercurial/files/patch-setup.py	(revision 300711)
+++ head/devel/mercurial/files/patch-setup.py	(revision 300712)
@@ -1,11 +1,19 @@
---- setup.py.orig	2012-02-01 21:23:54.000000000 +0100
-+++ setup.py	2012-02-02 12:44:12.000000000 +0100
-@@ -379,7 +379,7 @@
+--- setup 1.py	2012-06-02 08:48:21.000000000 +0400
++++ setup.py	2012-06-12 17:05:27.091982103 +0400
+@@ -223,6 +223,7 @@
+     description = "build translations (.mo files)"
+ 
+     def run(self):
++%%NLS%%        return
+         if not find_executable('msgfmt'):
+             self.warn("could not find msgfmt executable, no translations "
+                      "will be built")
+@@ -385,7 +386,7 @@
              'install_scripts': hginstallscripts}
  
  packages = ['mercurial', 'mercurial.hgweb',
 -            'mercurial.httpclient', 'mercurial.httpclient.tests',
 +            'mercurial.httpclient',
              'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf',
              'hgext.largefiles']
  

Property changes on: head/devel/mercurial/files/patch-setup.py
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property