summaryrefslogtreecommitdiff
path: root/devel/mercurial
diff options
context:
space:
mode:
Diffstat (limited to 'devel/mercurial')
-rw-r--r--devel/mercurial/Makefile32
-rw-r--r--devel/mercurial/distinfo4
-rw-r--r--devel/mercurial/files/extra-patch-setup.py34
-rw-r--r--devel/mercurial/files/patch-setup.py10
-rw-r--r--devel/mercurial/pkg-plist1
5 files changed, 50 insertions, 31 deletions
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index d83ee5bd595a..2c738bb69125 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,29 +1,21 @@
-# Ports collection makefile for: mercurial
-# Date created: 11 July 2005
-# Whom: Andreas Kohn
-#
+# Created by: Andreas Kohn
# $FreeBSD$
-#
PORTNAME= mercurial
-PORTVERSION= 2.3
+PORTVERSION= 2.3.2
CATEGORIES= devel python
MASTER_SITES= http://mercurial.selenic.com/release/
MAINTAINER= python@FreeBSD.org
-COMMENT= A fast, lightweight source control management system
+COMMENT= 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
+OPTIONS_DEFINE= NLS
+
CONTRIB_FILES= bash_completion \
casesmash.py \
check-code.py \
@@ -60,24 +52,28 @@ CONTRIB_FILES= bash_completion \
vim/patchreview.txt \
vim/patchreview.vim
-DOCS= CONTRIBUTORS COPYING README
+DOCS= CONTRIBUTORS README
MAN1= hg.1
MAN5= hgignore.5 hgrc.5
SUB_FILES= pkg-message
+.include <bsd.port.options.mk>
+
post-patch:
-.if defined(WITHOUT_NLS)
- @${REINPLACE_CMD} -e 's/%%NLS%%//' ${WRKSRC}/${PYSETUP}
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
.else
- @${REINPLACE_CMD} -e 's/%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-setup.py
+PLIST_SUB+= NLS="@comment "
.endif
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${PREFIX}/man/man5/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
for f in ${DOCS}; do \
${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 29b287f40e52..add06112f528 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.3.tar.gz) = 456cb8a9fb15606a04d81589a3459d258149170008ca64c62e5a6cbaf5f0fe5f
-SIZE (mercurial-2.3.tar.gz) = 3549002
+SHA256 (mercurial-2.3.2.tar.gz) = 33b4f5d4e2f0d506358cf5ee14b0b6b4ccaf52c251c60867e23f93b1116dc7e2
+SIZE (mercurial-2.3.2.tar.gz) = 3559562
diff --git a/devel/mercurial/files/extra-patch-setup.py b/devel/mercurial/files/extra-patch-setup.py
new file mode 100644
index 000000000000..6f67641db022
--- /dev/null
+++ b/devel/mercurial/files/extra-patch-setup.py
@@ -0,0 +1,34 @@
+--- ./setup.py.orig 2012-10-02 04:11:23.000000000 +0000
++++ ./setup.py 2012-10-02 18:59:20.000000000 +0000
+@@ -227,30 +227,7 @@
+ description = "build translations (.mo files)"
+
+ def run(self):
+- if not find_executable('msgfmt'):
+- self.warn("could not find msgfmt executable, no translations "
+- "will be built")
+- return
+-
+- podir = 'i18n'
+- if not os.path.isdir(podir):
+- self.warn("could not find %s/ directory" % podir)
+- return
+-
+- join = os.path.join
+- for po in os.listdir(podir):
+- if not po.endswith('.po'):
+- continue
+- pofile = join(podir, po)
+- modir = join('locale', po[:-3], 'LC_MESSAGES')
+- mofile = join(modir, 'hg.mo')
+- mobuildfile = join('mercurial', mofile)
+- cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile]
+- if sys.platform != 'sunos5':
+- # msgfmt on Solaris does not know about -c
+- cmd.append('-c')
+- self.mkpath(join('mercurial', modir))
+- self.make_file([pofile], mobuildfile, spawn, (cmd,))
++ pass
+
+
+ class hgdist(Distribution):
diff --git a/devel/mercurial/files/patch-setup.py b/devel/mercurial/files/patch-setup.py
deleted file mode 100644
index df0c40a4b0e2..000000000000
--- a/devel/mercurial/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig 2012-08-02 10:49:31.000000000 +0400
-+++ setup.py 2012-08-08 18:34:01.000000000 +0400
-@@ -227,6 +227,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")
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 44e40fbf79df..195825555ce4 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -662,7 +662,6 @@ bin/hg
%%PYTHON_SITELIBDIR%%/mercurial/wireproto.pyc
%%PYTHON_SITELIBDIR%%/mercurial/wireproto.pyo
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDATA%%%%DATADIR%%/contrib/bash_completion
%%PORTDATA%%%%DATADIR%%/contrib/casesmash.py