Attachment #128418 for bug #172280

View | Details | Raw Unified | Return to bug 172280
Collapse All | Expand All

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mercurial-2.3.tar.gz) = 456cb8a9fb15606a04d81589a3459d258149170008ca64c62e5a6cbaf5f0fe5f	1	SHA256 (mercurial-2.3.2.tar.gz) = 33b4f5d4e2f0d506358cf5ee14b0b6b4ccaf52c251c60867e23f93b1116dc7e2
2	SIZE (mercurial-2.3.tar.gz) = 3549002	2	SIZE (mercurial-2.3.2.tar.gz) = 3559562

Lines 1-10 Link Here

(-)files/patch-setup.py (-10 lines)
1	--- setup.py.orig 2012-08-02 10:49:31.000000000 +0400
2	+++ setup.py 2012-08-08 18:34:01.000000000 +0400
3	@@ -227,6 +227,7 @@
4	description = "build translations (.mo files)"
5
6	def run(self):
7	+ %%NLS%%return
8	if not find_executable('msgfmt'):
9	self.warn("could not find msgfmt executable, no translations "
10	"will be built")




--- ./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):




# Created by: Andreas Kohn
# Date created:				11 July 2005
# Whom:					Andreas Kohn
#
# $FreeBSD$
#

PORTNAME=	mercurial
PORTVERSION=	2.3.2
CATEGORIES=	devel python
MASTER_SITES=	http://mercurial.selenic.com/release/



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 \


SUB_FILES=	pkg-message

.include <bsd.port.options.mk>

post-patch:
.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT=	yes
PLIST_SUB+=	NLS=""
.else
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-setup.py
PLIST_SUB+=	NLS="@comment "
.endif

post-install:

Return to bug 172280

Line 0 Link Here

(-)files/extra-patch-setup.py (+34 lines)
	1	--- ./setup.py.orig 2012-10-02 04:11:23.000000000 +0000
	2	+++ ./setup.py 2012-10-02 18:59:20.000000000 +0000
	3	@@ -227,30 +227,7 @@
	4	description = "build translations (.mo files)"
	5
	6	def run(self):
	7	- if not find_executable('msgfmt'):
	8	- self.warn("could not find msgfmt executable, no translations "
	9	- "will be built")
	10	- return
	11	-
	12	- podir = 'i18n'
	13	- if not os.path.isdir(podir):
	14	- self.warn("could not find %s/ directory" % podir)
	15	- return
	16	-
	17	- join = os.path.join
	18	- for po in os.listdir(podir):
	19	- if not po.endswith('.po'):
	20	- continue
	21	- pofile = join(podir, po)
	22	- modir = join('locale', po[:-3], 'LC_MESSAGES')
	23	- mofile = join(modir, 'hg.mo')
	24	- mobuildfile = join('mercurial', mofile)
	25	- cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile]
	26	- if sys.platform != 'sunos5':
	27	- # msgfmt on Solaris does not know about -c
	28	- cmd.append('-c')
	29	- self.mkpath(join('mercurial', modir))
	30	- self.make_file([pofile], mobuildfile, spawn, (cmd,))
	31	+ pass
	32
	33
	34	class hgdist(Distribution):

Lines 1-12 Link Here

(-)Makefile (-14 / +11 lines)
1	# Ports collection makefile for: mercurial	1	# Created by: Andreas Kohn
2	# Date created: 11 July 2005
3	# Whom: Andreas Kohn
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#	3	#
7		4
8	PORTNAME= mercurial	5	PORTNAME= mercurial
9	PORTVERSION= 2.3	6	PORTVERSION= 2.3.2
10	CATEGORIES= devel python	7	CATEGORIES= devel python
11	MASTER_SITES= http://mercurial.selenic.com/release/	8	MASTER_SITES= http://mercurial.selenic.com/release/
12		9
Lines 15-29 Link Here
15		12
16	LICENSE= GPLv2	13	LICENSE= GPLv2
17		14
18	.if !defined(WITHOUT_NLS)
19	USE_GETTEXT= yes
20	PLIST_SUB+= NLS=""
21	.else
22	PLIST_SUB+= NLS="@comment "
23	.endif
24	USE_PYTHON= -2.7	15	USE_PYTHON= -2.7
25	USE_PYDISTUTILS=yes	16	USE_PYDISTUTILS=yes
26		17
		18	OPTIONS_DEFINE= NLS
		19
27	CONTRIB_FILES= bash_completion \	20	CONTRIB_FILES= bash_completion \
28	casesmash.py \	21	casesmash.py \
29	check-code.py \	22	check-code.py \
Lines 67-77 Link Here
67		60
68	SUB_FILES= pkg-message	61	SUB_FILES= pkg-message
69		62
		63	.include <bsd.port.options.mk>
		64
70	post-patch:	65	post-patch:
71	.if defined(WITHOUT_NLS)	66	.if ${PORT_OPTIONS:MNLS}
72	@${REINPLACE_CMD} -e 's/%%NLS%%//' ${WRKSRC}/${PYSETUP}	67	USE_GETTEXT= yes
		68	PLIST_SUB+= NLS=""
73	.else	69	.else
74	@${REINPLACE_CMD} -e 's/%%NLS%%/# /' ${WRKSRC}/${PYSETUP}	70	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-setup.py
		71	PLIST_SUB+= NLS="@comment "
75	.endif	72	.endif
76		73
77	post-install:	74	post-install: